发货限制

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -322,11 +322,15 @@ public class GicOrderController {
             list.add(item);
         });
         qdto.setOrderItemShipment(list);
-        ServiceResponse<Boolean> response = webOrderManageApiService.orderShipment(qdto);
-        if (!response.isSuccess()) {
-            return RestResponse.failure(response.getCode(), response.getMessage());
+        ServiceResponse<Boolean> resp = webOrderManageApiService.orderShipment(qdto);
+        if (!resp.isSuccess()) {
+            String code = resp.getCode();
+            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
+                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
+            }
+            return RestResponse.failure(code, resp.getMessage());
         }
-        return RestResponse.successResult(response.getResult());
+        return RestResponse.successResult(resp.getResult());
     }
 
     // 我的客户-会员订单列表

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderRefundController.java

 package com.gic.haoban.manage.web.controller.order;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -39,6 +40,7 @@ import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeConsultVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeDetailVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderRefundConsultVO;
@@ -194,6 +196,10 @@ public class GicOrderRefundController {
             }
         }
         if (!resp.isSuccess()) {
+            String code = resp.getCode();
+            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
+                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
+            }
             return RestResponse.failure(resp.getCode(), resp.getMessage());
         }
         return RestResponse.successResult();
@@ -233,6 +239,10 @@ public class GicOrderRefundController {
             }
         }
         if (!resp.isSuccess()) {
+            String code = resp.getCode();
+            if (Arrays.asList("900001", "300105", "200001").contains(code)) {
+                return RestResponse.failure(HaoBanErrCode.ERR_9600.getCode() + "", "请刷新页面");
+            }
             return RestResponse.failure(resp.getCode(), resp.getMessage());
         }
         return RestResponse.successResult();
@@ -282,13 +292,12 @@ public class GicOrderRefundController {
         vo.setSellerAddressList(sellerAddressList);
         return RestResponse.successResult(vo);
     }
-    
-    
+
     // 换货单发货
     @RequestMapping(value = "exchange-order-deliver")
     @ResponseBody
     public RestResponse<Object> exchangeDeliver(String enterpriseId, String memberId, String companyCode,
-            String logisticsNo, String companyId, String companyName , String storeId , ExchangeBaseQDTO baseQDTO) {
+            String logisticsNo, String companyId, String companyName, String storeId, ExchangeBaseQDTO baseQDTO) {
         ExchangeDeliveryBackQDTO qdto = new ExchangeDeliveryBackQDTO();
         qdto.setCourierNumber(logisticsNo);
         qdto.setOrderId(baseQDTO.getOrderId());
@@ -306,8 +315,7 @@ public class GicOrderRefundController {
         }
         return RestResponse.failure("9999", resp.getMessage());
     }
-    
-    
+
     private void fillMemberInfo(String enterpriseId, String memberId, OrderRefundDetailVO refund,
             OrderExchangeDetailVO exchange) {
         ServiceResponse<MemberStoreInfoDTO> memberResp = this.memberReferClerkApiService.getMemberInfo(enterpriseId,