fix:优惠卷调整

nightFragrance-massage/src/main/java/com/ylx/massage/domain/Coupon.java

@@ -72,6 +72,12 @@ public class Coupon extends Model<Coupon> {
     @ApiModelProperty("保留字段")
     private String extParam;
 
+    @ApiModelProperty("部门id")
+    private String deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
     //系统创建时间
     @ApiModelProperty("创建时间")
     private Date createTime;

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -279,6 +279,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public TOrder transferOrder(TOrder order) {
         if(StringUtils.isBlank(order.getcId())){
             throw new ServiceException("订单id不能为空");
@@ -290,6 +291,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 
         oldOrder.setOldJsId(oldOrder.getcJsId());
         oldOrder.setcJsId(order.getcJsId());
+        log.info("新技师:{},老技师{}",oldOrder.getcJsId(),oldOrder.getOldJsId());
         if(!this.updateById(oldOrder)){
             throw new ServiceException("转单失败");
         }
@@ -300,8 +302,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         jsService.updateById(tJs);
         //改变旧技师服务状态
         TJs oldTJs = new TJs();
-        tJs.setId(oldOrder.getOldJsId());
-        tJs.setnStatus(JsStatusEnum.JS_SERVICEABLE.getCode());
+        oldTJs.setId(oldOrder.getOldJsId());
+        oldTJs.setnStatus(JsStatusEnum.JS_SERVICEABLE.getCode());
         jsService.updateById(oldTJs);
 
         //通知技师转单