From ac17ab011ac8208778b3bf050471b520578f44ed Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 8 Jan 2024 10:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java | 5 +++--
 .../biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java     | 2 +-
 src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml   | 2 +-
 src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

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<AppletGiftBagMapper
         for(GiftBagGoods goods:goodsList){
             i=i+Double.valueOf(goods.getPrice())*Double.valueOf(goods.getGoodsNumber());
             goods.setIconUrl(fileUploadComponent.getUrlPrefix() +goods.getIconUrl());
-            goods.setTotalValue(String.valueOf(decimalFormat.format(Double.valueOf(goods.getGoodsNumber())*Double.valueOf(goods.getPrice()))));
-            goods.setJPrice(String.valueOf(decimalFormat.format(Double.valueOf(goods.getPrice())*Double.valueOf(goods.getWeight()))));
+            goods.setTotalValue(String.valueOf(decimalFormat.format(Double.valueOf(goods.getGoodsNumber())*Double.valueOf(goods.getJPrice())*Double.valueOf(goods.getWeight()))));
+//            goods.setJPrice(String.valueOf(decimalFormat.format(Double.valueOf(goods.getPrice())*Double.valueOf(goods.getWeight()))));
+            goods.setPrice(String.valueOf(decimalFormat.format(Double.valueOf(goods.getJPrice())*Double.valueOf(goods.getWeight()))));
         }
         appletGiftBagVo.setPrice(decimalFormat.format(i));
         appletGiftBagVo.setGoods(goodsList);
diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java
index 9b48b11..c7990fa 100644
--- a/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java
+++ b/src/main/java/com/yxt/yyth/biz/appletgiftbaggoods/AppletGiftBagGoodsMapper.java
@@ -24,7 +24,7 @@ public interface AppletGiftBagGoodsMapper extends BaseMapper<AppletGiftBagGoods>
             " from applet_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid  where bads.giftbagSid=#{sid}")
     List<AppletGiftBagGoodsVo> 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<GiftBagGoods> getGoodsByBagSidA(String sid);
     List<AppletGiftBagGoods> 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<LpkGoodsMapper, LpkGoods
         list.forEach(s->{
             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);
     }