bugfix: 修复订单退款 orderclient写死了的问题

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

@@ -143,6 +143,7 @@ public class OrderSdkAdapter {
         var1.setRefundState(PayRefundStatus.SUCCESS.equals(refundStatus) ? 4 : 2);
         var1.setOperator(operator);
         var1.setReason(reason);
+        var1.setOrderClient(StringUtils.isEmpty(orderBean.getOrderClient()) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderBean.getOrderClient()));
         return var1;
     }
 
@@ -166,7 +167,7 @@ public class OrderSdkAdapter {
     }
 
     public CancelOrderRequest convent2CancelOrderRequest(String orderId, String partnerId, AfterSalesType afterSalesType,
-                                                         String reason, String trackingNo, Long refund_id) {
+                                                         String reason, String trackingNo, Long refund_id,String orderClient) {
         CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
         cancelOrderRequest.setOrderId(orderId);
         cancelOrderRequest.setPartnerId(partnerId);
@@ -178,6 +179,7 @@ public class OrderSdkAdapter {
         cancelOrderRequest.setCreateEvent(4);
         cancelOrderRequest.setRefundState(AfterSalesRefunStateEnum.STATE_1.getIndex());
         cancelOrderRequest.setOperationClient(OperationClientEnum.STATE_6.getIndex());
+        cancelOrderRequest.setOrderClient(StringUtils.isEmpty(orderClient) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderClient));
         if (refund_id != null) {
             cancelOrderRequest.setRefundSerialNo(refund_id.toString());
         }

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

@@ -219,7 +219,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
                 //TODO 失败取消订单
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
             }
@@ -236,7 +236,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean);
@@ -250,7 +250,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, userScoreResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean);
@@ -265,7 +265,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(), orderBean.getShopId()));
             BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.precheckAndLock(request, LogThreadLocal.getTrackingNo());
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
+                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean);
@@ -975,7 +975,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         //售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
         // 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消，
         request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
-        request.setOrderClient(OrderClientType.SAAS.getIndex());
+        request.setOrderClient(cancelOrderRequest.getOrderClient());
         request.setCancelReason(cancelOrderRequest.getReason());
         //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
         request.setCreateEvent(4);
@@ -997,7 +997,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             //售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
             // 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消，
             request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
-            request.setOrderClient(OrderClientType.SAAS.getIndex());
+            request.setOrderClient(StringUtils.isEmpty(orderBean.getOrderClient()) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderBean.getOrderClient()));
             request.setCancelReason(cancelOrderRequest.getReason());
             request.setReqRemark(cancelOrderRequest.getReqRemark());
             request.setAfterSalesReason(cancelOrderRequest.getReason());
@@ -2407,6 +2407,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
         request.setOperationClient(cancelOrderRequest.getOperationClient());
         request.setRefundState(cancelOrderRequest.getRefundState());
+        request.setOrderClient(cancelOrderRequest.getOrderClient());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

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

@@ -2227,11 +2227,12 @@ public class OrderAdapter {
     }
 
     public CancelOrderRequest convent2CancelOrderRequest(String orderId, String partnerId, AfterSalesType afterSalesType,
-                                                         String reason, String trackingNo, String refundId) {
+                                                         String reason, String trackingNo, String refundId, String orderClient) {
         CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
         cancelOrderRequest.setOrderId(orderId);
         cancelOrderRequest.setPartnerId(partnerId);
         cancelOrderRequest.setAfterSalesType(afterSalesType);
+        cancelOrderRequest.setOrderClient(StringUtils.isEmpty(orderClient) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderClient));
         if (StringUtils.isNotBlank(reason) && reason.length() > 50) {
             reason = reason.substring(0, 50);
         }

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

@@ -271,7 +271,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
                 //TODO 失败取消订单
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
             }
@@ -286,7 +286,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getStatusCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersStatusChange(orderBean);
@@ -301,7 +301,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, userScoreResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersStatusChange(orderBean);
@@ -316,7 +316,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
             request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
             BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.precheckAndLock(request, LogThreadLocal.getTrackingNo());
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
+                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersStatusChange(orderBean);

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

@@ -271,7 +271,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null, orderBean.getOrderClient());
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             return ResponseUtil.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
         }

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

@@ -743,7 +743,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (!notCancelOrderClientList.contains(orderClient)) {
             //失败冲正库存，冲正活动库存，取消订单
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null, orderBean.getOrderClient());
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             // TODO: 2019/9/10 hubowen mq推送变更
             orderQueueService.backOrdersStatusChange(orderBean);
@@ -918,7 +918,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null, orderBean.getOrderClient());
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             //如果编辑订单支付信息失败，冲正
             orderQueueService.backOrdersStatusChange(orderBean);
