From a4df941289de4fdae1406a40f488319cb6f15683 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Sat, 27 Jan 2024 19:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B6=E6=A2=AF=E4=BB=B7=E6=A0=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NewcomerRecoRecordService.java            | 39 +++++++++++--------
 .../biz/shoppingcart/ShoppingCartMapper.xml   |  3 +-
 .../biz/shoppingcart/ShoppingCartService.java | 27 ++++++++-----
 .../VegetableCellarService.java               | 14 +++----
 4 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
index 743cfe4..825e510 100644
--- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
+++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java
@@ -85,6 +85,11 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
     @Transactional(rollbackFor = Exception.class)
     public ResultBean recommendedAssistance(NewcomerRecoRecordDto dto) {
         ResultBean rb = new ResultBean().fail();
+        //如果被推荐人有被推荐记录但没购买  就直接跳出
+        NewcomerRecoRecord newcomer=baseMapper.selectOne(new QueryWrapper<NewcomerRecoRecord>().eq("recommendedSid",dto.getCustomerSid()));
+        if(newcomer!=null){
+            return rb.success();
+        }
         LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",dto.getCustomerSid()));
         if(null==customer){
             return rb.setMsg("参数不全");
@@ -100,23 +105,23 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
             return rb.success();
         }
         baseMapper.updateById(newcomerRecoRecord);
-//        List<AppletGiftBagGoods>list=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",dto.getGiftBagSid()));
-        VegetableCellarDto dto1=new VegetableCellarDto();
-        dto1.setCustomerSid(customer.getSid());
-        List<vegeVo> vos=new ArrayList<>();
-        for (RecommendNewUserBagDetails appletGiftBagGoods : list) {
-            LpkGoods a=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",appletGiftBagGoods.getGoodsSid()));
-            vegeVo vo=new vegeVo();
-            vo.setGoodsSid(appletGiftBagGoods.getGoodsSid());
-            vo.setGoodsNumber(appletGiftBagGoods.getGoodsNumber());
-            vo.setBrandId(String.valueOf(a.getBrandId()));
-            vos.add(vo);
-        }
-        dto1.setVos(vos);
-        vegetableCellarService.save1Goods(dto1);
-        //改变新人状态
-        customer.setIsNewUser("0");
-        lpkCustomerService.updateById(customer);
+////        List<AppletGiftBagGoods>list=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",dto.getGiftBagSid()));
+//        VegetableCellarDto dto1=new VegetableCellarDto();
+//        dto1.setCustomerSid(customer.getSid());
+//        List<vegeVo> vos=new ArrayList<>();
+//        for (RecommendNewUserBagDetails appletGiftBagGoods : list) {
+//            LpkGoods a=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",appletGiftBagGoods.getGoodsSid()));
+//            vegeVo vo=new vegeVo();
+//            vo.setGoodsSid(appletGiftBagGoods.getGoodsSid());
+//            vo.setGoodsNumber(appletGiftBagGoods.getGoodsNumber());
+//            vo.setBrandId(String.valueOf(a.getBrandId()));
+//            vos.add(vo);
+//        }
+//        dto1.setVos(vos);
+//        vegetableCellarService.save1Goods(dto1);
+//        //改变新人状态
+//        customer.setIsNewUser("0");
+//        lpkCustomerService.updateById(customer);
         return rb.success().setData("助力成功");
     }
     public ResultBean recordList(String customerSid) {
diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
index 3346233..101b2b8 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
@@ -11,7 +11,8 @@
         s.price as jPrice,
         s.picUrl as iconUrl,
         s.specificationUnit,
-        s.content as remarks
+        s.content as remarks,
+        s.name as goodsName
         from shopping_cart as r
         left join lpk_goods s on s.sid=r.goodsSid
         <where>
diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
index 2cbc45b..7d94f9c 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
@@ -25,6 +25,7 @@ import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo;
 import com.yxt.yythmall.biz.empcard.EmpCardService;
 import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService;
 import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
+import com.yxt.yythmall.utils.DoubleUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -114,23 +115,31 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
             LpkGoods lpkGoods = lpkGoodsService.fetchBySid(vo.getGoodsSid());
             String stepWeight = lpkGoods.getStepWeight();
             String stepPrice = lpkGoods.getStepPrice();
+            String a =DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getWeight())*Double.valueOf(vo.getGoodsNumber())));
+            BigDecimal weightW = new BigDecimal(a);
             if(StringUtils.isNotBlank(stepPrice)){
-                if (new BigDecimal(stepPrice).compareTo(BigDecimal.ZERO) == 0) {
-                    stepPrice = vo.getJPrice();
+                System.out.println(weightW.compareTo(new BigDecimal(stepWeight)));
+                if(weightW.compareTo(new BigDecimal(stepWeight)) == -1){
+                    stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getJPrice())*Double.valueOf(vo.getWeight())));  ///份价格
+                }else{
+                    stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(stepPrice)*Double.valueOf(vo.getWeight())));  ///份价格
                 }
