Merge remote-tracking branch 'remotes/origin/feature/fixbug-退款原因' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java

@@ -60,7 +60,7 @@ public class CancelOrderRequest extends BaseConfig {
      *
      */
     private Integer createEvent;
-    private Integer orderClient= OrderClientType.SAAS.getIndex();
+    private Integer orderClient = OrderClientType.SAAS.getIndex();
 
     //操作人
     private String operator;
@@ -70,4 +70,8 @@ public class CancelOrderRequest extends BaseConfig {
      */
     @Builder.Default
     private boolean isRefundDeliveryAmount = true;
+    /**
+     * 取消原因
+     */
+    private String afterSalesReason;
 }

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

@@ -1547,6 +1547,7 @@ public class OrderServiceImpl implements Orderservice {
                 cancelOrderRequest.setOperator(orderBean.getUserName());
                 cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
                 cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
+                cancelOrderRequest.setAfterSalesReason(orderRefundVo.getReason());
                 BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
 
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
@@ -1600,6 +1601,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
         cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
+        cancelOrderRequest.setAfterSalesReason(orderRefundVo.getReason());
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
         if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");