华莱士更新

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

@@ -11,12 +11,14 @@ import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Objects;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -51,22 +53,27 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
     @Override
     public BaseResponse<OrderManagerResponse> orderAgreeRefund(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
         //取消配送单
-        deliveryHandle.cancelDelivery(orderBean,request);
-        //支付退款
-        PayRefundResponse refundResponse = new PayRefundResponse();
-        try {
-            refundResponse = paymentHandle.refund(request, orderBean);
-        } catch (OrderServiceException orderEx){
-            return ResponseUtil.error(orderEx.getResult());
-        }
+//        deliveryHandle.cancelDelivery(orderBean,request);
+        if(Objects.nonNull(orderBean.getAfterSalesOrderResp()) && Objects.equals(AfterSalesStatus.PENDING.getIndex(), orderBean.getAfterSalesOrderResp().getAfterSalesStatus())){
+            // 修改售后单状态为退货中
+
+        }else {
+            //支付退款
+            PayRefundResponse refundResponse = new PayRefundResponse();
+            try {
+                refundResponse = paymentHandle.refund(request, orderBean);
+            } catch (OrderServiceException orderEx) {
+                return ResponseUtil.error(orderEx.getResult());
+            }
 //        refundResponse.setPayRefundStatus(PayRefundStatus.SUCCESS);
-        //订单同意退款
-        mallOrderHandle.refundAgree(request, refundResponse, orderBean);
-        // 推送pos、微信消息中心
-        orderBaseService.sendMessage(orderBean, OperateType.ORDER_AGREE_REFUND, request.getReason());
-        //todo  可以考虑基于订单回调异步实现
-        //冲正库存
-        stockHandle.revert(request,orderBean);
+            //订单同意退款
+            mallOrderHandle.refundAgree(request, refundResponse, orderBean);
+            // 推送pos、微信消息中心
+            orderBaseService.sendMessage(orderBean, OperateType.ORDER_AGREE_REFUND, request.getReason());
+            //todo  可以考虑基于订单回调异步实现
+            //冲正库存
+            stockHandle.revert(request, orderBean);
+        }
         return ResponseUtil.success();
     }