Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/service/GoodsService.java

@@ -18,7 +18,7 @@ public interface GoodsService extends BaseService<Integer, Goods> {
 
     void addGoods(Goods goods, Integer operatorId);
 
-    void addGoodsProcurement(Goods goods, Integer operatorId);
+    void addGoodsProcurement(GoodsProcurement goodsProcurement);
 
     /**
      * @describe 更新商品状态

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -69,13 +69,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 	public void addGoods(Goods goods, Integer operatorId) {
 		Goods existsGood = goodsDao.findBySn(goods.getSn());
 		if(Objects.nonNull(existsGood)){
-			if(Objects.nonNull(existsGood.getComplementGoodsIdList())){
-				throw new BizException("此货号组合商品已存在");
-			}
-			existsGood.setStockCount(existsGood.getStockCount()+goods.getStockCount());
-			existsGood.setTaxStockCount(existsGood.getTaxStockCount()+existsGood.getTaxStockCount());
-			existsGood.setSellCount(0);
-			goodsDao.update(existsGood);
+			throw new BizException("商品货号重复");
 		}else{
 			if(Objects.isNull(goods.getStockCount())){
 				goods.setStockCount(0);
@@ -90,8 +84,8 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void addGoodsProcurement(Goods goods, Integer operatorId) {
-		Goods existsGood = goodsDao.findBySn(goods.getSn());
+	public void addGoodsProcurement(GoodsProcurement goodsProcurement) {
+		Goods existsGood = goodsDao.get(goodsProcurement.getGoodsId());
 
 		if(Objects.isNull(existsGood)){
 			throw new BizException("商品不存在");
@@ -101,29 +95,22 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 			throw new BizException("此商品为组合商品");
 		}
 
-		if(Objects.isNull(goods.getStockCount())){
-			goods.setStockCount(0);
+		if(Objects.isNull(goodsProcurement.getStockCount())){
+			goodsProcurement.setStockCount(0);
 		}
-		if(Objects.isNull(goods.getTaxStockCount())){
-			goods.setTaxStockCount(0);
+		if(Objects.isNull(goodsProcurement.getTaxStockCount())){
+			goodsProcurement.setTaxStockCount(0);
 		}
 
-		existsGood.setStockCount(existsGood.getStockCount()+goods.getStockCount());
-		existsGood.setTaxStockCount(existsGood.getTaxStockCount()+existsGood.getTaxStockCount());
+		existsGood.setStockCount(existsGood.getStockCount()+goodsProcurement.getStockCount());
+		existsGood.setTaxStockCount(existsGood.getTaxStockCount()+goodsProcurement.getTaxStockCount());
 		goodsDao.update(existsGood);
 
 		String batchNo = idGeneratorService.generatorId("payment") + "";
-		GoodsProcurement gp = new GoodsProcurement();
-		gp.setGoodsId(existsGood.getId());
-		gp.setGoodsCategoryId(goods.getGoodsCategoryId());
-		gp.setSupplyChannel(goods.getSupplyChannel());
-		gp.setDiscountPrice(goods.getDiscountPrice());
-		gp.setAgreeCostPrice(goods.getAgreeCostPrice());
-		gp.setStockCount(goods.getStockCount());
-		gp.setTaxStockCount(goods.getTaxStockCount());
-		gp.setOperatorId(operatorId);
-		gp.setBatchNo(batchNo);
-		goodsProcurementDao.insert(gp);
+		goodsProcurement.setBatchNo(batchNo);
+		goodsProcurementDao.insert(goodsProcurement);
+
+		sellOrderBatchNoAllot();
 	}
 
 	@Override

mec-web/src/main/java/com/ym/mec/web/controller/GoodsController.java

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.GoodsProcurement;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -38,19 +39,20 @@ public class GoodsController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        goodsService.addGoodsProcurement(goods,sysUser.getId());
+        goodsService.addGoods(goods,sysUser.getId());
         return succeed();
     }
 
     @ApiOperation(value = "新增商品清单")
     @PostMapping("/addGoodsProcurement")
     @PreAuthorize("@pcs.hasPermissions('goods/addGoodsProcurement')")
-    public Object addGoodsProcurement(Goods goods){
+    public Object addGoodsProcurement(GoodsProcurement goodsProcurement){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        goodsService.addGoodsProcurement(goods,sysUser.getId());
+        goodsProcurement.setOperatorId(sysUser.getId());
+        goodsService.addGoodsProcurement(goodsProcurement);
         return succeed();
     }