Merge branch '2020/09/24-运费券-huiyang'

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

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

@@ -5,6 +5,7 @@ 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 com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
@@ -66,6 +67,15 @@ public class MCoffeeShoppingCartController {
 
 
     /**
+     * 修改或者新增购物车中商品
+     */
+    @ApiAnnotation(logMessage = "updateGoodsByCard")
+    @PostMapping(value = "/card/updateGoods")
+    public BaseResponse updateGoodsByCard(@Validated @LogParams @RequestBody MCoffeeCardAddVo request) {
+        return shoppingCartMCoffeeService.updateGoodsByCard(request);
+    }
+
+    /**
      * 查询购物车信息
      */
     @ApiAnnotation(logMessage = "listCartGoods")

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

@@ -88,6 +88,10 @@ public class ActivityCalculationDiscountRequestDto {
          */
         private String goodsCode;
         /**
+         * 商品核销券号
+         */
+        private String couponCode;
+        /**
          * 商品ID
          */
         private String goodsId;

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

@@ -154,7 +154,9 @@ public class ActivityCalculationDiscountResponseDto {
             private Integer type;
 
             private Long thresholdAmount;
-
+            /**
+             * 运费月卡入机字段
+             */
             private String tenderId;
         }
 

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

@@ -52,6 +52,10 @@ public class CartGoods {
      * 商品券code
      */
     private String couponCode;
+    /**
+     * 商品券名称
+     */
+    private String couponName;
 
     private String spuId;
     private String skuId;

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

@@ -115,4 +115,9 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
         private String ruleId;
     }
 
+    /**
+     * 运费卡券
+     */
+    private String freightCouponCode;
+
 }

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

@@ -91,6 +91,7 @@ public enum ResponseResult {
     SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),
     SHOPPING_CART_HG_COUPON_NOT_EXIST("44027", "换购券不存在"),
     SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
+    SHOPPING_CART_GOODS_CHECK_ERROR("44028", "当前餐盘中没有可用券的饮品"),
 
     /**
      * 订单状态码

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

@@ -372,6 +372,9 @@ public class CalculationServiceImpl {
         calculationDiscountGoods.setGoodsQuantity(goodsQuantity);
         calculationDiscountGoods.setOriginalPrice(originalPrice);
         calculationDiscountGoods.setMemberDiscount(memberDiscount);
+        //新增咖啡月卡券券号
+        calculationDiscountGoods.setCouponCode(cartGoods.getCouponCode());
+        calculationDiscountGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
 
         ArrayList<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material> materials = new ArrayList<>();
         //可选搭配
@@ -455,11 +458,8 @@ public class CalculationServiceImpl {
         shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + totalPackgeAmount);
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscount == null ? 0L : calculationDiscount.getTotalDiscountAmount());
-        if(calculationDiscount != null && calculationDiscount.getDeliveryAmount() == null){
-            shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
-            shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
-
-        }
+        shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
+        shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscount == null ? 0L :calculationDiscount.getDistributionFee());
     }
 
 }

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

+package cn.freemud.service.impl.mcoffee.entity;
+
+import lombok.Data;
+
+@Data
+public class MCoffeeCardAddVo extends MCoffeeAddGoodsRequestVo{
+
+
+    /**
+     * true : 选中
+     * false : 取消选中
+     */
+    private Boolean isSelect;
+
+}