Merge remote-tracking branch 'origin/master'

src/main/java/com/syjiaer/clinic/server/service/goods/GoodsService.java

@@ -46,11 +46,20 @@ public class GoodsService {
      */
     public Goods createGoods(Goods goods) {
 
+        if (goods.getPricingModel().equals(GoodsPricingModelEnum.Bonus.getPricingModel()) && goods.getMakeUp() == null){
+            throw new MessageException("售价为进价加成时，加成率不能为空");
+        }
+        if (goods.getPricingModel().equals(GoodsPricingModelEnum.Fixed.getPricingModel()) && goods.getUnitPrice() == null){
+            throw new MessageException("售价为固定售价时，售价不能为空");
+        }
+
+
         if (goods.getPricingModel().equals(GoodsPricingModelEnum.Bonus.getPricingModel())) {
             //进价加成 更新固定售价
             goods.setUnitPrice(goods.getPurchaseUnitPrice()
                     .multiply(new BigDecimal(goods.getMakeUp() + 100)).divide(new BigDecimal(100), 6, RoundingMode.HALF_DOWN));
         }
+
         if (goods.getTrdnFlag()==null||!goods.getTrdnFlag()){
             goods.setDisassemblyPrice(null);
         }