订单

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

@@ -33,6 +33,7 @@ import com.gic.business.order.dto.ordermanage.OrderNodeDTO;
 import com.gic.business.order.dto.ordermanage.OrderStatusDTO;
 import com.gic.business.order.dto.setting.MallOrderSettingDTO;
 import com.gic.business.order.enums.OrderEnum;
+import com.gic.business.order.enums.OrderEnum.SearchOrderTypeEnum;
 import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
 import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
@@ -127,6 +128,7 @@ public class GicOrderController {
         // 库存 - 门店库存2
         // qdto.setDeliveryMode(2);
         if (StringUtils.isNotEmpty(search)) {
+            qdto.setSearchOrderType(SearchOrderTypeEnum.GOODS_NAME_OR_ORDER_NUMBER.getType());
             qdto.setSearchOrderParam(search);
         }
         qdto.setBelongStoreId(storeId);
@@ -139,10 +141,13 @@ public class GicOrderController {
     @RequestMapping("order-deliver-count")
     public RestResponse<Object> orderCount(String enterpriseId, String storeId) {
         OrderCountVO vo = new OrderCountVO();
+        if (StringUtils.isEmpty(storeId)) {
+            return RestResponse.successResult(vo);
+        }
         CountOrderStatusQDTO qdto = new CountOrderStatusQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
-        qdto.setStoreId(storeId);
+        qdto.setBelongStoreId(storeId);
         ServiceResponse<List<OrderStatusDTO>> resp = this.webOrderManageApiService.countOrderStatus(qdto);
         List<OrderStatusDTO> list = resp.getResult();
         if (CollectionUtils.isNotEmpty(list)) {
@@ -274,6 +279,8 @@ public class GicOrderController {
                 stockQDTO.setStoreId(storeId);
                 stockQDTO.setChannelType(ProductStockChannelType.MALL.getCode());
                 ServiceResponse<Integer> stockResp = this.productStockApiService.queryGoodsStock(stockQDTO);
+                logger.info("门店库存查询orderId={},qdto={},result={}", orderId, JSON.toJSONString(stockQDTO),
+                        JSON.toJSONString(stockResp));
                 if (stockResp.isSuccess() && null != stockResp.getResult()) {
                     vo.setStoreStock(stockResp.getResult());
                 }

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.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeConsultVO;
@@ -60,6 +61,8 @@ public class GicOrderRefundController {
     private ProductStockApiService productStockApiService;
     @Autowired
     private MemberReferClerkApiService memberReferClerkApiService;
+    @Autowired
+    private ClerkService clerkService ;
 
     /**
      * 
@@ -73,7 +76,11 @@ public class GicOrderRefundController {
     @RequestMapping(value = "order-exchange-refund-list")
     @ResponseBody
     public RestResponse<Object> exchangeRefundList(RefundExchangeQDTO qdto) {
-        qdto.setStoreId(null);
+        String clerkId = qdto.getClerkId() ;
+        if(StringUtils.isEmpty(clerkId)) {
+            return RestResponse.failure("9999", "导购ID为空") ;
+        }
+        this.clerkService.getclerkById(clerkId) ;
         ServiceResponse<Page<OrderRefundExchangeListDTO>> resp = orderRefundApiService.refundExchangePage(qdto);
         return RestResponse.successResult(resp.getResult());
     }