订单

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

@@ -32,6 +32,7 @@ import com.gic.business.order.qdto.ordermanage.RefundExchangeQDTO;
 import com.gic.business.order.service.activity.MemberReferClerkApiService;
 import com.gic.business.order.service.ordermanage.MallSellerAddressApiService;
 import com.gic.business.order.service.ordermanage.OrderRefundApiService;
+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;
@@ -62,7 +63,7 @@ public class GicOrderRefundController {
     @Autowired
     private MemberReferClerkApiService memberReferClerkApiService;
     @Autowired
-    private ClerkService clerkService ;
+    private ClerkService clerkService;
 
     /**
      * 
@@ -76,11 +77,14 @@ public class GicOrderRefundController {
     @RequestMapping(value = "order-exchange-refund-list")
     @ResponseBody
     public RestResponse<Object> exchangeRefundList(RefundExchangeQDTO qdto) {
-        String clerkId = qdto.getClerkId() ;
-        if(StringUtils.isEmpty(clerkId)) {
-            return RestResponse.failure("9999", "导购ID为空") ;
+        String clerkId = qdto.getClerkId();
+        if (StringUtils.isEmpty(clerkId)) {
+            return RestResponse.failure("9999", "导购ID为空");
+        }
+        ClerkDTO clerk = this.clerkService.getClerkByClerkId(clerkId);
+        if (clerk.getClerkType() == 1) {
+            qdto.setClerkId(null);
         }
-        this.clerkService.getclerkById(clerkId) ;
         ServiceResponse<Page<OrderRefundExchangeListDTO>> resp = orderRefundApiService.refundExchangePage(qdto);
         return RestResponse.successResult(resp.getResult());
     }

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

@@ -2,7 +2,6 @@ package com.gic.haoban.manage.web.controller.order;
 
 import java.util.List;
 
-import com.gic.business.order.dto.logistics.OrderLogisticsDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -10,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.business.order.dto.logistics.OrderLogisticsDTO;
 import com.gic.business.order.qdto.logistics.QueryLogisticsQDTO;
 import com.gic.business.order.service.logistics.LogisticsApiService;
 import com.gic.commons.util.EntityUtil;