周四版本有售后单的不显示按钮

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

@@ -363,6 +363,11 @@ public interface OrderCenterSdkService {
     BaseOrderResponse mallOrderRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest);
 
     /**
+     * 商城订单同意并退款完成 POS
+     */
+    BaseOrderResponse adultApproveWithRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest);
+
+    /**
      * 商城订单同意并退货完成 POS
      */
     BaseOrderResponse mallOrderRefundReturn(BaseQueryOrderRequest baseQueryOrderRequest);

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

@@ -2055,6 +2055,21 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     @Override
+    public BaseOrderResponse adultApproveWithRefundComplete(BaseQueryOrderRequest baseQueryOrderRequest) {
+        AfterSalesOperateReq request = new AfterSalesOperateReq();
+        request.setOrderCode(baseQueryOrderRequest.getOrderId());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
+        request.setOrderClient(OrderClientType.SAASMALL.getIndex());
+        request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
+        request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
+        request.setAdultRemark(baseQueryOrderRequest.getReason());
+        request.setOperator(baseQueryOrderRequest.getOperator());
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
+        return orderSdkAdapter.convent2BaseOrderResponse(response);
+    }
+
+
+    @Override
     public BaseOrderResponse mallOrderRefundReturn(BaseQueryOrderRequest baseQueryOrderRequest) {
         AfterSalesExpressOperateReq request = new AfterSalesExpressOperateReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());

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

@@ -9,6 +9,7 @@ import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderModifyRelatingCodeReq;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
@@ -58,9 +59,12 @@ public class MallOrderHandle {
     public BaseResponse refundAgree(OrderManagerRequest request, PayRefundResponse refundResponse, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest(refundResponse.getRefundId(), request.getReason(), request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = null;
-        if (PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus())) {
+        if (PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus()) && RefundModeEnum.REFUND_ALL.getIndex() == orderBean.getRefundList().get(0).getRefundMode()) {
             baseOrderResponse = orderCenterSdkService.mallOrderRefundComplete(refundAgreeRequest);
-        } else {
+        }else if(PayRefundStatus.SUCCESS.equals(refundResponse.getPayRefundStatus()) && RefundModeEnum.UN_REFUND_GOODS.getIndex() == orderBean.getRefundList().get(0).getRefundMode()){
+            baseOrderResponse = orderCenterSdkService.adultApproveWithRefundComplete(refundAgreeRequest);
+        }
+        else {
             baseOrderResponse = orderCenterSdkService.mallOrderRefundReturn(refundAgreeRequest);
         }
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {