Просмотр исходного кода

question

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
578cd3e2c4
2 измененных файлов: 14 добавлений и 2 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxQuestionOneselfTopic.java
  2. +13
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxQuestionOneselfTopic.java Просмотреть файл

@@ -40,7 +40,7 @@ public class WxQuestionOneselfTopic extends TenantEntity {
public String getAnswer(){ public String getAnswer(){
if(StringUtils.isBlank(answer) && answers != null && answers.size() > 0){ if(StringUtils.isBlank(answer) && answers != null && answers.size() > 0){
for(int i = 0;i < answers.size();i++){ for(int i = 0;i < answers.size();i++){
answers.get(i).put("id",i);
answers.get(i).put("id",i+1);
} }
answer = JSONArray.toJSONString(answers); answer = JSONArray.toJSONString(answers);
} }


+ 13
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Просмотреть файл

@@ -65,9 +65,13 @@ public class WxCouponOrderBVo extends WxCouponOrder {
private String priceStr; private String priceStr;


@TableField(exist = false) @TableField(exist = false)
@Excel(name = "交易价格(元)", width = 20, orderNum = "6")
// @Excel(name = "交易价格(元)", width = 20, orderNum = "6")
private String salePriceStr; private String salePriceStr;


@Excel(name = "交易价格(元)", width = 20, orderNum = "6")
@TableField(exist = false)
private String couponPriceStr;

@Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14") @Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus")
private Integer couponOrderStatus; private Integer couponOrderStatus;
@@ -233,4 +237,12 @@ public class WxCouponOrderBVo extends WxCouponOrder {
return priceStr; return priceStr;
} }


public String getCouponPriceStr() {
if(couponPrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
couponPriceStr = df.format((float)couponPrice/100);
}
return couponPriceStr;
}

} }

Загрузка…
Отмена
Сохранить