线上预定 商家PC端 新增搜索条件

alien-entity/src/main/java/shop/alien/entity/store/dto/StoreRenovationRequirementDto.java

@@ -86,7 +86,7 @@ public class StoreRenovationRequirementDto {
     private List<String> attachmentUrls;
 
     @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "M月d日 H:mm", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 

alien-entity/src/main/java/shop/alien/mapper/StoreReservationMapper.java

@@ -24,6 +24,7 @@ public interface StoreReservationMapper extends BaseMapper<UserReservation> {
      * @param dateFrom   预约日期起（可选）
      * @param dateTo     预约日期止（可选）
      * @param orderStatus 订单状态（可选，0:待支付 1:待使用 2:已完成 3:已过期 4:已取消 5:已关闭 6:退款中 7:已退款 8:商家预订）
+     * @param reservationUserName 预约用户姓名（可选，模糊查询）
      * @return 预约信息列表
      */
     List<StoreReservationListVo> getStoreReservationList(
@@ -31,6 +32,7 @@ public interface StoreReservationMapper extends BaseMapper<UserReservation> {
             @Param("status") Integer status,
             @Param("dateFrom") Date dateFrom,
             @Param("dateTo") Date dateTo,
-            @Param("orderStatus") Integer orderStatus
+            @Param("orderStatus") Integer orderStatus,
+            @Param("reservationUserName") String reservationUserName
     );
 }

alien-entity/src/main/resources/mapper/StoreReservationMapper.xml

@@ -110,6 +110,9 @@
         <if test="dateTo != null">
             AND ur.reservation_date &lt;= #{dateTo}
         </if>
+        <if test="reservationUserName != null and reservationUserName != ''">
+            AND ur.reservation_user_name LIKE CONCAT('%', #{reservationUserName}, '%')
+        </if>
         <choose>
             <when test="orderStatus != null">
                 AND uro.order_status = #{orderStatus}

alien-store/src/main/java/shop/alien/store/controller/StoreReservationController.java

@@ -39,7 +39,8 @@ public class StoreReservationController {
             @ApiImplicitParam(name = "status", value = "预约状态（可选，0:待确认 1:已确认 2:已到店 3:已取消 4:未到店超时）", dataType = "Integer", paramType = "query", required = false),
             @ApiImplicitParam(name = "dateFrom", value = "预约日期起 yyyy-MM-dd", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "dateTo", value = "预约日期止 yyyy-MM-dd", dataType = "String", paramType = "query", required = false),
-            @ApiImplicitParam(name = "orderStatus", value = "订单状态（可选，0:待支付 1:待使用 2:已完成 3:已过期 4:已取消 5:已关闭 6:退款中 7:已退款 8:商家预订；不传则默认查询：待使用、已完成、已退款三种状态）", dataType = "Integer", paramType = "query", required = false)
+            @ApiImplicitParam(name = "orderStatus", value = "订单状态（可选，0:待支付 1:待使用 2:已完成 3:已过期 4:已取消 5:已关闭 6:退款中 7:已退款 8:商家预订；不传则默认查询：待使用、已完成、已退款三种状态）", dataType = "Integer", paramType = "query", required = false),
+            @ApiImplicitParam(name = "reservationUserName", value = "预约用户姓名（可选，模糊查询）", dataType = "String", paramType = "query", required = false)
     })
     @GetMapping("/list")
     public R<List<StoreReservationListVo>> getReservationList(
@@ -47,16 +48,18 @@ public class StoreReservationController {
             @RequestParam(required = false) Integer status,
             @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date dateFrom,
             @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") Date dateTo,
-            @RequestParam(required = false) Integer orderStatus) {
-        log.info("StoreReservationController.getReservationList?storeId={}, status={}, dateFrom={}, dateTo={}, orderStatus={}",
-                storeId, status, dateFrom, dateTo, orderStatus);
+            @RequestParam(required = false) Integer orderStatus,
+            @RequestParam(required = false) String reservationUserName) {
+        log.info("StoreReservationController.getReservationList?storeId={}, status={}, dateFrom={}, dateTo={}, orderStatus={}, reservationUserName={}",
+                storeId, status, dateFrom, dateTo, orderStatus, reservationUserName);
 
         if (storeId == null) {
             return R.fail("门店ID不能为空");
         }
 
         try {
-            List<StoreReservationListVo> list = storeReservationService.getStoreReservationList(storeId, status, dateFrom, dateTo, orderStatus);
+            List<StoreReservationListVo> list = storeReservationService.getStoreReservationList(
+                    storeId, status, dateFrom, dateTo, orderStatus, reservationUserName);
             return R.data(list);
         } catch (Exception e) {
             log.error("查询商家端预约信息列表失败", e);

alien-store/src/main/java/shop/alien/store/service/StoreReservationService.java

@@ -21,10 +21,11 @@ public interface StoreReservationService {
      * @param dateFrom   预约日期起（可选）
      * @param dateTo     预约日期止（可选）
      * @param orderStatus 订单状态（可选，0:待支付 1:待使用 2:已完成 3:已过期 4:已取消 5:已关闭 6:退款中 7:已退款 8:商家预订）
+     * @param reservationUserName 预约用户姓名（可选，模糊查询）
      * @return 预约信息列表
      */
     List<StoreReservationListVo> getStoreReservationList(
-            Integer storeId, Integer status, Date dateFrom, Date dateTo, Integer orderStatus);
+            Integer storeId, Integer status, Date dateFrom, Date dateTo, Integer orderStatus, String reservationUserName);
 
     /**
      * 商家端取消预约

alien-store/src/main/java/shop/alien/store/service/impl/StoreReservationServiceImpl.java

@@ -95,15 +95,16 @@ public class StoreReservationServiceImpl extends ServiceImpl<StoreReservationMap
     }
 
     @Override
-    public List<StoreReservationListVo> getStoreReservationList(Integer storeId, Integer status, Date dateFrom, Date dateTo, Integer orderStatus) {
-        log.info("StoreReservationServiceImpl.getStoreReservationList?storeId={}, status={}, dateFrom={}, dateTo={}, orderStatus={}",
-                storeId, status, dateFrom, dateTo, orderStatus);
+    public List<StoreReservationListVo> getStoreReservationList(Integer storeId, Integer status, Date dateFrom, Date dateTo,
+                                                                 Integer orderStatus, String reservationUserName) {
+        log.info("StoreReservationServiceImpl.getStoreReservationList?storeId={}, status={}, dateFrom={}, dateTo={}, orderStatus={}, reservationUserName={}",
+                storeId, status, dateFrom, dateTo, orderStatus, reservationUserName);
 
         if (storeId == null) {
             throw new RuntimeException("门店ID不能为空");
         }
 
-        return baseMapper.getStoreReservationList(storeId, status, dateFrom, dateTo, orderStatus);
+        return baseMapper.getStoreReservationList(storeId, status, dateFrom, dateTo, orderStatus, reservationUserName);
     }
 
     @Override