提交代码

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/merchant/controller/MerchantProdController.java

@@ -6,12 +6,17 @@ import com.xingxi.common.core.domain.AjaxResult;
 import com.xingxi.common.core.page.TableDataInfo;
 import com.xingxi.common.core.text.Convert;
 import com.xingxi.common.enums.BusinessType;
+import com.xingxi.common.exception.BusinessException;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.ShiroUtils;
 import com.xingxi.master.merchant.domain.MerchantProd;
 import com.xingxi.master.merchant.service.IMerchantProdService;
 import com.xingxi.web.controller.master.merchant.domain.MerchantProdVo;
 import com.xingxi.web.controller.master.merchant.service.IMerchantProdVoService;
+import com.xingxi.web.controller.master.product.domain.ProdAttrPriceVo;
+import com.xingxi.web.controller.master.product.domain.ProdAttrVo;
+import com.xingxi.web.controller.master.product.service.IProdAttrPriceVoService;
+import com.xingxi.web.controller.master.product.service.IProdAttrVoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -36,6 +41,10 @@ public class MerchantProdController extends BaseController {
     private IMerchantProdService merchantProdService;
     @Resource
     private IMerchantProdVoService merchantProdVoService;
+    @Resource
+    private IProdAttrVoService prodAttrVoService;
+    @Resource
+    private IProdAttrPriceVoService prodAttrPriceVoService;
 
     @RequiresPermissions("master:merchant:prod:view")
     @GetMapping("/view/{mercId}")
@@ -103,12 +112,34 @@ public class MerchantProdController extends BaseController {
     @ResponseBody
     public AjaxResult shelf(Long mercProdId, String shelfFlag) {
         Date nowDate = DateUtils.getNowDate();
-        MerchantProd merchantProd = new MerchantProd();
-        merchantProd.setMercProdId(mercProdId);
+        MerchantProd condProd = new MerchantProd();
+        condProd.setMercProdId(mercProdId);
+        List<MerchantProd> checkList = merchantProdService.selectMerchantProdList(condProd);
+        if (checkList.size() != 1) {
+            throw new BusinessException("商品信息不正确，请联系管理员！");
+        }
+
+        MerchantProd merchantProd = checkList.get(0);
         merchantProd.setShelfFlag(shelfFlag);
         merchantProd.setShelfTime(nowDate);
         merchantProd.setUpdateUser(ShiroUtils.getLoginName());
         merchantProd.setUpdateTime(nowDate);
+
+        ProdAttrVo cond = new ProdAttrVo();
+        cond.setProdId(merchantProd.getProdId());
+        List<ProdAttrVo> checkProdAttrList = prodAttrVoService.selectProdAttrVoList(cond);
+        if (checkProdAttrList.size() < 1) {
+            throw new BusinessException("商品的属性未配置，请配置后再提交！");
+        }
+
+        for (ProdAttrVo prodAttr : checkProdAttrList) {
+            ProdAttrPriceVo attrPriceCond = new ProdAttrPriceVo();
+            attrPriceCond.setProdId(prodAttr.getProdId());
+            attrPriceCond.setProdAttrId(prodAttr.getProdAttrId());
+            if (prodAttrPriceVoService.selectProdAttrPriceVo(attrPriceCond) == null) {
+                throw new BusinessException("商品的价格未配置，请配置后再提交！");
+            }
+        }
         return toAjax(merchantProdService.updateMerchantProd(merchantProd));
     }
 

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdController.java

@@ -10,11 +10,9 @@ import com.xingxi.common.enums.EProdStatus;
 import com.xingxi.common.exception.BusinessException;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.common.utils.ShiroUtils;
-import com.xingxi.common.utils.poi.ExcelUtil;
 import com.xingxi.master.product.domain.Prod;
 import com.xingxi.master.product.domain.ProdVendor;
 import com.xingxi.master.product.service.IProdVendorService;
-import com.xingxi.web.controller.master.product.domain.ProdAttrPriceVo;
 import com.xingxi.web.controller.master.product.domain.ProdAttrVo;
 import com.xingxi.web.controller.master.product.domain.ProdVo;
 import com.xingxi.web.controller.master.product.service.IProdAttrPriceVoService;
@@ -149,14 +147,6 @@ public class ProdController extends BaseController {
         if (checkList.size() < 1) {
             throw new BusinessException("商品的属性未配置，请配置后再提交！");
         }
-        for (ProdAttrVo prodAttr : checkList) {
-            ProdAttrPriceVo attrPriceCond = new ProdAttrPriceVo();
-            attrPriceCond.setProdId(prodAttr.getProdId());
-            attrPriceCond.setProdAttrId(prodAttr.getProdAttrId());
-            if (prodAttrPriceVoService.selectProdAttrPriceVo(attrPriceCond) == null) {
-                throw new BusinessException("商品的价格未配置，请配置后再提交！");
-            }
-        }
         prod.setProdStatus(EProdStatus.SUBMITTED.getVal());
         return toAjax(prodVoService.updateProd(prod));
     }