@@ -1346,7 +1346,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
         }
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                partnerId, afterSalesType, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
+                partnerId, afterSalesType, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString(), orderBean.getOrderClient());
         cancelOrderRequest.setOperator(orderBean.getUserName());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
         if (PayRefundStatus.SUCCESS.getCode().intValue() == state) {

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

@@ -704,7 +704,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             state = payRefundResponse.getPayRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : payRefundResponse.getPayRefundStatus().getCode();
         }
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                partnerId, AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
+                partnerId, AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString() ,orderBean.getOrderClient());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
         if (PayRefundStatus.RUNNING.getCode().intValue() == state) {
             // 退款中

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

@@ -1809,7 +1809,7 @@ public class OrderServiceImpl implements Orderservice {
         if (CollectionUtils.isEmpty(deletePartnerId) || deletePartnerId.contains("") || deletePartnerId.contains(partnerId)) {
             String reason = "用户取消支付";
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                    partnerId, AfterSalesType.USER_CANCEL, reason, LogThreadLocal.getTrackingNo(), System.currentTimeMillis() + "");
+                    partnerId, AfterSalesType.USER_CANCEL, reason, LogThreadLocal.getTrackingNo(), System.currentTimeMillis() + "" ,orderBean.getOrderClient());
             cancelOrderRequest.setOperator(orderBean.getUserName());
             cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
             cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
@@ -1866,6 +1866,7 @@ public class OrderServiceImpl implements Orderservice {
         var1.setOperator("admin");
         //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
         var1.setCreateEvent(4);
+        var1.setOrderClient(StringUtils.isEmpty(orderBean.getOrderClient()) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderBean.getOrderClient()));
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(var1);
         if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {
             return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR.getCode(), baseOrderResponse.getErrmsg());
@@ -2099,11 +2100,11 @@ public class OrderServiceImpl implements Orderservice {
         }
 
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                partnerId, afterSalesType, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
+                partnerId, afterSalesType, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString() ,orderBean.getOrderClient());
         cancelOrderRequest.setOperator(orderBean.getUserName());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
         cancelOrderRequest.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
-        cancelOrderRequest.setOrderClient(StringUtils.isEmpty(orderBean.getOrderClient()) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderBean.getOrderClient()));
+        cancelOrderRequest.setOrderClient(cancelOrderRequest.getOrderClient());
         if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) {
             //退款成功
             cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
@@ -3041,7 +3042,7 @@ public class OrderServiceImpl implements Orderservice {
         String trackingNo = LogThreadLocal.getTrackingNo();
         for (OrderBeanV1 orderBean : orderBeans) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                    partnerId, afterSalesType, orderRefundVo.getReason(), trackingNo, Long.toString(refundId));
+                    partnerId, afterSalesType, orderRefundVo.getReason(), trackingNo, Long.toString(refundId) ,orderBean.getOrderClient());
 
             cancelOrderRequest.setOperator(Optional.ofNullable(cancelOrderRequest.getOperator()).orElse(orderBean.getUserName()));
             cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
@@ -3346,7 +3347,7 @@ public class OrderServiceImpl implements Orderservice {
      */
     private String cancelOrder(OrderBeanV1 orderBean) {
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                orderBean.getCompanyId(), AfterSalesType.OTHER, "退款回掉取消订单", LogThreadLocal.getTrackingNo(), null);
+                orderBean.getCompanyId(), AfterSalesType.OTHER, "退款回掉取消订单", LogThreadLocal.getTrackingNo(), null ,orderBean.getOrderClient());
         cancelOrderRequest.setOperator("退款成功回掉");
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
         //退款成功
@@ -3835,7 +3836,7 @@ public class OrderServiceImpl implements Orderservice {
         // fisherman  ----> 支付校验 end
         // 调用基础服务, 进行订单状态变更
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
-                orderBean.getCompanyId(), AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
+                orderBean.getCompanyId(), AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString() ,orderBean.getOrderClient());
         cancelOrderRequest.setOperator(orderBean.getUserName());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
         Integer refundStates = AfterSalesRefunStateEnum.STATE_1.getIndex();

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

@@ -1032,7 +1032,7 @@ public class PayServiceImpl {
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.editOrder(updateOrderReq, orderEditRequest.getTrackingNo());
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, response.getCode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null ,orderBean.getOrderClient());
             OrderCancelReq request = new OrderCancelReq();
             //商户号必传
             request.setPartnerId(cancelOrderRequest.getPartnerId());
@@ -1041,7 +1041,7 @@ public class PayServiceImpl {
             //售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
             // 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消，
             request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
-            request.setOrderClient(cancelOrderRequest.getOrderClient());
+            request.setOrderClient(StringUtils.isEmpty(orderBean.getOrderClient()) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderBean.getOrderClient()));
             request.setCancelReason(cancelOrderRequest.getReason());
             request.setAfterSalesReason(cancelOrderRequest.getReason());
             //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
