From f855e4581374faf8fac715e9f25714593a2560ea Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 19 Jan 2024 22:08:52 +0800
Subject: [PATCH] 1/19

---
 .../com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java    | 1 +
 .../com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java   | 2 +-
 .../com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml    | 2 +-
 .../com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java b/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java
index 853b8ae..2535a5c 100644
--- a/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java
+++ b/src/main/java/com/yxt/yythmall/api/shoppingcart/ShoppingCartQuery.java
@@ -11,5 +11,6 @@ import lombok.Data;
 public class ShoppingCartQuery implements Query {
     private String customerSid; //客户
     private String affiliation; //类型
+    private String brandId;
 
 }
diff --git a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java
index d678b8b..5186a8e 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.java
@@ -19,5 +19,5 @@ import java.util.List;
  */
 @Mapper
 public interface ShoppingCartMapper extends BaseMapper<ShoppingCart> {
-    List<ShoppingCartVo> ShoppingCartList(@Param("customerSid")String customerSid,@Param("affiliation")String affiliation);
+    List<ShoppingCartVo> ShoppingCartList(@Param("customerSid")String customerSid,@Param("brandId")String brandId);
 }
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 3ffb244..3346233 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartMapper.xml
@@ -15,7 +15,7 @@
         from shopping_cart as r
         left join lpk_goods s on s.sid=r.goodsSid
         <where>
-            r.customerSid =#{customerSid} and r.affiliation=#{affiliation}
+            r.customerSid =#{customerSid} and r.affiliation=#{brandId}
         </where>
     </select>
 </mapper>
\ No newline at end of file
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 e007ff9..1f4fa91 100644
--- a/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
+++ b/src/main/java/com/yxt/yythmall/biz/shoppingcart/ShoppingCartService.java
@@ -92,7 +92,7 @@ public class ShoppingCartService extends MybatisBaseService<ShoppingCartMapper,
     }
     public ResultBean  getGoodsWeight(ShoppingCartQuery query) {
         ResultBean rb=new ResultBean().fail();
-        List<ShoppingCartVo> list= baseMapper.ShoppingCartList(query.getCustomerSid(),query.getAffiliation());
+        List<ShoppingCartVo> list= baseMapper.ShoppingCartList(query.getCustomerSid(),query.getBrandId());
         double price =0;
         double weight =0;
         for(ShoppingCartVo vo:list){