fix:订单出发调整

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

@@ -1,12 +1,14 @@
 package com.ylx.web.controller.massage;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.enums.BusinessType;
+import com.ylx.common.utils.StringUtils;
 import com.ylx.common.utils.poi.ExcelUtil;
 import com.ylx.massage.domain.TJsDay;
 import com.ylx.massage.service.TJsDayService;
@@ -46,7 +48,10 @@ public class TJsDayController extends BaseController {
     @GetMapping("selectAll")
     @ApiOperation("分页查询所有数据")
     public R selectAll(Page<TJsDay> page, TJsDay tJsDay) {
-        return R.ok(this.tJsDayService.page(page, new QueryWrapper<>(tJsDay)));
+        LambdaQueryWrapper<TJsDay> tJsDayLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        tJsDayLambdaQueryWrapper.le(StringUtils.isNotBlank(tJsDay.getEndTime()) && StringUtils.isNotBlank(tJsDay.getStartTime()), TJsDay::getCountDate, tJsDay.getEndTime()).
+                ge(StringUtils.isNotBlank(tJsDay.getStartTime()) && StringUtils.isNotBlank(tJsDay.getEndTime()),TJsDay::getCountDate, tJsDay.getStartTime());
+        return R.ok(this.tJsDayService.page(page, tJsDayLambdaQueryWrapper));
     }
 
     @Log(title = "技师统计信息导出", businessType = BusinessType.EXPORT)

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.ylx.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -18,6 +19,7 @@ import java.util.Date;
  * @since 2024-08-14 18:00:31
  */
 @SuppressWarnings("serial")
+@Data
 @ApiModel(value = "TJsDay", description = "技师数据统计")
 public class TJsDay extends Model<TJsDay> {
     //主键
@@ -78,134 +80,14 @@ public class TJsDay extends Model<TJsDay> {
     @ApiModelProperty("是否删除0否1是")
     private Integer isDelete;
 
+    @TableField(exist = false)
+    @ApiModelProperty("起始时间")
+    private String startTime;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getOnLine() {
-        return onLine;
-    }
-
-    public void setOnLine(Integer onLine) {
-        this.onLine = onLine;
-    }
-
-    public Integer getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public BigDecimal getTurnover() {
-        return turnover;
-    }
-
-    public void setTurnover(BigDecimal turnover) {
-        this.turnover = turnover;
-    }
-
-    public Integer getAddNum() {
-        return addNum;
-    }
-
-    public void setAddNum(Integer addNum) {
-        this.addNum = addNum;
-    }
-
-    public Integer getUpgradeNum() {
-        return upgradeNum;
-    }
-
-    public void setUpgradeNum(Integer upgradeNum) {
-        this.upgradeNum = upgradeNum;
-    }
-
-    public BigDecimal getRecharge() {
-        return recharge;
-    }
-
-    public void setRecharge(BigDecimal recharge) {
-        this.recharge = recharge;
-    }
-
-    public String getJsId() {
-        return jsId;
-    }
-
-    public void setJsId(String jsId) {
-        this.jsId = jsId;
-    }
+    @TableField(exist = false)
+    @ApiModelProperty("截止时间")
+    private String endTime;
 
-    public String getOpenId() {
-        return openId;
-    }
-
-    public void setOpenId(String openId) {
-        this.openId = openId;
-    }
-
-    public String getCountDate() {
-        return countDate;
-    }
-
-    public void setCountDate(String countDate) {
-        this.countDate = countDate;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
 
     /**
      * 获取主键值

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

@@ -252,7 +252,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         LambdaQueryWrapper<TOrder> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TOrder::getcId,order.getcId()).eq(TOrder::getnStatus,OrderStatusEnum.RECEIVED_ORDER.getCode());
         order.setnStatus(OrderStatusEnum.DEPART.getCode());
-        order.setReachTime(LocalDateTime.now());
         order.setDepartTime(new Date());
         order.setDepartLatitude(Optional.ofNullable(order.getDepartLatitude()).orElse(BigDecimal.ZERO));
         order.setDepartLongitude(Optional.ofNullable(order.getDepartLongitude()).orElse(BigDecimal.ZERO));