Merge branch '3.7-features' into 3.7

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

@@ -171,6 +171,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                         //服务价格
                         .price(baseServe.getPrice())
                         .payPrice(baseServe.getPrice())
+                        .isOwnProduce(baseServe.getIsOwnProduce())
                         .achievement(baseServe.getPrice());
 //                        .leisureDiscountPrice(BigDecimal.ZERO);
 
@@ -228,6 +229,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                         //新增服务开始时间结束时间
                         .endTime(new Date())
                         .scheduledTime(scheduleManage.getScheduledTime())
+                        //自带款式id
                         .ownProduceId(orderServeParam.getOwnProduceId());
 
                 if (orderServeParam.getServeChangePrice() != null) {
@@ -236,16 +238,17 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 OrderServe orderServe = builder.build();
 
                 //新增订单详情时校验自带款式是否设置
-                if (orderServe.getServeName().trim().equals(ScheduleServe.OWN_PRODUCE_KEY)) {
-                    orderServe.setIsOwnProduce(1);
+                if (orderServe.getIsOwnProduce().equals(1)) {
+//                    orderServe.setIsOwnProduce(1);
                     if (orderServe.getOwnProduceId() == null) {
                         throw new RRException("请补全自带款式");
                     }
                     orderServe.setOwnProduce(ownProduceMapper.selectById(orderServe.getOwnProduceId()));
-                } else {
-                    orderServe.setIsOwnProduce(2);
-                    orderServe.setOwnProduceId(null);
                 }
+//                else {
+//                    orderServe.setIsOwnProduce(2);
+//                    orderServe.setOwnProduceId(null);
+//                }
 
                 orderServe.calcPriceAndTimeLength();
                 orderServeMapper.insert(orderServe);
@@ -277,8 +280,11 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 orderServe.setPrice(baseServe.getPrice());
                 //服务业绩
                 orderServe.setAchievement(baseServe.getPrice());
+
                 orderServe.setDiscountPrice(BigDecimal.ZERO);
 
+                orderServe.setIsOwnProduce(baseServe.getIsOwnProduce());
+
                 if (orderServeParam.getProduceId() != null) {
                     BaseProduce baseProduce = baseProduceMapper.selectById(orderServeParam.getProduceId());
                     //款式原价
@@ -350,16 +356,17 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
                 orderServe.setRemark(orderServeParam.getRemark());
 
                 //更新订单详情时校验自带款式是否设置
-                if (orderServe.getServeName().trim().equals(ScheduleServe.OWN_PRODUCE_KEY)) {
+                if (orderServe.getIsOwnProduce().equals(1)) {
                     if (orderServe.getOwnProduceId() == null) {
                         throw new RRException("请补全自带款式");
                     }
                     orderServe.setIsOwnProduce(1);
                     orderServe.setOwnProduce(ownProduceMapper.selectById(orderServe.getOwnProduceId()));
-                } else {
-                    orderServe.setIsOwnProduce(2);
-                    orderServe.setOwnProduceId(null);
                 }
+//                else {
+//                    orderServe.setIsOwnProduce(2);
+//                    orderServe.setOwnProduceId(null);
+//                }
 
                 orderServe.calcPriceAndTimeLength();
                 orderServeMapper.updateById(orderServe);

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

@@ -1319,7 +1319,9 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
                     scheduleServe.setServeType(baseType.getName());
 
                     scheduleServe.setServeNumber(1);
-                    
+
+                    scheduleServe.setIsOwnProduce(baseServe.getIsOwnProduce());
+
                     //如果是预约款式
                     if (scheduleServe.getProduceId() != null) {
 
@@ -1368,16 +1370,17 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
                     }
                     //自带款式
-                    if (scheduleServe.getServeName().trim().equals(ScheduleServe.OWN_PRODUCE_KEY)) {
-                        scheduleServe.setIsOwnProduce(1);
+                    if (scheduleServe.getIsOwnProduce().equals(1)) {
+//                        scheduleServe.setIsOwnProduce(1);
                         if (scheduleServeCommand.getOwnProduceId() != null) {
                             scheduleServe.setOwnProduceId(scheduleServeCommand.getOwnProduceId());
                             scheduleServe.setOwnProduce(ownProduceMapper.selectById(scheduleServeCommand.getOwnProduceId()));
                         }
-                    } else {
-                        scheduleServe.setIsOwnProduce(2);
-                        scheduleServe.setOwnProduceId(null);
                     }
+//                    else {
+//                        scheduleServe.setIsOwnProduce(2);
+//                        scheduleServe.setOwnProduceId(null);
+//                    }
 
                     //款式做法
                     scheduleServe.setExplain(baseServe.getExplain());

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

@@ -30,7 +30,7 @@ public class ScheduleServe implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
-    public static final String OWN_PRODUCE_KEY = "自带款";
+//    public static final String OWN_PRODUCE_KEY = "自带款";
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty("id")

src/main/java/com/gogirl/domain/product/serve/BaseServe.java

@@ -107,4 +107,7 @@ public class BaseServe implements Serializable {
     @TableField(exist = false)
     private PraiseRecord praiseRecord;
 
+    @ApiModelProperty("是否自带款式 1-是 2-否")
+    private Integer isOwnProduce;
+
 }

src/main/java/com/gogirl/shared/order/OrderServeDTO.java

@@ -122,4 +122,7 @@ public class OrderServeDTO {
     private BigDecimal leisurePrice;
 
     private OwnProduce ownProduce;
+
+    @ApiModelProperty("是否自带款式 1-是 2-否")
+    private Integer isOwnProduce;
 }

src/main/java/com/gogirl/shared/order/ScheduleServeDTO.java

@@ -137,4 +137,6 @@ public class ScheduleServeDTO implements Serializable {
 
     private OwnProduce ownProduce;
 
+    @ApiModelProperty("是否自带款式 1-是 2-否")
+    private Integer isOwnProduce;
 }