fix:bug修复

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

@@ -49,8 +49,10 @@ public class CouponController extends BaseController {
         LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(coupon.getName()), Coupon::getName, coupon.getName())
                 .eq(coupon.getType() != null, Coupon::getType, coupon.getType())
+                .eq(coupon.getDiscountType() != null, Coupon::getDiscountType, coupon.getDiscountType())
+                .eq(StringUtils.isNotBlank(coupon.getDeptId()), Coupon::getDeptId, coupon.getDeptId())
                 .eq(coupon.getStatus() != null, Coupon::getStatus, coupon.getStatus())
-                .eq(coupon.getObtainWay() != null, Coupon::getObtainWay, coupon.getObtainWay())//
+                .eq(coupon.getObtainWay() != null, Coupon::getObtainWay, coupon.getObtainWay())
                 .eq(coupon.getTermDays() != null, Coupon::getTermDays, coupon.getTermDays())
                 .eq(coupon.getUsedNum() != null, Coupon::getUsedNum, coupon.getUsedNum());
         return R.ok(this.couponService.page(page, queryWrapper));

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

@@ -211,7 +211,7 @@ public class TJsController extends BaseController {
         if (js.getPageType() == 1) {
             mhCompanyLambdaQueryWrapper.eq(TJs::getnTong, JsStatusEnum.JS_PASS.getCode());
         } else {
-            mhCompanyLambdaQueryWrapper.in(TJs::getnTong, Arrays.asList(JsStatusEnum.JS_RETURN.getCode(), JsStatusEnum.JS_NOT_PASS.getCode()), JsStatusEnum.BLOCKED.getCode());
+            mhCompanyLambdaQueryWrapper.in(TJs::getnTong, Arrays.asList(JsStatusEnum.JS_RETURN.getCode(), JsStatusEnum.JS_NOT_PASS.getCode(), JsStatusEnum.BLOCKED.getCode()));
         }
         return jsService.page(page, mhCompanyLambdaQueryWrapper);
     }

nightFragrance-admin/src/main/resources/application-test.yml

@@ -58,7 +58,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://47.92.254.66:3306/night_fragrance?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://39.98.239.48:3366/night_fragrance?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: '@RqGHG#KZ*C9ytkQ'
       # 从库数据源

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ylx.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -120,6 +121,7 @@ public class TOrder implements Serializable {
     @ApiModelProperty("到达照片")
     private String arrivalPhoto;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ApiModelProperty("出发时间")
     private Date departTime;
 
@@ -133,15 +135,19 @@ public class TOrder implements Serializable {
     @ApiModelProperty("地址name")
     private String name;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ApiModelProperty("接单时间")
     private LocalDateTime acceptanceTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ApiModelProperty("到达时间")
     private LocalDateTime reachTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ApiModelProperty("开始服务时间")
     private LocalDateTime startTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
 
@@ -244,6 +250,7 @@ public class TOrder implements Serializable {
      */
     @Excel(name = "时间")
     @TableField("dt_create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @ApiModelProperty("创建时间")
     private LocalDateTime dtCreateTime;
 

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

@@ -101,7 +101,7 @@ public class YlxAlarmServiceImpl extends ServiceImpl<YlxAlarmMapper, YlxAlarm> i
             throw new ServiceException("技师ID不能为空");
         }
         LambdaQueryWrapper<TOrder> tOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        tOrderLambdaQueryWrapper.eq(TOrder::getcJsId,ylxAlarm.getJsId()).eq(TOrder::getnStatus, OrderStatusEnum.SERVICE);
+        tOrderLambdaQueryWrapper.eq(TOrder::getcJsId,ylxAlarm.getJsId()).eq(TOrder::getnStatus, OrderStatusEnum.SERVICE.getCode());
         List<TOrder> orders = orderService.list(tOrderLambdaQueryWrapper);
 
         if(CollectionUtil.isEmpty(orders)) {

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

@@ -170,7 +170,7 @@
                 and t_js.c_phone like concat('%',#{param.jsPhone},'%')
             </if>
             <if test="param.cPhone != null and param.cPhone != ''">
-                and t_order.c_phone = #{cPhone}
+                and t_order.c_phone = #{param.cPhone}
             </if>
             <if test="param.orderNo != null and param.orderNo != ''">
                 and t_order.order_no = #{ param.orderNo }