clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: clinic-v2:8a1b9e030c07f1c54076f76e61f7aa583e17368c
Branches Tags
clinic-v2:master
clinic-v2:fea_tongmingxuan_xinjiangbushu
..
compare: clinic-v2:e45c5fcc69c5634a9b83294a8283eaab39b8dcec
Branches Tags
clinic-v2:fea_tongmingxuan_xinjiangbushu
clinic-v2:master

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

2 changed files with 2 additions and 13 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java
View File

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

13
src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java
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.InventorySocialTypeEnum;
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.StringUtil;
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.GoodsSearchVo;
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.vo.SocialDirectoryView;
import com.syjiaer.clinic.server.mapper.goods.GoodsMapper;
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.service.BaseService;
import com.syjiaer.clinic.server.service.social.SocialDirectoryService;
@ -54,20 +51,12 @@ public class GoodsService extends BaseService {
private SocialDirectoryService socialDirectoryService;
@Autowired
private SocialDirectoryUpinfoMapper socialDirectoryUpinfoMapper;
@Autowired
private SocialDirectoryMapper socialDirectoryMapper;
/*
* 新建商品
* @param goods 商品信息
*/
public Goods save(Goods goods) {
String code = goods.getHilistCode();
QueryWrapper<SocialDirectory> socialDirectoryWrapper = new QueryWrapper<>();
socialDirectoryWrapper.eq("code", code);
CheckUtil.checkValue(socialDirectoryMapper.selectOne(socialDirectoryWrapper)==null, "医保目录编码不能为空");
public Goods createGoods(Goods goods) {
GoodsPricingModelEnum modelEnum = GoodsPricingModelEnum.getByPricingModel(goods.getPricingModel());
if (modelEnum == null){
throw new MessageException("定价模式错误错误");