+//                if (new BigDecimal(stepPrice).compareTo(BigDecimal.ZERO) == 0) {
+//                    stepPrice = vo.getJPrice();
+//                }
             }else{
-                stepPrice = vo.getJPrice();
+                stepPrice = DoubleUtils.removeZeros(String.valueOf(Double.valueOf(vo.getJPrice())*Double.valueOf(vo.getWeight())));
             }
 
             if ("北京3号白菜".equals(vo.getGoodsName())
                     || "玲珑黄白菜".equals(vo.getGoodsName())
                     || "V7土豆".equals(vo.getGoodsName())
                     || "黄金薯土豆".equals(vo.getGoodsName())) {
-                BigDecimal weightW = new BigDecimal(vo.getWeight());
-                if (weightW.compareTo(new BigDecimal(stepWeight)) >= 0) {
-                    price = Double.valueOf(stepPrice) * Double.valueOf(vo.getGoodsNumber()) + price;
-                    weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + price;
-                }
+//                BigDecimal weightW = new BigDecimal(vo.getWeight());
+//                if (weightW.compareTo(new BigDecimal(stepWeight)) == -1) {
+                    price = Double.valueOf(stepPrice)* Double.valueOf(vo.getGoodsNumber()) + price;
+                    weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight;
+//                }
             } else {
                 price = Double.valueOf(vo.getPrice()) * Double.valueOf(vo.getGoodsNumber()) + price;
                 weight = Double.valueOf(vo.getWeight()) * Double.valueOf(vo.getGoodsNumber()) + weight;
@@ -150,7 +159,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
     }
 
     private ShoppingCartVo price(ShoppingCartVo vo) {
-        int weight = Integer.parseInt(vo.getTotalWeight());
+        double weight = Double.valueOf(vo.getTotalWeight());
         LpkCustomer lpkCustomer = lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid", vo.getCustomerSid()));
         vo.setRemarks("已减免附加额");
         if (weight <= 99) {
diff --git a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
index da6ca81..91626e6 100644
--- a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
+++ b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java
@@ -89,14 +89,14 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
                 baseMapper.updateById(vegetableCellar);
             }
         }
-//        NewcomerRecoRecord n=newcomerRecoRecordService.getOne(new QueryWrapper<NewcomerRecoRecord>().eq("recommendedSid",ordOrder.getUserSid()).eq("state","1"));
+        NewcomerRecoRecord n=newcomerRecoRecordService.getOne(new QueryWrapper<NewcomerRecoRecord>().eq("recommendedSid",ordOrder.getUserSid()).eq("state","1"));
         LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",ordOrder.getUserSid()));
-//        if(n!=null){
-//            aa(n.getGiftBagSid(),n.getRecommendSid());
-//            customer.setIsNewUser("0");
-//            n.setState("2");
-//            newcomerRecoRecordService.updateById(n);
-//        }
+        if(n!=null){
+            aa(n.getGiftBagSid(),n.getRecommendSid());
+            customer.setIsNewUser("0");
+            n.setState("2");
+            newcomerRecoRecordService.updateById(n);
+        }
         customer.setIsPurchase("0");
         lpkCustomerService.updateById(customer);
         ordOrder.setPayStatus(4);