库存

haoban-manage3-wx/pom.xml

@@ -221,6 +221,11 @@
             <artifactId>gic-business-order-api</artifactId>
             <version>${gic-business-order-api}</version>
         </dependency>
+       <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-store-goods-api</artifactId>
+            <version>${gic-store-goods-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -64,6 +64,9 @@ import com.gic.integralmall.api.dto.IntegralMallExchangeLogDTO;
 import com.gic.integralmall.api.enums.IntegralMallExchangeLogStatusEnums;
 import com.gic.integralmall.api.service.IntegralmallService;
 import com.gic.integralmall.api.service.result.DubboResult;
+import com.gic.store.goods.dto.stock.GoodsStockBaseQDTO;
+import com.gic.store.goods.enums.ProductStockChannelType;
+import com.gic.store.goods.service.ProductStockApiService;
 
 @RestController
 @RequestMapping("/order")
@@ -81,6 +84,8 @@ public class GicOrderController {
     private IntegralmallService integralmallService;
     @Autowired
     private OrderVerificationRecordApiService orderVerificationRecordApiService;
+    @Autowired
+    private ProductStockApiService productStockApiService;
 
     // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
     @RequestMapping("list-order")
@@ -246,7 +251,7 @@ public class GicOrderController {
 
     // 订单发货商品列表
     @RequestMapping("order-deliver-list")
-    public RestResponse<Object> orderDeliverList(String enterpriseId, String orderId) {
+    public RestResponse<Object> orderDeliverList(String enterpriseId, String storeId, String orderId) {
         QueryOrderDetailQDTO qdto = new QueryOrderDetailQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setOrderId(orderId);
@@ -256,6 +261,18 @@ public class GicOrderController {
         for (ListOrderItemDTO item : list) {
             if (StringUtils.isEmpty(item.getLogisticsId())) {
                 OrderListItemVO vo = EntityUtil.changeEntityNew(OrderListItemVO.class, item);
+
+                GoodsStockBaseQDTO stockQDTO = new GoodsStockBaseQDTO();
+                stockQDTO.setEnterpriseId(enterpriseId);
+                stockQDTO.setGoodsId(vo.getMallProId());
+                stockQDTO.setSkuId(vo.getMallProSkuId());
+                stockQDTO.setStoreId(storeId);
+                stockQDTO.setChannelType(ProductStockChannelType.MALL.getCode());
+                ServiceResponse<Integer> stockResp = this.productStockApiService.queryGoodsStock(stockQDTO);
+                if (stockResp.isSuccess() && null != stockResp.getResult()) {
+                    vo.setStoreStock(stockResp.getResult());
+                }
+
                 voList.add(vo);
             }
         }

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

@@ -41,6 +41,9 @@ import com.gic.haoban.manage.web.vo.order.refund.OrderRefundConsultVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderRefundDetailVO;
 import com.gic.haoban.manage.web.vo.order.refund.RefundAddressVO;
 import com.gic.haoban.manage.web.vo.order.refund.SellerAddressVO;
+import com.gic.store.goods.dto.stock.GoodsStockBaseQDTO;
+import com.gic.store.goods.enums.ProductStockChannelType;
+import com.gic.store.goods.service.ProductStockApiService;
 
 @RestController
 @RequestMapping("/refund")
@@ -54,6 +57,8 @@ public class GicOrderRefundController {
     private MallSellerAddressApiService mallSellerAddressApiService;
     @Autowired
     private AfterSalesManageApiService afterSalesManageApiService;
+    @Autowired
+    private ProductStockApiService productStockApiService;
 
     /**
      * 
@@ -84,12 +89,22 @@ public class GicOrderRefundController {
     // 换货-详情
     @RequestMapping(value = "order-exchange-detail")
     @ResponseBody
-    public RestResponse<Object> exchangeDetail(String orderExchangeId) {
+    public RestResponse<Object> exchangeDetail(String enterpriseId, String storeId, 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);
+        GoodsStockBaseQDTO qdto = new GoodsStockBaseQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setGoodsId(vo.getMallProId());
+        qdto.setSkuId(targetProSkuId);
+        qdto.setStoreId(storeId);
+        qdto.setChannelType(ProductStockChannelType.MALL.getCode());
+        ServiceResponse<Integer> stockResp = this.productStockApiService.queryGoodsStock(qdto);
+        if (stockResp.isSuccess() && null != stockResp.getResult()) {
+            vo.setTargetProStock(stockResp.getResult());
+        }
         return RestResponse.successResult(vo);
     }
 

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

@@ -14,7 +14,8 @@ public class OrderListItemVO implements Serializable {
      * 订单项ID
      */
     private String orderItemId;
-
+    
+    private String mallProId ;
     /**
      * 商城商品Name
      */
@@ -39,6 +40,8 @@ public class OrderListItemVO implements Serializable {
      * 商城商品SKU属性信息展现用 JSON [{propID:xxx,propName:xxx,valueID:xxx,valueName:xxx},...]
      */
     private String mallProSkuAttr;
+    
+    private String mallProSkuId ;
 
     /**
      * 商品编号
@@ -56,7 +59,7 @@ public class OrderListItemVO implements Serializable {
     private Double payAmount;
     
     // 库存
-    private int stortStock ;
+    private int storeStock ;
     
     // 物流ID
     private String logisticsId ;
@@ -82,6 +85,22 @@ public class OrderListItemVO implements Serializable {
     4、换货成功 */
     private int afterSalesStatus ;
     
+    public String getMallProSkuId() {
+        return mallProSkuId;
+    }
+
+    public void setMallProSkuId(String mallProSkuId) {
+        this.mallProSkuId = mallProSkuId;
+    }
+
+    public String getMallProId() {
+        return mallProId;
+    }
+
+    public void setMallProId(String mallProId) {
+        this.mallProId = mallProId;
+    }
+
     public int getAfterSalesStatus() {
         return afterSalesStatus;
     }
@@ -121,13 +140,13 @@ public class OrderListItemVO implements Serializable {
     public void setLogisticsId(String logisticsId) {
         this.logisticsId = logisticsId;
     }
-
-    public int getStortStock() {
-        return stortStock;
+    
+    public int getStoreStock() {
+        return storeStock;
     }
 
-    public void setStortStock(int stortStock) {
-        this.stortStock = stortStock;
+    public void setStoreStock(int storeStock) {
+        this.storeStock = storeStock;
     }
 
     public String getOrderItemId() {

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -131,7 +131,6 @@
 	<dubbo:reference id="webOrderManageApiService" interface="com.gic.business.order.service.ordermanage.WebOrderManageApiService" timeout="100000" retries="0" check="false" />
 	<dubbo:reference id="afterSalesManageApiService" interface="com.gic.business.order.api.service.order.AfterSalesManageApiService" timeout="100000" retries="0" check="false" />
 	<dubbo:reference id="memberReferClerkApiService" interface="com.gic.business.order.service.activity.MemberReferClerkApiService" timeout="100000" retries="0" check="false" />
-	
-	
+	<dubbo:reference id="productStockApiService" interface="com.gic.store.goods.service.ProductStockApiService" timeout="100000" retries="0" check="false" />
 	
 </beans>