Compare commits

..

No commits in common. "8a1b9e030c07f1c54076f76e61f7aa583e17368c" and "e45c5fcc69c5634a9b83294a8283eaab39b8dcec" have entirely different histories.

2 changed files with 2 additions and 13 deletions

View File

@ -71,7 +71,7 @@ public class GoodsController extends BaseController {
if (goods.getIdCode() == null || goods.getIdCode().isEmpty()){ if (goods.getIdCode() == null || goods.getIdCode().isEmpty()){
goods.setIdCode(""); goods.setIdCode("");
} }
Goods dbGoods = goodsService.save(goods); Goods dbGoods = goodsService.createGoods(goods);
return success(dbGoods); return success(dbGoods);
} }

View File

@ -12,7 +12,6 @@ import com.syjiaer.clinic.server.common.enums.GoodsPricingModelEnum;
import com.syjiaer.clinic.server.common.enums.GoodsTypeEnum; import com.syjiaer.clinic.server.common.enums.GoodsTypeEnum;
import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum; import com.syjiaer.clinic.server.common.enums.InventorySocialTypeEnum;
import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.exception.MessageException;
import com.syjiaer.clinic.server.common.util.CheckUtil;
import com.syjiaer.clinic.server.common.util.PinYinUtil; import com.syjiaer.clinic.server.common.util.PinYinUtil;
import com.syjiaer.clinic.server.common.util.StringUtil; import com.syjiaer.clinic.server.common.util.StringUtil;
import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Page;
@ -21,12 +20,10 @@ import com.syjiaer.clinic.server.entity.goods.dto.GoodsQuery;
import com.syjiaer.clinic.server.entity.goods.vo.GoodsDetailVo; import com.syjiaer.clinic.server.entity.goods.vo.GoodsDetailVo;
import com.syjiaer.clinic.server.entity.goods.vo.GoodsSearchVo; import com.syjiaer.clinic.server.entity.goods.vo.GoodsSearchVo;
import com.syjiaer.clinic.server.entity.inventory.Inventory; import com.syjiaer.clinic.server.entity.inventory.Inventory;
import com.syjiaer.clinic.server.entity.social.SocialDirectory;
import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo; import com.syjiaer.clinic.server.entity.social.SocialDirectoryUpinfo;
import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView; import com.syjiaer.clinic.server.entity.social.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.mapper.goods.GoodsMapper; import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
import com.syjiaer.clinic.server.mapper.inventory.InventoryMapper; import com.syjiaer.clinic.server.mapper.inventory.InventoryMapper;
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryMapper;
import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper; import com.syjiaer.clinic.server.mapper.social.SocialDirectoryUpinfoMapper;
import com.syjiaer.clinic.server.service.BaseService; import com.syjiaer.clinic.server.service.BaseService;
import com.syjiaer.clinic.server.service.social.SocialDirectoryService; import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
@ -54,20 +51,12 @@ public class GoodsService extends BaseService {
private SocialDirectoryService socialDirectoryService; private SocialDirectoryService socialDirectoryService;
@Autowired @Autowired
private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper; private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper;
@Autowired
private SocialDirectoryMapper socialDirectoryMapper;
/* /*
* 新建商品 * 新建商品
* @param goods 商品信息 * @param goods 商品信息
*/ */
public Goods save(Goods goods) { public Goods createGoods(Goods goods) {
String code = goods.getHilistCode();
QueryWrapper<SocialDirectory> socialDirectoryWrapper = new QueryWrapper<>();
socialDirectoryWrapper.eq("code", code);
CheckUtil.checkValue(socialDirectoryMapper.selectOne(socialDirectoryWrapper)==null, "医保目录编码不能为空");
GoodsPricingModelEnum modelEnum = GoodsPricingModelEnum.getByPricingModel(goods.getPricingModel()); GoodsPricingModelEnum modelEnum = GoodsPricingModelEnum.getByPricingModel(goods.getPricingModel());
if (modelEnum == null){ if (modelEnum == null){
throw new MessageException("定价模式错误错误"); throw new MessageException("定价模式错误错误");