fix:转单接口,转单微信消息通知

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsDayController.java

@@ -9,7 +9,6 @@ import com.ylx.common.core.domain.R;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.utils.poi.ExcelUtil;
 import com.ylx.massage.domain.TJsDay;
-import com.ylx.massage.domain.TOrder;
 import com.ylx.massage.service.TJsDayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +19,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.Serializable;
 import java.util.List;
 
-import static org.apache.ibatis.ognl.DynamicSubscript.all;
 
 /**
  * 技师数据统计(TJsDay)表控制层

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -8,7 +8,6 @@ import com.ylx.common.enums.BusinessType;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.common.utils.poi.ExcelUtil;
-import com.ylx.massage.domain.MaTechnician;
 import com.ylx.massage.domain.TOrder;
 import com.ylx.massage.enums.Enumproject;
 import com.ylx.massage.enums.OrderStatusEnum;
@@ -62,6 +61,23 @@ public class TOrderController {
         }
     }
 
+    @Log(title = "转单", businessType = BusinessType.INSERT)
+    @ApiOperation("转单")
+    @RequestMapping(value = "wx/transferOrder", method = RequestMethod.POST)
+    public R<TOrder> transferOrder (@RequestBody TOrder order) {
+        try {
+            return R.ok(orderService.transferOrder(order));
+        } catch (ServiceException s) {
+            log.error(s.toString());
+            return R.fail(s.getMessage());
+        }
+        catch (Exception e) {
+            StackTraceElement stackTraceElement= e.getStackTrace()[0];
+            log.error("系统出错，错误信息:"+ e +" at "+stackTraceElement.getClassName()+"."+stackTraceElement.getMethodName()+":"+stackTraceElement.getLineNumber());
+            return R.fail("系统异常");
+        }
+    }
+
     /**
      * 支付订单
      *

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

@@ -44,6 +44,10 @@ public class TOrder implements Serializable {
     @ApiModelProperty("技师id")
     private String cJsId;
 
+    @TableField("old_js_id")
+    @ApiModelProperty("新技师id")
+    private String oldJsId;
+
     @Excel(name = "订单号")
     @TableField("order_no")
     @ApiModelProperty("订单号")

nightFragrance-massage/src/main/java/com/ylx/massage/service/TOrderService.java

@@ -68,4 +68,6 @@ public interface TOrderService extends IService<TOrder> {
     Integer getUpgradeNum(String id, Date startDate, Date endDate);
 
     BigDecimal getTurnover(String id, Date startDate, Date endDate);
+
+    TOrder transferOrder(TOrder order);
 }

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

@@ -278,6 +278,26 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         return orderMapper.getTurnover(jsid, startDate, endDate);
     }
 
+    @Override
+    public TOrder transferOrder(TOrder order) {
+        if(StringUtils.isBlank(order.getcId())){
+            throw new ServiceException("订单id不能为空");
+        }
+        if(StringUtils.isBlank(order.getcJsId())){
+            throw new ServiceException("转单技师ID不能为空");
+        }
+        TOrder oldOrder = this.getById(order.getcId());
+
+        oldOrder.setOldJsId(oldOrder.getcJsId());
+        oldOrder.setcJsId(order.getcJsId());
+        if(!this.updateById(oldOrder)){
+            throw new ServiceException("转单失败");
+        }
+        //通知技师转单
+        this.newOrderNotification(oldOrder);
+        return oldOrder;
+    }
+
 
     /**
      * 支付订单

nightFragrance-massage/src/main/resources/mapper/massage/TOrderMapper.xml

@@ -11,6 +11,7 @@
         <result column="price_difference" property="priceDifference"/>
         <result column="c_js_id" property="cJsId"/>
         <result column="tape" property="tape"/>
+        <result column="new_js_id" property="newJsId"/>
         <result column="fare" property="fare"/>
         <result column="total_price" property="totalPrice"/>
         <result column="parent_no" property="parentNo"/>