Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into develop

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -117,6 +117,7 @@ public class OrderSdkAdapter {
         //退款状态为退款完成：event为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
         var1.setCreateEvent(PayRefundStatus.SUCCESS.equals(refundStatus) ? AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent() : AfterSalesOrderCreateEventEnum.RETURN_COMPLETE.getCreateEvent());
         var1.setOperator(operator);
+        var1.setReason(reason);
         return var1;
     }
     public CancelOrderRequest getRejectRefundRequest(String operator,String reason,QueryOrdersResponse.DataBean.OrderBean orderBean){

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -542,6 +542,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOrderCode(orderRefundRequest.getOrderId());
         request.setReqRemark(orderRefundRequest.getRemark());
         request.setAfterSalesReason(orderRefundRequest.getReason());
+        request.setCancelReason(orderRefundRequest.getReason());
         request.setOperator(orderRefundRequest.getOperator());
         if(null != orderRefundRequest.getCreateEvent()) {
             request.setCreateEvent(orderRefundRequest.getCreateEvent());

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -315,10 +315,7 @@ public class ShoppingCartAdapter {
                         updateComboxGoodsInfoNew(productGroup, spuProduct, false);
                     }
                 }
-                //0元套餐 必须选可选或是可选
-                if (CollectionUtils.isEmpty(cartGoods.getProductComboList()) && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
-                    cartGoods.setCartGoodsUid("");
-                }
+                cartGoods.setGoodsType(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
             }
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -229,7 +229,7 @@ public class OrderAdapter {
                     .actualPrice(discountDeliveryAmount)
                     .build();
             if(hasDeliveryMonthCard && StringUtils.isNotBlank(storeResponseDto.getBenefitCardDiscountAmount())) {
-                createOrderAccountDto.setNote((Integer.parseInt(storeResponseDto.getBenefitCardDiscountAmount())*100)+"");
+                createOrderAccountDto.setNote(Double.valueOf(Double.valueOf(storeResponseDto.getBenefitCardDiscountAmount()).intValue()*100)+"");
             }
             orderAccountDtos.add(createOrderAccountDto);
         }

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/MacCafeCallbackUrlRequestDto.java

@@ -74,4 +74,13 @@ public class MacCafeCallbackUrlRequestDto {
      */
     private Integer reviewStatus;
 
+    /**
+     * 取消原因
+     */
+    private String cancelReason;
+
+    /**
+     * 退款发起方，0用户 1餐道
+     */
+    private Integer cancelApplicant;
 }

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -196,6 +196,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         OrderManagerRequest orderManagerRequest=new OrderManagerRequest();
         orderManagerRequest.setPartnerId(request.getPartnerId());
         orderManagerRequest.setOrderId(request.getOrderId());
+        if("1".equals(request.getCancelApplicant())) {
+            orderManagerRequest.setReason(StringUtils.isNotBlank(request.getCancelReason())?request.getCancelReason():"餐道主动取消");
+        } else {
+            orderManagerRequest.setReason(null);
+        }
         orderManagerRequest.setOperator("配送回调");
 
 

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

@@ -97,6 +97,7 @@ public enum ResponseResult {
     SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
 //    SHOPPING_CART_GOODS_CHECK_ERROR("44023", "当前餐盘中没有可用券的饮品"),
     SHOPPING_CART_GOODS_CHECK_ERROR("44028", "当前餐盘中没有可用券的饮品"),
+    SHOPPING_CART_NO_MEAL("44029", "请至少选择一个可选商品"),
     SHOPPING_CART_REQUEST_NOT_EMPTY("44029", "购物车查询条件不能为空"),
     SHOPPING_CART_BUY_ONE_SEND_GOODS_NOT_EMPTY("44030", "未查询到寄件活动商品"),
     SHOPPING_CART_BUY_ONE_SEND_GOODS_ERR("44031", "寄件活动商品错误"),

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -963,6 +963,14 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     }
                 }
             }
+
+            if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                if (CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && CollectionUtils.isEmpty(cartGoods.getProductComboList())) {
+                    cartGoodsList.remove(i);
+                    assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, null, this.shoppingCartBaseService);
+                    throw new ServiceException(ResponseResult.SHOPPING_CART_NO_MEAL);
+                }
+            }
         }
         // 当加价购商品不为空时
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java

@@ -334,7 +334,12 @@ public class CalculationCommonService {
         if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
-        cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        if (calculationGoods!=null) {
+            cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
+        }
+        else {
+            cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        }
         if (calculationGoods!=null) {
             cartGoodsDetailDto.setTotalDiscountAmount(calculationGoods.getDiscountAmount().intValue());
             //cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
@@ -418,6 +423,7 @@ public class CalculationCommonService {
                 originalPriceSum += goodsDetailDto.getOriginalPrice() * (goodsDetailDto.getQty() / cartGoods.getQty());
                 //originalPriceSum += goodsDetailDto.getOriginalPrice() * goodsDetailDto.getQty();
             }
+            cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
             cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice() + originalPriceSum);
         }
         cartGoodsDetailDto.setComboProducts(combs);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java

@@ -126,6 +126,15 @@ public class CalculationSharingDiscountService {
                     }
                 }
             }
+
+
+            if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                if (CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && CollectionUtils.isEmpty(cartGoods.getProductComboList())) {
+                    cartGoodsList.remove(i);
+                    assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, null, this.shoppingCartBaseService);
+                    throw new ServiceException(ResponseResult.SHOPPING_CART_NO_MEAL);
+                }
+            }
         }
 
         /*加价购商品不为空*/