sunyu::update::重拉master分支代码逻辑合并

shopping-cart-application-service/src/main/java/cn/freemud/controller/MCoffeeShoppingCartController.java

@@ -3,10 +3,7 @@ package cn.freemud.controller;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.*;
 import cn.freemud.service.impl.mcoffee.ShoppingCartMCoffeeServiceImpl;
-import cn.freemud.service.impl.mcoffee.entity.CopyShoppingCartRequestVo;
-import cn.freemud.service.impl.mcoffee.entity.MCoffeeAddGoodsRequestVo;
-import cn.freemud.service.impl.mcoffee.entity.MCoffeeCardAddVo;
-import cn.freemud.service.impl.mcoffee.entity.SwitchShoppingCartRequestVo;
+import cn.freemud.service.impl.mcoffee.entity.*;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
@@ -50,6 +47,15 @@ public class MCoffeeShoppingCartController {
     }
 
     /**
+     * 批量向购物车中添加商品
+     */
+    @ApiAnnotation(logMessage = "batchAddGoods")
+    @PostMapping(value = "/batchAddGoods")
+    public BaseResponse addBatchGoods(@Validated @LogParams @RequestBody MCoffeeBatchAddGoodsRequestVo request) {
+        return shoppingCartMCoffeeService.addBatchGoods(request);
+    }
+
+    /**
      * 修改购物车中商品数量
      */
     @ApiAnnotation(logMessage = "updateGoodsQty")
@@ -58,6 +64,24 @@ public class MCoffeeShoppingCartController {
         return shoppingCartMCoffeeService.updateGoodsQty(request);
     }
 
+    /**
+     * 批量操作购物车商品接口
+     */
+    @ApiAnnotation(logMessage = "batchOperateGoods")
+    @PostMapping(value = "/batchOperateGoods")
+    public BaseResponse batchOperateShoppingCartGoods(@Validated @LogParams @RequestBody BatchOperateCartGoodsRequestVo request) {
+        return shoppingCartMCoffeeService.batchOperateShoppingCartGoods(request);
+    }
+
+    /**
+     * 批量修改购物车中商品数量
+     */
+    @ApiAnnotation(logMessage = "batchUpdateGoodsQty")
+    @PostMapping(value = "/batchUpdateGoodsQty")
+    public BaseResponse batchUpdateGoodsQty(@Validated @LogParams @RequestBody BatchUpdateGoodsQtyRequestVo request) {
+        return shoppingCartMCoffeeService.batchUpdateGoodsQty(request);
+    }
+
 
     @ApiAnnotation(logMessage = "getCartInfoByUser")
     @PostMapping(value = "/getCartInfoByUser")

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

@@ -83,6 +83,10 @@ public class ActivityCalculationDiscountRequestDto {
          * 活动号
          */
         private String activityCode;
+        /**
+         * 是否为种子券商品
+         */
+        private int isSeedCouponGoods;
     }
 
     @Data

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/BatchOperateCartGoodsRequestVo.java

