fix:转单技师调整

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

@@ -45,7 +45,7 @@ public class TOrder implements Serializable {
     private String cJsId;
 
     @TableField("old_js_id")
-    @ApiModelProperty("新技师id")
+    @ApiModelProperty("老技师id")
     private String oldJsId;
 
     @Excel(name = "订单号")
@@ -255,6 +255,10 @@ public class TOrder implements Serializable {
     @ApiModelProperty("技师信息")
     private TJs js;
 
+    @TableField(exist = false)
+    @ApiModelProperty("老技师信息")
+    private TJs oldJs;
+
     @TableField(exist = false)
     @ApiModelProperty("剩余支付时间(秒)")
     private Long remainingTime;

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

@@ -293,6 +293,17 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         if(!this.updateById(oldOrder)){
             throw new ServiceException("转单失败");
         }
+        //改变新技师服务状态
+        TJs tJs = new TJs();
+        tJs.setId(oldOrder.getcJsId());
+        tJs.setnStatus(JsStatusEnum.JS_SERVICE.getCode());
+        jsService.updateById(tJs);
+        //改变旧技师服务状态
+        TJs oldTJs = new TJs();
+        tJs.setId(oldOrder.getOldJsId());
+        tJs.setnStatus(JsStatusEnum.JS_SERVICEABLE.getCode());
+        jsService.updateById(oldTJs);
+
         //通知技师转单
         this.newOrderNotification(oldOrder);
         return oldOrder;
@@ -684,6 +695,9 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 if (StringUtils.isNotBlank(order.getcTime()) && DateTimeUtils.dateStringToStamp(order.getcTime()) < DateTimeUtils.dateToStamp(new Date())) {
                     order.setRemainingTime(0L);
                 }
+                if (StringUtils.isNotBlank(order.getOldJsId())) {
+                    order.setOldJs(jsService.getById(order.getOldJsId()));
+                }
                 orders.add(order);
 
             });