Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of…

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -47,6 +47,11 @@ public class CartGoods {
      */
     private String unit;
 
+    /**
+     * 商品券code
+     */
+    private String couponCode;
+
     private String spuId;
     private String skuId;
     /**

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -85,6 +85,7 @@ public class ShoppingCartConvertAdapter {
         // 设置基础信息
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
         cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
+        cartGoodsDetailDto.setTas(0.02d);
         cartGoodsDetailDto.setSpuId(cartGoods.getSpuId());
         cartGoodsDetailDto.setSpuName(cartGoods.getSpuName());
         cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
@@ -362,6 +363,7 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setSpuId(spuId);
         cartGoods.setSkuId(skuId);
         cartGoods.setQty(qty);
+        cartGoods.setCouponCode(addShoppingCartGoodsRequestVo.getCouponCode());
         Integer goodsType = StringUtils.isEmpty(skuId)||ObjectUtils.equals(spuId,skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
         if (spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
             goodsType = GoodsTypeEnum.COUPON_GOODS.getGoodsType();

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

@@ -2,9 +2,8 @@ package cn.freemud.controller;
 
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.*;
-import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.impl.mcoffee.ShoppingCartMCoffeeServiceImpl;
-import cn.freemud.utils.ResponseUtil;
+import cn.freemud.service.impl.mcoffee.entity.MCoffeeAddGoodsRequestVo;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import io.swagger.annotations.Api;
@@ -43,7 +42,7 @@ public class MCoffeeShoppingCartController {
      */
     @ApiAnnotation(logMessage = "addGoods")
     @PostMapping(value = "/addGoods")
-    public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
+    public BaseResponse addGoods(@Validated @LogParams @RequestBody MCoffeeAddGoodsRequestVo request) {
         return shoppingCartMCoffeeService.addGoods(request);
     }
 

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

@@ -117,6 +117,30 @@ public class ActivityCalculationDiscountRequestDto {
          */
         private List<Material> smallMaterial;
 
+        private List<Material> smallMaterial;
+
+
+        @Data
+        @NoArgsConstructor
+        static public class Material {
+            /**
+             * 加料商品ID
+             */
+            private String goodsId;
+            /**
+             * 加料数量
+             */
+            private Integer goodsQuantity;
+            /**
+             * 加料单价
+             */
+            private Long originalPrice;
+            /**
+             * 1 :小料、2：可选搭配
+             */
+            private int type;
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o)
@@ -156,4 +180,5 @@ public class ActivityCalculationDiscountRequestDto {
             private int type;
         }
     }
+
 }

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

