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

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml

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

@@ -116,6 +116,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

@@ -543,6 +543,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/readme.md

@@ -10,4 +10,5 @@
 | 1.1.2.RELEASE| 券码接口修改为channel_code  | 胡超 | 2020-06-08  |
 | 1.1.3.RELEASE| 增加统计分类classificationId  ,setClassificationName  |  | 2020-06-16  |
 | 1.1.5.RELEASE| 商品加料    |  | 2020-08-24  |
-| 1.1.6.RELEASE| 新增商品券名称字段| 孙昱 | 2020-11-09 |
+| 1.1.6.RELEASE| 新增商品券名称字段| 孙昱 | 2020-11-09 |
\ No newline at end of file
+| 1.1.7.RELEASE| 标识套餐类型| 孙昱 | 2020-12-01 |
\ No newline at end of file

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

@@ -170,6 +170,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/service/impl/ShoppingCartNewServiceImpl.java

@@ -939,7 +939,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         // 校验后有效的商品券map
         Map<String, CheckSpqInfoResponseDto> validCouponMap = new HashMap<>(16);
-        log.info("getActivityCalculationDiscountResponse:{}",JSON.toJSONString(cartGoodsList));
         for (int i = cartGoodsList.size() - 1; i >= 0; i--) {
             CartGoods cartGoods = cartGoodsList.get(i);
             String cartGoodsUid = cartGoods.getCartGoodsUid();

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

@@ -75,7 +75,6 @@ public class CalculationSharingDiscountService {
         HashMap<String, CheckSpqInfoResponseDto> validCouponMap = new HashMap<>(16);
         List<CalculationSharingDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList = new ArrayList<>();
         int cartSize = cartGoodsList.size() - 1;
-        log.info("getCalculationSharingDiscountResult:{}",JSON.toJSONString(cartGoodsList));
         for (int i = cartSize; i >= 0; i--) {
             CartGoods cartGoods = cartGoodsList.get(i);
             if (!cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {//非商品券