|
|
@@ -3,12 +3,14 @@ package com.xingxi.api.service.impl;
|
|
|
import com.github.pagehelper.Page;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.xingxi.api.data.domain.OrderDTO;
|
|
|
+import com.xingxi.api.data.mapper.WxApiProdInventoryMapper;
|
|
|
import com.xingxi.api.data.mapper.WxApiProductMapper;
|
|
|
import com.xingxi.api.data.domain.MercProdRequest;
|
|
|
import com.xingxi.api.data.domain.MercProdResponse;
|
|
|
import com.xingxi.api.model.ProdAttrResponse;
|
|
|
import com.xingxi.api.service.ProdServiceI;
|
|
|
import com.xingxi.business.Order.domain.Order;
|
|
|
+import com.xingxi.business.ProdInventory.domain.ProdInventory;
|
|
|
import com.xingxi.common.enums.EDelFlag;
|
|
|
import com.xingxi.common.enums.ERoleKey;
|
|
|
import com.xingxi.common.utils.PageUtils;
|
|
|
@@ -56,6 +58,8 @@ class ProdApiServiceImpl implements ProdServiceI {
|
|
|
|
|
|
@Autowired
|
|
|
private MerchantProdMapper merchantProdMapper;
|
|
|
+ @Autowired
|
|
|
+ private WxApiProdInventoryMapper wxApiProdInventoryMapper;
|
|
|
|
|
|
/**
|
|
|
* 根据键名查询参数配置信息
|
|
|
@@ -145,6 +149,7 @@ class ProdApiServiceImpl implements ProdServiceI {
|
|
|
|
|
|
rtn.setMercId(mercProd.getMercId());
|
|
|
rtn.setProdId(mercProd.getProdId());
|
|
|
+
|
|
|
Prod prod = productMapper.selectProdById(mercProd.getProdId());
|
|
|
rtn.setProdClassId(prod.getProdClassId());
|
|
|
rtn.setProdName(prod.getProdName());
|
|
|
@@ -182,6 +187,17 @@ class ProdApiServiceImpl implements ProdServiceI {
|
|
|
prodAttrResponse.setAttrType(prodAttr.getAttrType());
|
|
|
prodAttrResponse.setDelFlag(prodAttr.getDelFlag());
|
|
|
|
|
|
+ ProdInventory condProdInventory = new ProdInventory();
|
|
|
+ condProdInventory.setProdId(mp.getProdId());
|
|
|
+ condProdInventory.setProdAttrId(mp.getProdAttrId());
|
|
|
+ condProdInventory.setMercId(mp.getMercId());
|
|
|
+ List<ProdInventory> prodInventoryList = wxApiProdInventoryMapper.selectProdInventoryList(condProdInventory);
|
|
|
+ if (prodInventoryList != null && !prodInventoryList.isEmpty()) {
|
|
|
+ prodAttrResponse.setAvailQty(prodInventoryList.get(0).getAvailQty());
|
|
|
+ } else {
|
|
|
+ prodAttrResponse.setAvailQty(0);
|
|
|
+ }
|
|
|
+
|
|
|
ProdAttrPrice condPrice = new ProdAttrPrice();
|
|
|
condPrice.setProdAttrId(prodAttr.getProdAttrId());
|
|
|
condPrice.setProdId(prodAttr.getProdId());
|