@@ -226,6 +226,11 @@ public class ShoppingCartGoodsDto {
          * 统计分类名称
          */
         private String classificationName;
+
+        /**
+         * 税率
+         */
+        private Double tas;
         /**
          * 配料或属性
          */

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

@@ -20,7 +20,8 @@ public enum GoodsTypeEnum {
     SET_MEAL_GOODS(3, "套餐商品"),
     SKU_GOODS(4, "sku商品"),
     SPU_GOODS(5, "spu商品"),
-    MATERIAL(88, "有加料的商品");
+    MATERIAL(88, "有加料的商品"),
+    REDUCE_PRICE_GOODS(6,"加价购商品");
 
     private Integer goodsType;
     private String desc;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -11,12 +11,10 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityChannelEnum;
 import cn.freemud.enums.ActivityTypeEnum;
-import cn.freemud.enums.CouponFlag;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.thirdparty.ActivityClient;
-import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -27,7 +25,6 @@ import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -121,7 +118,7 @@ public class CalculationServiceImpl {
 
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         for (CartGoods cartGoods : cartGoodsList) {
-            addCalculationDiscountGoods(calculationDiscountGoodsList, cartGoods.getCustomerCode(),cartGoods.getGoodsId(), cartGoods.getQty(), cartGoods.getFinalPrice(), cartGoods.getMemberDiscount());
+            addCalculationDiscountGoods(calculationDiscountGoodsList, cartGoods.getCustomerCode(),cartGoods.getGoodsId(), cartGoods.getQty(), cartGoods.getFinalPrice(), cartGoods.getMemberDiscount(),cartGoods);
         }
 
         if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
@@ -130,7 +127,7 @@ public class CalculationServiceImpl {
         // 当加价购商品不为空时
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {
             for (ShoppingCartInfoRequestVo.SendGoods sendGoods : sendGoodsList) {
-                this.addCalculationDiscountGoods(calculationDiscountGoodsList, sendGoods.getGoodsId(), sendGoods.getGoodsId(), sendGoods.getQty(), sendGoods.getOriginalPrice(), 100);
+                this.addCalculationDiscountGoods(calculationDiscountGoodsList, sendGoods.getGoodsId(), sendGoods.getGoodsId(), sendGoods.getQty(), sendGoods.getOriginalPrice(), 100,null);
             }
         }
         calculationDiscountGoodsList.removeIf(calculationDiscountGoods -> (calculationDiscountGoods.getGoodsQuantity().equals(0)));
@@ -345,7 +342,7 @@ public class CalculationServiceImpl {
      * @param originalPrice
      */
     private void addCalculationDiscountGoods(List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList,
-                                             String goodsCode,String goodsId, Integer goodsQuantity, Long originalPrice, Integer memberDiscount) {
+                                             String goodsCode,String goodsId, Integer goodsQuantity, Long originalPrice, Integer memberDiscount,CartGoods cartGoods) {
         ActivityCalculationDiscountRequestDto.CalculationDiscountGoods calculationDiscountGoods = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods();
         calculationDiscountGoods.setGoodsCode(goodsCode);
         calculationDiscountGoods.setGoodsId(goodsId);
@@ -353,6 +350,21 @@ public class CalculationServiceImpl {
         calculationDiscountGoods.setOriginalPrice(originalPrice);
         calculationDiscountGoods.setMemberDiscount(memberDiscount);
 
+
+        //可选搭配
+        if (cartGoods != null && CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
+            ArrayList<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material> materials = new ArrayList<>();
+            for (CartGoods.ComboxGoods materialGoods : cartGoods.getProductGroupList()) {
+                ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
+                material.setType(2);
+                material.setGoodsId(materialGoods.getGoodsId());
+                material.setGoodsQuantity(cartGoods.getQty());
+                material.setOriginalPrice(materialGoods.getFinalPrice());
+                materials.add(material);
+            }
+            calculationDiscountGoods.setSmallMaterial(materials);
+        }
+
         //累加需加入计算的商品
         int index;
         // 当商品已存在时,需累加数量
@@ -387,31 +399,4 @@ public class CalculationServiceImpl {
         shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscount == null ? 0L : calculationDiscount.getTotalDiscountAmount());
     }
 
-
-    /**
-     * 可选优惠券
-     */
-    public ActivityClassifyCouponBean availableCoupon(String partnerId, String storeId, String userId, String appId, Integer orderType,
-                                 boolean isMember, String menuType, String receiveId,String couponCode,
-                                 List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
-                                 List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo){
-        Long deliveryAmount = 0L;
-        QueryDeliverDetailResponse response = calculateDeliveryAmount(receiveId, partnerId, storeId, appId);
-        if(response != null){
-            shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(response.getDeliveryFeeZeroReason() != null ? response.getDeliveryFeeZeroReason() : 0);
-            deliveryAmount = response.getDeliveryAmount();
-        }
-
-        ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = getCalculationDiscount(partnerId, storeId, userId, appId, orderType, isMember,
-                menuType, deliveryAmount, cartGoodsList, coupons, sendGoodsList);
-
-        //优惠券
-        CouponPromotionVO couponPromotionVO = couponDiscountCalculation.getCouponPromotionVO(partnerId, storeId, userId, couponCode, orderType);
-        couponDiscountCalculation.updateShoppingCartGoodsDiscount(couponPromotionVO,calculationDiscount,cartGoodsList, shoppingCartGoodsResponseVo);
-
-        return shoppingCartGoodsResponseVo.getAvailableCoupon();
-
-    }
-
-
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.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.ShoppingCartInfoRequestVo;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: MCoffeeAddGoodsRequestVo
+ * @Package cn.freemud.service.impl.mcoffee.entity
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/8/8 21:04
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class MCoffeeAddGoodsRequestVo {
+
+
+    @NotEmpty(message = "sessionId不能为空")
+    private String sessionId;
+    /**
+     * 商户Id
+     */
+    @NotEmpty(message = "partnerId不能为空")
+    private String partnerId;
+
+    /**
+     * 微信appId
+     */
+    @NotEmpty(message = "appId不能为空")
+    private String appId;
+    /**
+     * 门店Id
+     * 商城没有门店id，如果需要门店id必传在业务中进行校验
+     */
+    //@NotEmpty(message = "shopId不能为空")
+    private String shopId;
+
+    /**
+     * 下单类型 CreateOrderType 外卖、到店、商城
+     */
+    private Integer orderType;
+
+    /**
+     * 渠道类型 OrderChannelType
+     */
+    private String channelType;
+
+    private String spuId;
+
+    private String skuId;
+    /**
+     * 商品额外的属性
+     */
+    private List<CartGoods.CartGoodsExtra> extra;
+
+    private String version;
+
+    /**
+     * 1.6.0 版本增加  节点ID
+     */
+    private String nodeId;
+    /**
+     * 1.6.0 版本增加 分类名
+     */
+    private String categoryName;
+    /**
+     * 套餐固定商品
+     */
+    private List<ComboxGoodsRequestVo> productComboList;
+    /**
+     * 套餐可选商品
+     */
+    private List<ComboxGoodsRequestVo> productGroupList;
+
+
+    private String appType;
+
+    private String tableNumber;
+    /**
+     * 数量
+     */
+    private Integer qty;
+
+    /**
+     * 业务类型： 0 : 自提 1：外卖 2：微商城
+     */
+    private String menuType ;
+
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+
+    /**
+     * 操作类型 1= 添加商品券 2=加价购
+     */
+    private Integer operationType;
+
+    /**
+     * 优惠券号
+     */
+    private String couponCode;
+
+}