diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java index c6fcd9b..a75c5f4 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/GiftBagGoods.java @@ -1,5 +1,6 @@ package com.yxt.yyth.api.appletgiftbag; +import com.yxt.common.base.utils.StringUtils; import lombok.Data; /** @@ -10,14 +11,22 @@ import lombok.Data; @Data public class GiftBagGoods { private String goodsSid; - private String goodsNumber;//份数 + private String goodsNumber="0";//份数 private String name; //商品名 private String unitName; //单位 private String price; //商品单价 private String iconUrl;//图片 private String remark; //备注 private String weight; //每份的重量 + private String jPrice; //每斤单价 private String specificationUnit; //规格单位 private String totalValue; //总价值 + public String getPrice() { + + if(StringUtils.isBlank(price)){ + price ="0"; + } + return price; + } } diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java index 3c8b58c..d968fae 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java @@ -213,6 +213,8 @@ public class AppletGiftBagService extends MybatisBaseService list=baseMapper.getAllGoodsApplet(); list.forEach(s->{ s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl()); + s.setTotalValue("0"); + s.setJPrice(String.valueOf(Double.valueOf(s.getPrice())/Double.valueOf(s.getWeight()))); }); return rb.success().setData(list); }