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

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

@@ -724,6 +724,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
         request.setOrderClient(cancelOrderRequest.getOrderClient());
         request.setCancelReason(cancelOrderRequest.getReason());
+        request.setAfterSalesReason(cancelOrderRequest.getReason());
         //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
         request.setCreateEvent(cancelOrderRequest.getCreateEvent());
         request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());

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(Double.valueOf(Double.valueOf(storeResponseDto.getBenefitCardDiscountAmount()).intValue()*100)+"");
+                createOrderAccountDto.setNote(Double.valueOf(Double.valueOf(storeResponseDto.getBenefitCardDiscountAmount())*100).intValue()+"");
             }
             orderAccountDtos.add(createOrderAccountDto);
         }

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -1027,7 +1027,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     @Override
     public BaseResponse orderRefund(OrderRefundVo orderRefundVo) {
         if (StringUtils.isEmpty(orderRefundVo.getReason())) {
-            orderRefundVo.setReason("退款");
+            orderRefundVo.setReason("用户申请退款");
         }
         AssortmentCustomerInfoVo userInfo = customerInfoManager.getCustomerInfoByObject(orderRefundVo.getSessionId());
         if (userInfo == null || StringUtils.isEmpty(userInfo.getMemberId())) {