维护给前端弹框字段

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

@@ -12,10 +12,7 @@
  */
 package com.freemud.sdk.api.assortment.order.request.order;
 
-import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
-import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -58,4 +55,10 @@ public class EditAfterSalesExpressRequest extends BaseConfig {
      */
     private String expressNo;
 
+    /**
+     * 操作来源客户端
+     */
+    private Integer operationClient;
+
+
 }

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

@@ -1009,6 +1009,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     request.setAdultRemark(cancelOrderRequest.getReason());
                     request.setOperator(cancelOrderRequest.getOperator());
                     request.setAdultRemark(cancelOrderRequest.getReqRemark());
+                    request.setOperationClient(cancelOrderRequest.getOperationClient());
+                    request.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
                     com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultApproveWithRefundComplete(request, cancelOrderRequest.getTrackingNo());
                     return orderSdkAdapter.convent2BaseOrderResponse(response);
                 }
@@ -1120,6 +1122,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
         request.setOperator(baseQueryOrderRequest.getOperator());
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
+        request.setOperationClient(baseQueryOrderRequest.getOperationClient());
+        request.setRefundState(baseQueryOrderRequest.getRefundState());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -2269,6 +2273,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         request.setAdultRemark(baseQueryOrderRequest.getReason());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setOperationClient(baseQueryOrderRequest.getOperationClient());
+        request.setRefundState(baseQueryOrderRequest.getRefundState());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -2283,6 +2289,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         request.setAdultRemark(baseQueryOrderRequest.getReason());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setOperationClient(baseQueryOrderRequest.getOperationClient());
+        request.setRefundState(baseQueryOrderRequest.getRefundState());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultApproveWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -2298,6 +2306,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         request.setAdultRemark(baseQueryOrderRequest.getReason());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setOperationClient(baseQueryOrderRequest.getOperationClient());
+        request.setRefundState(baseQueryOrderRequest.getRefundState());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultGoodsReturned(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -2330,6 +2340,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOperator(afterSalesExpressRequest.getOperator());
         request.setExpressChannelName(afterSalesExpressRequest.getExpressChannelName());
         request.setExpressNo(afterSalesExpressRequest.getExpressNo());
+        request.setOperationClient(afterSalesExpressRequest.getOperationClient());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.adultGoodsReturned(request, afterSalesExpressRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

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

@@ -67,6 +67,7 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSales
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
+import com.freemud.sdk.api.assortment.order.enums.OperationClientEnum;
 import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
@@ -887,6 +888,7 @@ public class MallOrderServiceImpl implements MallOrderService {
             editAfterSalesExpressRequest.setExpressChannelName(editAfterSalesExpressVo.getExpressChannelName());
             editAfterSalesExpressRequest.setAfterSalesCode(orderBean.getAfterSalesOrderResp().getAfterSalesCode());
             editAfterSalesExpressRequest.setOperator(userInfo.getNickName());
+            editAfterSalesExpressRequest.setOperationClient(OperationClientEnum.STATE_5.getIndex());
             BaseOrderResponse baseResponseDto = orderCenterSdkService.editAfterSalesExpress(editAfterSalesExpressRequest);
 
             if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {

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

@@ -129,6 +129,7 @@ import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushServic
 import com.freemud.sdk.api.assortment.order.constant.OrderRedisKeyConstant;
 import com.freemud.sdk.api.assortment.order.entities.OrderRefundConfigEntity;
 import com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime;
+import com.freemud.sdk.api.assortment.order.enums.OperationClientEnum;
 import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
 import com.freemud.sdk.api.assortment.order.enums.StoreDeliveryMethod;
 import com.freemud.sdk.api.assortment.order.request.order.*;
@@ -698,6 +699,8 @@ public class OrderServiceImpl implements Orderservice {
         request.setRefundSerialNo(requestVo.getRefundId());
         request.setOperator("admin");
         request.setTrackingNo(trackingNo);
+        request.setOperationClient(OperationClientEnum.STATE_6.getIndex());
+        request.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
         BaseOrderResponse response = orderCenterSdkService.orderRefundComplete(request);
         if (response == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getErrcode())) {
             return refundFaileMessage("orderRefundComplete fail" + response);
@@ -3563,6 +3566,8 @@ public class OrderServiceImpl implements Orderservice {
                 request.setAfterSerialNo(String.valueOf(refundId));
                 request.setAdultRemark("重试退款");
                 request.setOperator("技术支持");
+                request.setOperationClient(OperationClientEnum.STATE_6.getIndex());
+                request.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
                 OrderBaseResp orderBaseResp = orderSdkService.adultApproveWithRefundComplete(request, LogThreadLocal.getTrackingNo());
 
                 if (orderBaseResp == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, orderBaseResp.getCode())) {

order-management/src/main/java/cn/freemud/management/service/handle/MallOrderHandle.java

@@ -3,6 +3,7 @@ package cn.freemud.management.service.handle;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
+import cn.freemud.management.enums.AfterSalesRefunStateEnum;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
@@ -51,6 +52,8 @@ public class MallOrderHandle {
      */
     public BaseResponse refundAgree(OrderManagerRequest request, PayRefundResponse refundResponse, OrderBeanV1 orderBean) {
         BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest(refundResponse.getRefundId(), request.getReason(), request.getOperator(), orderBean);
+        refundAgreeRequest.setOperationClient(request.getOperationClient());
+        refundAgreeRequest.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
         BaseOrderResponse baseOrderResponse = null;
         if (PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus()) && RefundModeEnum.REFUND_ALL.getIndex() == orderBean.getRefundList().get(0).getRefundMode()) {
             baseOrderResponse = orderCenterSdkService.mallOrderRefundComplete(refundAgreeRequest);