diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagInitVo.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagInitVo.java index 3714f8c..0f883fb 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagInitVo.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagInitVo.java @@ -22,6 +22,7 @@ public class AppletGiftBagInitVo implements Vo { private String price; private String iconUrl; private String isRecommend; + private String preferentialPrice; //商品sid private List goods = new ArrayList<>(); } 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 9080791..0e7d497 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 cn.hutool.core.util.NumberUtil; import com.yxt.common.base.utils.StringUtils; import lombok.Data; @@ -13,7 +14,7 @@ import java.text.DecimalFormat; @Data public class GiftBagGoods { private String goodsSid; - private String goodsNumber="0";//份数 + private String goodsNumber = "0";//份数 private String name; //商品名 private String unitName; //单位 private String price; //商品单价 @@ -26,10 +27,50 @@ public class GiftBagGoods { public String getJPrice() { - if(StringUtils.isBlank(jPrice)){ - jPrice ="0"; + if (StringUtils.isBlank(jPrice)) { + jPrice = "0"; } DecimalFormat decimalFormat = new DecimalFormat("#0.00"); return decimalFormat.format(Double.valueOf(jPrice)); } + + public String getMefenPrice() { + double dj = 0.0; + try { + dj = Double.parseDouble(price); + } catch (Exception e) { + e.printStackTrace(); + } + int js = 1; + try { + js = Integer.parseInt(weight); + } catch (Exception e) { + e.printStackTrace(); + } + double mfjg = dj * js; + return NumberUtil.decimalFormatMoney(mfjg); + } + + public String getSubtotal() { + double dj = 0.0; + try { + dj = Double.parseDouble(price); + } catch (Exception e) { + e.printStackTrace(); + } + int js = 1; + try { + js = Integer.parseInt(weight); + } catch (Exception e) { + e.printStackTrace(); + } + int fs = 1; + try { + fs = Integer.parseInt(goodsNumber); + } catch (Exception e) { + e.printStackTrace(); + } + double mfjg = dj * js * fs; + return NumberUtil.decimalFormatMoney(mfjg); + } } diff --git a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java index b0eeb70..acf1255 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java @@ -35,5 +35,6 @@ public class LpkGoodsVo implements Vo { private String isAppletGrounding; //1 上架 2 下架 private String content; private String useTo; + private String weight; } 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 0bd9e31..170d00a 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java @@ -163,6 +163,8 @@ public class AppletGiftBagService extends MybatisBaseService DELETE - FROM lpk_giftbag_goods + FROM applet_giftbag_goods WHERE giftbagSid = #{sid} - insert into lpk_giftbag_goods(sid,createTime,giftbagSid,goodsSid,goodsNumber) + insert into applet_giftbag_goods(sid,createTime,giftbagSid,goodsSid,goodsNumber) values (#{item.sid},#{item.createTime},#{item.giftbagSid},#{item.goodsSid},#{item.goodsNumber}) diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml index abb34b2..03166f7 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml @@ -10,6 +10,7 @@ date_format(createTime, '%Y-%m-%d') as createTime, code, barcode, + `weight`, `name`, unitName, typeCode, @@ -29,6 +30,7 @@ date_format(createTime, '%Y-%m-%d') as createTime, code, barcode, + `weight`, `name`, unitName, typeCode, @@ -44,6 +46,7 @@ date_format(createTime, '%Y-%m-%d') as createTime, code, barcode, + `weight`, `name`, unitName, typeCode,