From 75fb44343b27dd1b5452d0b064e507738839baf9 Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Mon, 10 Jun 2024 00:36:41 +0800
Subject: [PATCH] fix

---
 .../module/entity/PlayOrderContinueInfoEntity.java    |  6 +++---
 .../order/module/vo/PlayOrderContinueQueryVo.java     |  6 ++++++
 .../order/module/vo/PlayOrderContinueReturnVo.java    | 11 +++++++----
 .../impl/PlayOrderContinueInfoServiceImpl.java        | 11 ++---------
 .../weichat/controller/WxOrderInfoController.java     |  5 +++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderContinueInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderContinueInfoEntity.java
index 60b7991..59a88f1 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderContinueInfoEntity.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderContinueInfoEntity.java
@@ -111,9 +111,9 @@ public class PlayOrderContinueInfoEntity extends BaseEntity<PlayOrderContinueInf
     /**
      * 申请时间
      */
-//    @TableField(typeHandler = CustomDateTimeTypeHandler.class)
-
-    private String continueTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime continueTime;
 
 
 }
diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java
index 8831384..984a522 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueQueryVo.java
@@ -19,6 +19,12 @@ public class PlayOrderContinueQueryVo extends BasePageEntity {
     private String nickname;
 
 
+    /**
+     * 店员ID
+     */
+    private String clerkId;
+
+
     /**
      * 顾客ID
      */
diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java
index 244f2b1..007e5fb 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderContinueReturnVo.java
@@ -1,8 +1,11 @@
 package com.starry.admin.modules.order.module.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -116,8 +119,8 @@ public class PlayOrderContinueReturnVo {
      */
     private String reviewedRemark;
 
-    /**
-     * 申请时间
-     */
-    private Date continueTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime continueTime;
 }
diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java
index 62c517c..a6f7f84 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderContinueInfoServiceImpl.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
 import com.starry.admin.modules.order.mapper.PlayOrderContinueInfoMapper;
 import com.starry.admin.modules.order.module.entity.PlayOrderContinueInfoEntity;
@@ -16,7 +15,6 @@ import com.starry.admin.modules.order.module.vo.PlayOrderContinueQueryVo;
 import com.starry.admin.modules.order.module.vo.PlayOrderContinueReturnVo;
 import com.starry.admin.modules.order.module.vo.PlayOrderReviewStateEditVo;
 import com.starry.admin.modules.order.service.IPlayOrderContinueInfoService;
-import com.starry.admin.modules.play.module.entity.PlayCommodityInfoEntity;
 import com.starry.common.context.CustomSecurityContextHolder;
 import com.starry.common.utils.IdUtils;
 import org.springframework.stereotype.Service;
@@ -80,18 +78,13 @@ public class PlayOrderContinueInfoServiceImpl extends ServiceImpl<PlayOrderConti
         //主表
         lambdaQueryWrapper.selectAll(PlayOrderContinueInfoEntity.class);
         lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname").selectAs(PlayClerkUserInfoEntity::getSex, "clerkSex");
-
         lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderContinueInfoEntity::getClerkId);
-
-        // 商品表
-//        lambdaQueryWrapper.selectAs(PlayCommodityInfoEntity::getId, "commodityId").selectAs(PlayCommodityInfoEntity::getItemType, "commodityName").selectAs(PlayCommodityInfoEntity::getItemName, "serviceDuration").selectAs(PlayCommodityInfoEntity::getPrice, "commodityPrice");
         lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayOrderContinueInfoEntity::getOrderId);
-//        lambdaQueryWrapper.leftJoin(PlayCommodityInfoEntity.class, PlayCommodityInfoEntity::getId, PlayOrderInfoEntity::getCommodityId);
         if (StrUtil.isNotBlank(vo.getCustomId())) {
             lambdaQueryWrapper.like(PlayOrderContinueInfoEntity::getCustomId, vo.getCustomId());
         }
-        if (StrUtil.isNotBlank(vo.getNickname())) {
-            lambdaQueryWrapper.like(PlayClerkUserInfoEntity::getNickname, vo.getNickname());
+        if (StrUtil.isNotBlank(vo.getClerkId())) {
+            lambdaQueryWrapper.like(PlayClerkUserInfoEntity::getId, vo.getClerkId());
         }
         if (StrUtil.isNotBlank(vo.getOrderNo())) {
             lambdaQueryWrapper.like(PlayClerkUserInfoEntity::getNickname, vo.getNickname());
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java
index f5d467c..8c356dd 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOrderInfoController.java
@@ -21,6 +21,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.time.LocalDateTime;
 
 /**
  * 订单处理
@@ -73,6 +74,7 @@ public class WxOrderInfoController {
         orderContinueInfoEntity.setReviewedRequired("1");
         orderContinueInfoEntity.setReviewedState("0");
         orderContinueInfoEntity.setImages(vo.getImages());
+        orderContinueInfoEntity.setContinueTime(LocalDateTime.now());
         playOrderContinueInfoService.create(orderContinueInfoEntity);
         return R.ok("下单成功");
     }
@@ -93,7 +95,7 @@ public class WxOrderInfoController {
     /**
      * 店员查询随机单详情
      *
-     * @param vo 随机单列表查询对象
+     * @param id 订单ID
      * @return 订单列表
      */
     @ClerkUserLogin
@@ -121,7 +123,6 @@ public class WxOrderInfoController {
     /**
      * 顾客查询最新打赏动态
      *
-     * @param vo 打赏动态查询列表
      * @return 打赏动态列表
      */