修改购物车接口

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsRequest.java

@@ -12,7 +12,7 @@ public class CartsRequest {
     // 主键
     private Long id;
     @NotNull
-    private Long prodId;
+    private Long mercProdId;
     @NotNull
     private Long prodAttrId;
     @NotNull

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/CartsResponse.java

@@ -14,7 +14,7 @@ public class CartsResponse {
     private Long userId;
 
     // 商品ID
-    private Long prodId;
+    private Long mercProdId;
 
     // 商品属性ID
     private Long prodAttrId;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsApiServiceImpl.java

@@ -13,6 +13,8 @@ import com.xingxi.common.enums.ERoleKey;
 import com.xingxi.common.enums.EYesNo;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.StringUtils;
+import com.xingxi.master.merchant.domain.MerchantProd;
+import com.xingxi.master.merchant.mapper.MerchantProdMapper;
 import com.xingxi.master.product.domain.ProdAttrPrice;
 import com.xingxi.master.product.domain.ProdPic;
 import com.xingxi.master.product.mapper.ProdAttrPriceMapper;
@@ -38,6 +40,8 @@ class CartsApiServiceImpl implements CartsServiceI {
     ProdAttrPriceMapper prodAttrPriceMapper;
     @Autowired
     private ProdPicServiceImpl prodPicServiceImpl;
+    @Autowired
+    private MerchantProdMapper merchantProdMapper;
 
     @Override
     public CartsListResponse add(UserContext userContext, CartsRequest request) {
@@ -47,7 +51,7 @@ class CartsApiServiceImpl implements CartsServiceI {
 
         Carts cond = new Carts();
         cond.setUserId(userId);
-        cond.setProdId(request.getProdId());
+        cond.setMercProdId(request.getMercProdId());
         cond.setProdAttrId(request.getProdAttrId());
         cond.setDelFlag(EDelFlag.NO.getVal());
 
@@ -57,7 +61,7 @@ class CartsApiServiceImpl implements CartsServiceI {
 
         if (StringUtils.isEmpty(exiCarts)) {
             carts.setUserId(userId);
-            carts.setProdId(request.getProdId());
+            carts.setMercProdId(request.getMercProdId());
             carts.setProdAttrId(request.getProdAttrId());
             carts.setQuantity(1);
             carts.setDelFlag(EDelFlag.NO.getVal());
@@ -89,15 +93,17 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             CartsResponse cartsResponse = new CartsResponse();
 
+            MerchantProd mercProd = merchantProdMapper.selectMerchantProdByMercProdId(carts.getMercProdId());
+
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
-            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
 
             ProdPic condPic = new ProdPic();
-            condPic.setProdId(carts.getProdId());
+            condPic.setProdId(mercProd.getProdId());
             condPic.setDelFlag(EDelFlag.NO.getVal());
 
             List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
@@ -105,8 +111,9 @@ class CartsApiServiceImpl implements CartsServiceI {
             cartsResponse.setProdPicList(picList);
 
             ProdAttrPrice condPrice = new ProdAttrPrice();
+            condPrice.setSellerId(mercProd.getMercId());
             condPrice.setProdAttrId(carts.getProdAttrId());
-            condPrice.setProdId(carts.getProdId());
+            condPrice.setProdId(mercProd.getProdId());
             condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
 
             List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
@@ -142,9 +149,13 @@ class CartsApiServiceImpl implements CartsServiceI {
         List<Carts> exiCarts = cartsMapper.selectCartsList(cond);
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
+
+            MerchantProd mercProd = merchantProdMapper.selectMerchantProdByMercProdId(carts.getMercProdId());
+
             ProdAttrPrice condPrice = new ProdAttrPrice();
             condPrice.setProdAttrId(carts.getProdAttrId());
-            condPrice.setProdId(carts.getProdId());
+            condPrice.setSellerId(mercProd.getMercId());
+            condPrice.setProdId(carts.getMercProdId());
             condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
 
             List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
@@ -154,17 +165,18 @@ class CartsApiServiceImpl implements CartsServiceI {
                     sum = sum.add(new BigDecimal(carts.getQuantity()).multiply(priceList.get(0).getPrice()));
                 }
             }
+
             CartsResponse cartsResponse = new CartsResponse();
 
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
-            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
 
             ProdPic condPic = new ProdPic();
-            condPic.setProdId(carts.getProdId());
+            condPic.setProdId(mercProd.getProdId());
             condPic.setDelFlag(EDelFlag.NO.getVal());
 
             List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
@@ -189,6 +201,9 @@ class CartsApiServiceImpl implements CartsServiceI {
         List<CartsResponse> cartsResponseList = new ArrayList<>();
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
+
+            MerchantProd mercProd = merchantProdMapper.selectMerchantProdByMercProdId(carts.getMercProdId());
+
             carts.setCheckFlag(EYesNo.YES.getVal());
             carts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
             carts.setUpdateTime(DateUtils.getNowDate());
@@ -196,7 +211,8 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             ProdAttrPrice condPrice = new ProdAttrPrice();
             condPrice.setProdAttrId(carts.getProdAttrId());
-            condPrice.setProdId(carts.getProdId());
+            condPrice.setProdId(mercProd.getProdId());
+            condPrice.setSellerId(mercProd.getMercId());
             condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
 
             List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
@@ -208,13 +224,13 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
-            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
 
             ProdPic condPic = new ProdPic();
-            condPic.setProdId(carts.getProdId());
+            condPic.setProdId(mercProd.getProdId());
             condPic.setDelFlag(EDelFlag.NO.getVal());
 
             List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
@@ -239,6 +255,9 @@ class CartsApiServiceImpl implements CartsServiceI {
 
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
+
+            MerchantProd mercProd = merchantProdMapper.selectMerchantProdByMercProdId(carts.getMercProdId());
+
             carts.setCheckFlag(EYesNo.YES.getVal());
             carts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
             carts.setUpdateTime(DateUtils.getNowDate());
@@ -248,13 +267,13 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
-            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
 
             ProdPic condPic = new ProdPic();
-            condPic.setProdId(carts.getProdId());
+            condPic.setProdId(mercProd.getProdId());
             condPic.setDelFlag(EDelFlag.NO.getVal());
 
             List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);
@@ -282,9 +301,13 @@ class CartsApiServiceImpl implements CartsServiceI {
 
         BigDecimal sum = BigDecimal.ZERO;
         for (Carts carts : exiCarts) {
+
+            MerchantProd mercProd = merchantProdMapper.selectMerchantProdByMercProdId(carts.getMercProdId());
+
             ProdAttrPrice condPrice = new ProdAttrPrice();
             condPrice.setProdAttrId(carts.getProdAttrId());
-            condPrice.setProdId(carts.getProdId());
+            condPrice.setSellerId(mercProd.getMercId());
+            condPrice.setProdId(mercProd.getProdId());
             condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
 
             List<ProdAttrPrice> priceList = prodAttrPriceMapper.selectProdAttrPriceList(condPrice);
@@ -297,13 +320,13 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             cartsResponse.setId(carts.getId());
             cartsResponse.setUserId(userId);
-            cartsResponse.setProdId(carts.getProdId());
+            cartsResponse.setMercProdId(carts.getMercProdId());
             cartsResponse.setProdAttrId(carts.getProdAttrId());
             cartsResponse.setQuantity(carts.getQuantity());
             cartsResponse.setCheckFlag(carts.getCheckFlag());
 
             ProdPic condPic = new ProdPic();
-            condPic.setProdId(carts.getProdId());
+            condPic.setProdId(mercProd.getProdId());
             condPic.setDelFlag(EDelFlag.NO.getVal());
 
             List<ProdPic> picList = prodPicServiceImpl.selectProdPicList(condPic);

08.src/Xingxi/xingxi-system/src/main/java/com/xingxi/business/Carts/domain/Carts.java

@@ -25,9 +25,9 @@ public class Carts extends BaseEntity {
     @Excel(name = "用户ID")
     private Long userId;
 
-    // 商品ID
-    @Excel(name = "商品ID")
-    private Long prodId;
+    // 商户商品ID
+    @Excel(name = "商户商品ID")
+    private Long mercProdId;
 
     // 商品属性ID
     @Excel(name = "商品属性ID")

08.src/Xingxi/xingxi-system/src/main/resources/mapper/business/CartsMapper.xml

@@ -4,8 +4,7 @@
     <resultMap type="Carts" id="CartsResult">
         <result property="id"    column="id"    />
         <result property="userId"    column="user_id"    />
-        <result property="mercId"    column="mercId"    />
-        <result property="prodId"    column="prodId"    />
+        <result property="mercProdId"    column="mercProdId"    />
         <result property="prodAttrId"    column="prodAttrId"    />
         <result property="quantity"    column="quantity"    />
         <result property="checkFlag"    column="checkFlag"    />
@@ -17,32 +16,14 @@
     </resultMap>
 
     <sql id="selectCarts">
-        select id, user_id, mercId, prodId, prodAttrId, quantity, checkFlag, delFlag, createUser, createTime, updateUser, updateTime from t_carts
-    </sql>
-
-    <sql id="selectCartsExt">
-        select
-            ${tableAlias}.id,
-            ${tableAlias}.user_id,
-            ${tableAlias}.mercId,
-            ${tableAlias}.prodId,
-            ${tableAlias}.prodAttrId,
-            ${tableAlias}.quantity,
-            ${tableAlias}.checkFlag,
-            ${tableAlias}.delFlag,
-            ${tableAlias}.createUser,
-            ${tableAlias}.createTime,
-            ${tableAlias}.updateUser,
-            ${tableAlias}.updateTime
-        from t_carts ${tableAlias}
+        select id, user_id, mercProdId, prodAttrId, quantity, checkFlag, delFlag, createUser, createTime, updateUser, updateTime from t_carts
     </sql>
 
     <select id="selectCartsList" parameterType="Carts" resultMap="CartsResult">
         <include refid="selectCarts"/>
         <where>  
             <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
-            <if test="mercId != null "> and mercId = #{mercId}</if>
-            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="mercProdId != null "> and mercProdId = #{mercProdId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="checkFlag != null  and checkFlag != ''"> and checkFlag = #{checkFlag}</if>
@@ -63,8 +44,7 @@
         insert into t_carts
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-            <if test="mercId != null">mercId,</if>
-            <if test="prodId != null">prodId,</if>
+            <if test="mercProdId != null">mercProdId,</if>
             <if test="prodAttrId != null">prodAttrId,</if>
             <if test="quantity != null">quantity,</if>
             <if test="checkFlag != null">checkFlag,</if>
@@ -76,8 +56,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
-            <if test="mercId != null">#{mercId},</if>
-            <if test="prodId != null">#{prodId},</if>
+            <if test="mercProdId != null">#{mercProdId},</if>
             <if test="prodAttrId != null">#{prodAttrId},</if>
             <if test="quantity != null">#{quantity},</if>
             <if test="checkFlag != null">#{checkFlag},</if>
@@ -90,9 +69,9 @@
     </insert>
 
     <insert id="batchInsertCarts">
-        insert into t_carts( user_id, mercId, prodId, prodAttrId, quantity, checkFlag, delFlag, createUser, createTime, updateUser, updateTime) values
+        insert into t_carts( user_id, mercProdId, prodAttrId, quantity, checkFlag, delFlag, createUser, createTime, updateUser, updateTime) values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.userId}, #{item.mercId}, #{item.prodId}, #{item.prodAttrId}, #{item.quantity}, #{item.checkFlag}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
+            ( #{item.userId}, #{item.mercProdId}, #{item.prodAttrId}, #{item.quantity}, #{item.checkFlag}, #{item.delFlag}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime})
         </foreach>
     </insert>
 
@@ -100,8 +79,7 @@
         update t_carts
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
-            <if test="mercId != null">mercId = #{mercId},</if>
-            <if test="prodId != null">prodId = #{prodId},</if>
+            <if test="mercProdId != null">mercProdId = #{mercProdId},</if>
             <if test="prodAttrId != null">prodAttrId = #{prodAttrId},</if>
             <if test="quantity != null">quantity = #{quantity},</if>
             <if test="checkFlag != null">checkFlag = #{checkFlag},</if>
@@ -145,8 +123,7 @@
         set delFlag = '1'
         <where>
             <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
-            <if test="mercId != null "> and mercId = #{mercId}</if>
-            <if test="prodId != null "> and prodId = #{prodId}</if>
+            <if test="mercProdId != null "> and mercProdId = #{mercProdId}</if>
             <if test="prodAttrId != null "> and prodAttrId = #{prodAttrId}</if>
             <if test="quantity != null "> and quantity = #{quantity}</if>
             <if test="checkFlag != null  and checkFlag != ''"> and checkFlag = #{checkFlag}</if>