修改bug

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

@@ -62,7 +62,7 @@ public class TOrderController extends BaseController {
      * @param order
      * @return R<TOrder>
      */
-    @Log(title = "新增订单", businessType = BusinessType.INSERT)
+    //@Log(title = "新增订单", businessType = BusinessType.INSERT)
     @ApiOperation("下单")
     @RequestMapping(value = "wx/add", method = RequestMethod.POST)
     public R<TOrder> add(@RequestBody TOrder order) {
@@ -212,6 +212,13 @@ public class TOrderController extends BaseController {
         }
     }
 
+
+    /**
+     * 出发（技师端操作的接口）
+     *
+     * @param order
+     * @return R
+     */
     @Log(title = "出发", businessType = BusinessType.UPDATE)
     @ApiOperation("出发")
     @RequestMapping(value = "wx/depart", method = RequestMethod.POST)
@@ -229,6 +236,12 @@ public class TOrderController extends BaseController {
         }
     }
 
+    /**
+     * 到达订单位置（技师端操作的接口）
+     *
+     * @param order
+     * @return R
+     */
     @Log(title = "到达订单位置", businessType = BusinessType.UPDATE)
     @ApiOperation("到达订单位置")
     @RequestMapping(value = "wx/reach", method = RequestMethod.POST)
@@ -278,7 +291,7 @@ public class TOrderController extends BaseController {
      * @param order
      * @return R
      */
-    @Log(title = "确认服务完成", businessType = BusinessType.UPDATE)
+    //@Log(title = "确认服务完成", businessType = BusinessType.UPDATE)
     @ApiOperation("确认服务完成")
     @RequestMapping(value = "wx/confirm", method = RequestMethod.POST)
     public R confirm(@RequestBody TOrder order) {

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

@@ -49,9 +49,13 @@ public class TConsumptionLog extends Model<TConsumptionLog> {
     //是否可提0否1是
     @ApiModelProperty("是否可提0否1是")
     private Integer isGet;
-    //备注
+
+    /**
+     * 备注
+     */
     @ApiModelProperty("备注")
     private String note;
+
     //系统创建时间
     @ApiModelProperty("系统创建时间")
     private Date createTime;

nightFragrance-massage/src/main/java/com/ylx/massage/enums/OrderStatusEnum.java

@@ -29,6 +29,9 @@ public enum OrderStatusEnum {
      */
     RECEIVED_ORDER(1, "已接单"),
 
+    /**
+     * 已出发
+     */
     DEPART(6, "已出发"),
 
     /**

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

@@ -295,13 +295,13 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 
     @Override
     public Object depart(TOrder order) {
-
         LambdaQueryWrapper<TOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TOrder::getcId, order.getcId()).eq(TOrder::getnStatus, OrderStatusEnum.RECEIVED_ORDER.getCode());
-        //order.setnStatus(OrderStatusEnum.DEPART.getCode());
+        //设置订单状态：已出发
+        order.setnStatus(OrderStatusEnum.DEPART.getCode());
         order.setDepartTime(new Date());
-        order.setDepartLatitude(Optional.ofNullable(order.getDepartLatitude()).orElse(BigDecimal.ZERO));
         order.setDepartLongitude(Optional.ofNullable(order.getDepartLongitude()).orElse(BigDecimal.ZERO));
+        order.setDepartLatitude(Optional.ofNullable(order.getDepartLatitude()).orElse(BigDecimal.ZERO));
         return this.update(order, wrapper);
     }