自带款式

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -1330,8 +1330,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         scheduleServe.setProduceBargainPrice(baseProduce.getBargainPrice());
                         //款式现价
                         scheduleServe.setProduceCurrentPrice(baseProduce.getCurrentPrice());
-                        //如果有款式就设置款式价格
-//                        scheduleServe.setPrice(baseProduce.getCurrentPrice());
+
                         //款式时间
                         scheduleServe.setLengthTime(baseProduce.getServiceDuration());
 
@@ -1346,6 +1345,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                             scheduleServe.setPromotionPrice(producePromotionTime.getPrice());
                         }
                     }
+
                     //如果是预约的服务
                     else {
                         //设置价格为服务价格
@@ -1367,6 +1367,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                         scheduleServe.setIsOwnProduce(1);
                         scheduleServe.setOwnProduceId(scheduleServeCommand.getOwnProduceId());
                         scheduleServe.setOwnProduce(ownProduceMapper.selectById(scheduleServeCommand.getOwnProduceId()));
+                        if (scheduleServe.getOwnProduce() == null) {
+                            throw new RRException("自带款式不存在");
+                        }
                     } else {
                         scheduleServe.setIsOwnProduce(2);
                         scheduleServe.setOwnProduceId(null);

src/main/java/com/gogirl/domain/order/serve/ScheduleServe.java

@@ -252,4 +252,12 @@ public class ScheduleServe implements Serializable {
     public void setOwnProduceId(Integer ownProduceId) {
         this.ownProduceId = ownProduceId;
     }
+
+    public OwnProduce getOwnProduce() {
+        return ownProduce;
+    }
+
+    public void setOwnProduce(OwnProduce ownProduce) {
+        this.ownProduce = ownProduce;
+    }
 }