@@ -1089,7 +1089,7 @@ public class PayServiceImpl {
         if (!notCancelOrderClientList.contains(orderClient)) {
             //失败冲正库存，冲正活动库存，取消订单
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, StringUtils.join(new String[]{"获取预支付失败", msg}, '-'), trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, StringUtils.join(new String[]{"获取预支付失败", msg}, '-'), trackingNo, null ,orderBean.getOrderClient());
             OrderCancelReq request = new OrderCancelReq();
             //商户号必传
             request.setPartnerId(cancelOrderRequest.getPartnerId());
@@ -1098,7 +1098,7 @@ public class PayServiceImpl {
             //售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
             // 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消，
             request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
-            request.setOrderClient(cancelOrderRequest.getOrderClient());
+            request.setOrderClient(StringUtils.isEmpty(orderBean.getOrderClient()) ? OrderClientType.SAAS.getIndex() : Integer.valueOf(orderBean.getOrderClient()));
             request.setCancelReason(cancelOrderRequest.getReason());
             request.setAfterSalesReason(cancelOrderRequest.getReason());
             //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】

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

@@ -259,7 +259,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
                 if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
                     //TODO 失败取消订单
                     CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                            AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
+                            AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null ,orderBean.getOrderClient());
                     BaseOrderResponse orderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
                     return ResponseUtil.error(baseResponse.getCode(),"商品库存不足");
                 }
@@ -417,7 +417,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
                 if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
                     //TODO 失败取消订单
                     CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                            AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
+                            AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null ,orderBean.getOrderClient());
                     BaseOrderResponse orderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
                     //异常清理掉key
                     //        //【P0】【业务 / 米食】【B端 / 万象 / 活动下架】商户618活动：一元买虚拟商品特殊处理活动下架，删除特殊增加字段 7.13 wanghanghang
@@ -434,7 +434,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
                     if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getStatusCode())) {
                         // 失败取消订单
                         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                                AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
+                                AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null ,orderBean.getOrderClient());
                         BaseOrderResponse orderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
                         return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR.getCode(),"活动库存不足");
                     }

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

 package cn.freemud.service.impl;
 
 import cn.freemud.adapter.SpellGroupOrderAdapter;
-import cn.freemud.amqp.Header;
-import cn.freemud.amqp.MQAction;
-import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
@@ -25,7 +22,6 @@ import cn.freemud.service.thirdparty.PromotionDiscountClient;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
-import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
@@ -43,7 +39,6 @@ import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.entities.promption.ActivityUpdateStockRequest;
 import com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime;
 import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
-import com.freemud.sdk.api.assortment.order.request.order.OrderStatusChangeRequestDto;
 import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
 import org.apache.commons.collections4.CollectionUtils;
@@ -51,7 +46,6 @@ import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -233,7 +227,7 @@ public class SpellGroupOrderServiceImpl implements SpellGroupOrderService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getStatusCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersNotifyActivity(orderBean);

order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java

@@ -380,7 +380,7 @@ public abstract class UniversalOrderService {
         if (couponLockRequest != null) {
             com.freemud.application.sdk.api.base.BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
+                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersNotifyActivity(orderBean);
@@ -403,7 +403,7 @@ public abstract class UniversalOrderService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, userScoreResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "积分不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersNotifyActivity(orderBean);
@@ -431,7 +431,7 @@ public abstract class UniversalOrderService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, activityResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "活动库存不足", "", null ,orderBean.getOrderClient());
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersNotifyActivity(orderBean);
@@ -462,6 +462,7 @@ public abstract class UniversalOrderService {
      * @param partnerId
      * @return
      */
+    @Deprecated
     protected BaseOrderResponse reducesStocks(UpdateStocksRequest updateStocksRequest, String orderId, String partnerId) {
         if (updateStocksRequest != null && CollectionUtils.isNotEmpty(updateStocksRequest.getProductStocks())) {
             com.freemud.application.sdk.api.base.BaseResponse baseResponse = stockSdkService.reducesStocks(updateStocksRequest, "");
@@ -470,7 +471,7 @@ public abstract class UniversalOrderService {
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
                 //TODO 失败取消订单
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderId, partnerId,
-                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null);
+                        AfterSalesType.SYSTEM_CANCEL, "商品库存不足", "", null ,null);
                 orderCancel(cancelOrderRequest);
                 return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
             }

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

@@ -125,7 +125,7 @@ public class AppOrderService extends UniversalOrderService {
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null ,orderBean.getOrderClient());
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             return ResponseUtil.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
         }

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

@@ -359,7 +359,7 @@ public class SaasMallOrderService extends UniversalOrderService {
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null);
+                    AfterSalesType.SYSTEM_CANCEL, "编辑订单支付信息失败", trackingNo, null ,orderBean.getOrderClient());
             orderCenterSdkService.orderCancel(cancelOrderRequest);
             return ResponseUtil.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
         }
@@ -370,7 +370,7 @@ public class SaasMallOrderService extends UniversalOrderService {
     private BaseResponse failPreOrderPay(String trackingNo, OrderBeanV1 orderBean) {
         //失败冲正库存，冲正活动库存，取消订单
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null);
+                AfterSalesType.SYSTEM_CANCEL, "获取预支付失败", trackingNo, null ,orderBean.getOrderClient());
         super.orderCenterSdkService.orderCancel(cancelOrderRequest);
         return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(), ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getMessage(), null);
     }