库存查询

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

@@ -104,18 +104,19 @@ public class GicOrderController {
     }
 
     // 核销订单查询
-    // status 1待核销 2已核销
+    // status 0全部 1待核销 2已核销
     @RequestMapping("list-verification-order")
     public RestResponse<Object> mallOrderList(String enterpriseId, String storeId, String clerkId,
-            @RequestParam(defaultValue = "1") int status, String search, BasePageInfo pageInfo) {
+            @RequestParam(defaultValue = "0") int status, String search, BasePageInfo pageInfo) {
         // 查询门店
         ListOrderManageQDTO qdto = new ListOrderManageQDTO();
         qdto.setEnterpriseId(enterpriseId);
+        // 配送方式 -1：所有 0：门店自提 1：快递发货
+        qdto.setDeliveryType(0);
         qdto.setOrderStep("" + status);
         qdto.setBusinessType(OrderEnum.BusinessTypeEnum.MICRO_MALL.getType());
         qdto.setSearchOrderParam(search);
-        // 配送方式 -1：所有 0：门店自提 1：快递发货
-        qdto.setDeliveryType(0);
+
         return this.orderListSelect(qdto, pageInfo);
     }
 

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

@@ -86,6 +86,9 @@ public class GicOrderRefundController {
     public RestResponse<Object> exchangeDetail(String orderExchangeId) {
         ServiceResponse<OrderExchangeDetailDTO> resp = this.orderRefundApiService.exchangeDetail(orderExchangeId);
         OrderExchangeDetailVO vo = EntityUtil.changeEntityNew(OrderExchangeDetailVO.class, resp.getResult());
+        String targetProSkuId = resp.getResult().getTargetProSkuId() ;
+        // 查询库存
+        vo.setTargetProStock(1);
         return RestResponse.successResult(vo);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeDetailVO.java

@@ -149,6 +149,9 @@ public class OrderExchangeDetailVO implements Serializable {
      * 目标商品SKU属性
      */
     private String targetProSkuAttr;
+    
+    // 目前商品库存
+    private int targetProStock ;
 
     /**
      * 目标商品图片
@@ -205,6 +208,14 @@ public class OrderExchangeDetailVO implements Serializable {
     // 退款凭证图片,号隔开
     private String exchangeImgUrl ;
     
+    public int getTargetProStock() {
+        return targetProStock;
+    }
+
+    public void setTargetProStock(int targetProStock) {
+        this.targetProStock = targetProStock;
+    }
+
     public String getExchangeFailReason() {
         return exchangeFailReason;
     }