95:红德堂APP调试 添加购物车接口调整

fs-service/src/main/java/com/fs/his/domain/FsIntegralCart.java

@@ -1,6 +1,7 @@
 package com.fs.his.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -44,4 +45,10 @@ public class FsIntegralCart {
      * 修改时间
      */
     private LocalDateTime updateTime;
+
+    /**
+     * 是否追加数量
+     */
+    @TableField(exist = false)
+    private Boolean addToExist;
 }

fs-service/src/main/java/com/fs/his/param/FsIntegralCartParam.java

@@ -19,4 +19,8 @@ public class FsIntegralCartParam {
     @Max(value = 999, message = "数量不再合法范围内")
     @ApiModelProperty("数量")
     private Integer cartNum;
+
+    @NotNull(message = "添加类型不能为空")
+    @ApiModelProperty("是否购物车 0否 1是")
+    private Integer isCart;
 }

fs-service/src/main/java/com/fs/his/service/IFsIntegralCartService.java

@@ -1,12 +1,9 @@
 package com.fs.his.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fs.common.core.domain.R;
 import com.fs.his.domain.FsIntegralCart;
 import com.fs.his.vo.FsIntegralCartVO;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
@@ -15,11 +12,13 @@ public interface IFsIntegralCartService extends IService<FsIntegralCart> {
 
     /**
      * 添加或修改购物车
-     * @param userId    用户ID
-     * @param goodsId   积分商品ID
-     * @param cartNum   数量
+     *
+     * @param userId  用户ID
+     * @param goodsId 积分商品ID
+     * @param cartNum 数量
+     * @param isCart  是否购物车
      */
-    void addOrUpdateCart(Long userId, Long goodsId, Integer cartNum);
+    void addOrUpdateCart(Long userId, Long goodsId, Integer cartNum, Integer isCart);
 
     /**
      * 移除购物车

fs-service/src/main/java/com/fs/his/service/impl/FsIntegralCartServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -34,14 +35,16 @@ public class FsIntegralCartServiceImpl extends ServiceImpl<FsIntegralCartMapper,
 
     /**
      * 添加或修改购物车
-     * @param userId    用户ID
-     * @param goodsId   积分商品ID
-     * @param cartNum   数量
+     *
+     * @param userId  用户ID
+     * @param goodsId 积分商品ID
+     * @param cartNum 数量
+     * @param isCart  是否购物车
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addOrUpdateCart(Long userId, Long goodsId, Integer cartNum) {
-        log.debug("addOrUpdateCart userId: {}, goodsId: {}, cartNum: {}", userId, goodsId, cartNum);
+    public void addOrUpdateCart(Long userId, Long goodsId, Integer cartNum, Integer isCart) {
+        log.debug("addOrUpdateCart userId: {}, goodsId: {}, cartNum: {}, isCart: {}", userId, goodsId, cartNum, isCart);
         FsUser fsUser = userMapper.selectFsUserByUserId(userId);
         if (Objects.isNull(fsUser)) {
             log.warn("addOrUpdateCart user not find userId: {}", userId);
@@ -67,6 +70,7 @@ public class FsIntegralCartServiceImpl extends ServiceImpl<FsIntegralCartMapper,
         cart.setCash(fsIntegralGoods.getCash());
         cart.setCreateTime(LocalDateTime.now());
         cart.setUpdateTime(LocalDateTime.now());
+        cart.setAddToExist(isCart == 0);
         baseMapper.insertOrUpdate(cart);
     }
 

fs-service/src/main/resources/mapper/his/FsIntegralCartMapper.xml

@@ -25,8 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         on duplicate key update
             integral = values(integral),
             cash = values(cash),
-            cart_num = values(cart_num),
-            update_time = values(update_time)
+            update_time = values(update_time),
+            cart_num =
+            <choose>
+                <when test="addToExist == true">
+                    cart_num + values(cart_num)
+                </when>
+                <otherwise>
+                    values(cart_num)
+                </otherwise>
+            </choose>
     </insert>
 
     <select id="getCartCountByMap" resultType="java.lang.Integer">

fs-user-app/src/main/java/com/fs/app/controller/IntegralController.java

@@ -203,7 +203,7 @@ public class IntegralController extends  AppBaseController {
     @PostMapping("/addOrUpdateCart")
     public R addOrUpdateCart(@Validated @RequestBody FsIntegralCartParam param) {
         log.debug("addOrUpdateCart param: {}", JSON.toJSONString(param));
-        cartService.addOrUpdateCart(Long.parseLong(getUserId()), param.getGoodsId(), param.getCartNum());
+        cartService.addOrUpdateCart(Long.parseLong(getUserId()), param.getGoodsId(), param.getCartNum(), param.getIsCart());
         return R.ok();
     }