退款退货逻辑调整

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

@@ -367,4 +367,10 @@ public interface OrderCenterSdkService {
      */
     BaseOrderResponse mallOrderRefundReturn(BaseQueryOrderRequest baseQueryOrderRequest);
 
+
+    /**
+     * 商城订单同意退款申请
+     */
+    BaseOrderResponse mallOrderAgreeApply(BaseQueryOrderRequest baseQueryOrderRequest);
+
 }

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

@@ -2058,4 +2058,18 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
 
+    @Override
+    public BaseOrderResponse mallOrderAgreeApply(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.adultApproveAgreeApply(request, baseQueryOrderRequest.getTrackingNo());
+        return orderSdkAdapter.convent2BaseOrderResponse(response);
+    }
+
 }

order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java

@@ -169,6 +169,7 @@ public enum ResponseResult {
     ORDER_UPDATE_PICKUP_FAILED("45084", "更新取餐码失败"),
     ORDER_STATUS_FAILED("45085", "订单状态错误"),
     ORDER_MOVE_FAILED("45086", "三方配送正在进行，不允许操作"),
+    AGREE_REFUND_APPLY_ORDER_FAIL("45087", "同意退款申请失败"),
     /**
      * 支付
      */

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

@@ -110,4 +110,20 @@ public class MallOrderHandle {
         }
         return ResponseUtil.success();
     }
+    /**
+     * 同意退款
+     *
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    public BaseResponse mallOrderAgreeApply(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest("", request.getReason(), request.getOperator(), orderBean);
+        BaseOrderResponse baseOrderResponse  = orderCenterSdkService.mallOrderAgreeApply(refundAgreeRequest);
+        if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
+            return ResponseUtil.error(ResponseResult.AGREE_REFUND_APPLY_ORDER_FAIL);
+        }
+        return ResponseUtil.success();
+    }
+
 }

order-management/src/main/java/cn/freemud/management/service/impl/MallOrderMangerServiceImpl.java

@@ -14,6 +14,7 @@ import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import com.netflix.discovery.converters.Auto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,6 +44,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
     private DeliveryHandle deliveryHandle;
     @Autowired
     private StockHandle stockHandle;
+
     /**
      * 同意退款
      *
@@ -56,7 +58,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
 //        deliveryHandle.cancelDelivery(orderBean,request);
         if(Objects.nonNull(orderBean.getAfterSalesOrderResp()) && Objects.equals(AfterSalesStatus.PENDING.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
             // 修改售后单状态为退货中
-
+            mallOrderHandle.mallOrderAgreeApply(request, orderBean);
         }else {
             //支付退款
             PayRefundResponse refundResponse = new PayRefundResponse();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -63,6 +63,8 @@ public class InterfaceAddressConstant {
     public static final String ADULT_REFUND_COMPLETE = "/afterSales/v2/adultRefundComplete";
     //售后单审核-拒绝申请
     public static final String REFUND_REJECT = "afterSales/v2/adultReject";
+    //售后单审核-同意申请
+    public static final String AGREE_APPLY = "/afterSales/v2/adultApprove";
 
 
     //根据综合条件查询订单

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -924,4 +924,14 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * 售后单审核-同意退款是申请
+     */
+    public BaseResponse adultApproveAgreeApply(AfterSalesOperateReq request, String trackingNo) {
+        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.AGREE_APPLY,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
 }