+package cn.freemud.entities.vo;
+
+import cn.freemud.service.impl.mcoffee.entity.BatchGoodsInfoVo;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.util.List;
+
+@Data
+public class BatchOperateCartGoodsRequestVo extends BaseRequestVo{
+    @NotEmpty(message = "sessionId不能为空")
+    private String sessionId;
+
+    @NotEmpty(message = "appId不能为空")
+    private String appId;
+
+
+    private String version;
+    /**
+     * 购物车版本号（围餐、拼单）
+     */
+    private Integer carVer;
+
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private String menuType ;
+
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+
+    /**
+     * 商品数量信息
+     */
+    private List<GoodsQtyInfo> qtyInfoList;
+
+    /**
+     * 商品信息
+     */
+    @NotEmpty(message = "商品信息不可为空")
+    private List<BatchGoodsInfoVo> goodsInfos;
+
+}
\ No newline at end of file

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/BatchUpdateGoodsQtyRequestVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.util.List;
+
+@Data
+public class BatchUpdateGoodsQtyRequestVo extends BaseRequestVo{
+
+    @NotEmpty(message = "sessionId不能为空")
+    private String sessionId;
+
+    @NotEmpty(message = "appId不能为空")
+    private String appId;
+
+
+    private String version;
+    /**
+     * 购物车版本号（围餐、拼单）
+     */
+    private Integer carVer;
+
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private String menuType ;
+
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+
+    private List<GoodsQtyInfo> qtyInfoList;
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/GoodsQtyInfo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class  GoodsQtyInfo{
+    /**
+     * 购物车一行的ID
+     */
+    @NotEmpty(message = "cartGoodsUid不能为空")
+    private String cartGoodsUid;
+
+    /**
+     * 更新后商品数量
+     */
+    @NotNull(message = "qty不能为空")
+    private Integer qty;
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/UpdateShoppingCartGoodsQtyRequestVo.java

@@ -37,6 +37,10 @@ public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
     private String createCollageUserId;
 
     /**
+     * 更新前数量
+     */
+    private Integer oldQty;
+    /**
      * 更新后商品数量
      */
     @NotNull(message = "qty不能为空")

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -102,6 +102,7 @@ public enum ResponseResult {
     SHOPPING_CART_BUY_ONE_SEND_GOODS_ERR("44033", "寄件活动商品错误"),
     SHOPPING_CART_COUPON_MIX_NOT_EXIST("44034", "券商品不存在"),
     SHOPPING_CART_QTY_LIMIT_ERR("44035", "该商品单次购买数量限制为10，请知晓"),
+    SHOPPING_CART_SEED_COUPON_VALID("44037","券商品数量不可大于券数量"),
 
     /**
      * 订单状态码

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/BatchGoodsInfoVo.java

+package cn.freemud.service.impl.mcoffee.entity;
+
+import cn.freemud.entities.vo.CartGoods;
+import cn.freemud.entities.vo.ComboxGoodsRequestVo;
+import cn.freemud.entities.vo.MaterialRequestVo;
+import cn.freemud.entities.vo.MonthCardVo;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By sunary.site
+ *
+ * @version v1.0
+ * @Title: IntelliJ IDEA
+ * @Package cn.freemud.service.impl.mcoffee.entity
+ * @Description: 请简单描述下这个类是做什么用的
+ * @author: yu.sun
+ * @date: 2021-01-26 09:50:21
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+public class BatchGoodsInfoVo {
+    @NotEmpty(message = "spuId不能为空")
+    private String spuId;
+
+    private String skuId;
+
+    /**
+     * 数量
+     */
+    @NotNull(message = "商品数量不可为空")
+    private Integer qty;
+
+    /**
+     * 操作类型 1= 添加商品券 2=加价购
+     */
+    private Integer operationType;
+
+
+    /**
+     * 套餐名称
+     */
+    private String groupName;
+
+    /**
+     * 1.6.0 版本增加 分类名
+     */
+    private String categoryName;
+    /**
+     * 商品额外的属性
+     */
+    private List<CartGoods.CartGoodsExtra> extra;
+    /**
+     * 套餐固定商品
+     */
+    private List<ComboxGoodsRequestVo> productComboList;
+    /**
+     * 套餐可选商品
+     */
+    private List<ComboxGoodsRequestVo> productGroupList;
+
+    /**
+     * 加料
+     */
+    private List<MaterialRequestVo> productMaterialList;
+
+    /**
+     * 麦咖啡定制属性
+     */
+    private List<CartGoods.SpecialExtra> specialExtra;
+
+    /**
+     * 券类型 0：商品券
+     */
+    private Integer couponType;
+    /**
+     * 商品券门槛金额
+     */
+    private Long couponThresholdAmount;
+
+    /**
+     * 是否是太阳蛋商品
+     */
+    private int isSunnyCoupon = 0;
+
+    /**
+     * 优惠券号
+     */
+    private String couponCode;
+
+    /**
+     * 买三赠一券code
+     */
+    private String buyThreeGiveOneCouponCode;
+    /**
+     * 买三赠一券活动号
+     */
+    private String buyThreeGiveOneActivityCode;
+
+    /**
+     * 当前商品是否为月享卡，0:否，1:是
+     */
+    private int isMonthCard;
+    /**
+     * 是否为种子券商品 1:是；0:否
+     */
+    private int isSeedCouponGoods;
+    /**
+     * 月享卡加购信息
+     */
+    private MonthCardVo monthCardInfo;
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeBatchAddGoodsRequestVo.java

+package cn.freemud.service.impl.mcoffee.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By sunary.site
+ *
+ * @version v1.0
+ * @Title: IntelliJ IDEA
+ * @Package cn.freemud.service.impl.mcoffee.entity
+ * @Description: 请简单描述下这个类是做什么用的
+ * @author: yu.sun
+ * @date: 2021-01-26 09:48:38
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ */
+@Getter
+@Setter
+public class MCoffeeBatchAddGoodsRequestVo {
+    @NotEmpty(message = "sessionId不能为空")
+    private String sessionId;
+    /**
+     * 商户Id
+     */
+    @NotEmpty(message = "partnerId不能为空")
+    private String partnerId;
+
+    /**
+     * 微信appId
+     */
+    @NotEmpty(message = "appId不能为空")
+    private String appId;
+    /**
+     * 门店Id
+     * 商城没有门店id，如果需要门店id必传在业务中进行校验
+     */
+    private String shopId;
+
+    /**
+     * 下单类型 CreateOrderType 外卖、到店、商城
+     */
+    private Integer orderType;
+
+    /**
+     * 渠道类型 OrderChannelType
+     */
+    private String channelType;
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private String menuType ;
+
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+    /**
+     * 商品信息
+     */
+    @NotEmpty(message = "商品信息不可为空")
+    private List<BatchGoodsInfoVo> goodsInfos;
+}