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 a3d56e0..f60ffa3 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java @@ -221,8 +221,9 @@ public class AppletGiftBagService extends MybatisBaseService " from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") List getGoodsByBagSid(String sid); - @Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price,goods.unitName,goods.content as remark " + + @Select("select goods.name as name,bads.goodsNumber ,bads.goodsSid,goods.picUrl as iconUrl,goods.price as jPrice,goods.unitName,goods.content as remark " + " ,goods.weight, goods.specificationUnit from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") List getGoodsByBagSidA(String sid); List getRecordsByBagSid(@Param("sid") String sid); 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 e0b3978..d6b49c5 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml @@ -67,7 +67,7 @@ date_format(createTime, '%Y-%m-%d') as createTime, `name`, unitName, - price, + price as jPrice, picUrl as iconUrl, specificationUnit, isAppletGrounding, diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java index e5eb978..15468c0 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java @@ -159,7 +159,7 @@ public class LpkGoodsService extends MybatisBaseService{ s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl()); s.setTotalValue(decimalFormat.format(0)); - s.setJPrice(String.valueOf(decimalFormat.format(Double.valueOf(s.getPrice())*Double.valueOf(s.getWeight())))); + s.setPrice(String.valueOf(decimalFormat.format(Double.valueOf(s.getJPrice())*Double.valueOf(s.getWeight())))); }); return rb.success().setData(list); }