|
|
@@ -6,11 +6,13 @@ import android.text.TextUtils;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.kfzs.duanduan.utils.NumberFormatUtils;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
import java.lang.annotation.Retention;
|
|
|
import java.lang.annotation.RetentionPolicy;
|
|
|
import java.util.List;
|
|
|
+import java.util.Locale;
|
|
|
|
|
|
/**
|
|
|
* Created by ljy on 2018/5/10.
|
|
|
@@ -22,6 +24,7 @@ public class TaskChild implements Serializable {
|
|
|
private String EndTime;//1530115200,
|
|
|
private String Desc;//"<p>阿斯顿发射的发</p>",
|
|
|
private String Amount;//1,
|
|
|
+ private float vip_amount;//1,
|
|
|
private int Id;//8,
|
|
|
private int already_accepted_task_id;//8,
|
|
|
private String task_id;//161,
|
|
|
@@ -201,6 +204,14 @@ public class TaskChild implements Serializable {
|
|
|
this.already_accepted_task_id = already_accepted_task_id;
|
|
|
}
|
|
|
|
|
|
+ public float getVip_amount() {
|
|
|
+ return vip_amount;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setVip_amount(float vip_amount) {
|
|
|
+ this.vip_amount = vip_amount;
|
|
|
+ }
|
|
|
+
|
|
|
public int getAllowSubmit() {
|
|
|
return allowSubmit;
|
|
|
}
|
|
|
@@ -268,6 +279,11 @@ public class TaskChild implements Serializable {
|
|
|
public static final int STATUS_FAIL= 6;//审核失败
|
|
|
public static final int STATUS_OUT_TIME = 7;
|
|
|
|
|
|
+ //资金信息
|
|
|
+ public String getAmountInfo() {
|
|
|
+ return String.format(Locale.CHINA, "+%s元(会员:+%s元)", NumberFormatUtils.retainMost2W(getAmount()), NumberFormatUtils.retainMost2W(getVip_amount()));
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@IntDef({STATUS_RUNNING, STATUS_FAIL})
|
|
|
@Retention(RetentionPolicy.SOURCE)
|