订单管理

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

@@ -33,7 +33,7 @@ public interface LifeUserOrderMapper extends BaseMapper<LifeUserOrder> {
 
     LifeUserOrderVo queryUserOrderDetail(@Param("orderId") String orderId,@Param("position") String position);
 
-    @Select("with total_coupon as(\n" +
+    @Select("with total_coup on as(\n" +
             "-- 团购\n" +
             "\tselect id coupon_id,2 coupon_type,lgbm.group_name coupon_name, SUBSTRING_INDEX(image_id, ',', 1) AS image_id,effective_date_type,effective_date_value \n" +
             "from life_group_buy_main lgbm \n" +

alien-store-platform/src/main/java/shop/alien/storeplatform/controller/LifeUserOrderPlatformController.java

@@ -33,13 +33,13 @@ public class LifeUserOrderPlatformController {
      * 查询订单列表
      * 支持按用户、商户、订单类型、订单状态、时间范围等多条件分页查询订单
      *
-     * @param page 当前页码
-     * @param size 每页数量
+     * @param pageNum 当前页码
+     * @param pageSize 每页数量
      * @param userId 用户ID，可选
      * @param storeId 商户ID，可选
      * @param couponType 订单类型，-1：全部，1：代金券，2：团购
-     * @param orderStatus 订单状态，-1：全部，1：已支付/待使用，2：已完成，5：退款/售后
-     * @param name 订单名称，可选
+     * @param status 订单状态，-1：全部，1：已支付/待使用，2：已完成，5：退款/售后
+     * @param couponName 订单名称，可选
      * @param startTime 开始时间，可选
      * @param endTime 结束时间，可选
      * @return R<IPage<LifeUserOrderVo>> 返回分页订单列表
@@ -49,8 +49,8 @@ public class LifeUserOrderPlatformController {
     @ApiOperation("查询订单列表")
     @ApiOperationSupport(order = 5)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "page", value = "当前页", required = true),
-            @ApiImplicitParam(name = "size", value = "每页数量", required = true),
+            @ApiImplicitParam(name = "pageNum", value = "当前页", required = true),
+            @ApiImplicitParam(name = "pageSize", value = "每页数量", required = true),
             @ApiImplicitParam(name = "userId", value = "用户id", required = false),
             @ApiImplicitParam(name = "storeId", value = "商户id", required = false),
             @ApiImplicitParam(name = "couponType", value = "订单类型,-1,全部（可以不传）,1,代金券；2，团购；", required = false),
@@ -58,20 +58,21 @@ public class LifeUserOrderPlatformController {
             @ApiImplicitParam(name = "name", value = "订单名称", required = false)
     })
     @GetMapping("/queryUserOrderList")
-    public R<IPage<LifeUserOrderVo>> queryUserOrderList(@RequestParam(value = "page", defaultValue = "1") Integer page,
-                                                        @RequestParam(value = "size", defaultValue = "10") Integer size,
+    public R<IPage<LifeUserOrderVo>> queryUserOrderList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                         @RequestParam(required = false) String userId,
                                                         @RequestParam(required = false) String storeId,
                                                         @RequestParam(required = false, defaultValue = "-1") String couponType,
-                                                        @RequestParam(required = false, defaultValue = "-1") String orderStatus,
-                                                        @RequestParam(required = false) String name,
+                                                        @RequestParam(required = false, defaultValue = "-1") String status,
+                                                        @RequestParam(required = false) String couponName,
+                                                        @RequestParam(required = false) String orderNo,
                                                         @RequestParam(value = "startTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd 00:00:00") String startTime,
                                                         @RequestParam(value = "endTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd 23:59:59") String endTime) {
-        log.info("userOrder.queryUserOrderList:page={}&size={}&userId={}&storeId={}&orderType={}&orderStatus={}&name={}&startTime={}&endTime={}", page, size, userId, storeId, couponType, orderStatus, name, startTime, endTime);
+        log.info("userOrder.queryUserOrderList:page={}&size={}&userId={}&storeId={}&orderType={}&orderStatus={}&name={}&startTime={}&endTime={}", pageNum, pageSize, userId, storeId, couponType, status, couponName, startTime, endTime);
         if (StringUtils.isNotBlank(userId) && StringUtils.isNotBlank(storeId)) {
             return R.fail("用户id和商户id不能同时为空");
         }
-        return R.data(lifeUserOrderService.queryUserOrderList(page, size, userId, storeId, couponType, orderStatus, name, startTime, endTime));
+        return R.data(lifeUserOrderService.queryUserOrderList(pageNum, pageSize, userId, storeId, couponType, status, couponName, startTime, endTime, orderNo));
     }
 
     /**

alien-store-platform/src/main/java/shop/alien/storeplatform/service/LifeUserOrderPlatformService.java

@@ -33,7 +33,7 @@ public interface LifeUserOrderPlatformService extends IService<LifeUserOrder> {
      * @author alien-cloud
      * @date 2025-11-18
      */
-    IPage<LifeUserOrderVo> queryUserOrderList(Integer page, Integer size, String userId, String storeId, String couponType, String orderStatus, String name, String startTime, String endTime);
+    IPage<LifeUserOrderVo> queryUserOrderList(Integer page, Integer size, String userId, String storeId, String couponType, String orderStatus, String name, String startTime, String endTime, String orderNo);
 
     /**
      * 查询用户订单详情

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/LifeUserOrderPlatformServiceImpl.java

@@ -54,7 +54,7 @@ public class LifeUserOrderPlatformServiceImpl extends ServiceImpl<LifeUserOrderM
      * @author alien-cloud
      * @date 2025-11-18
      */
-    public IPage<LifeUserOrderVo> queryUserOrderList(Integer page, Integer size, String userId, String storeId, String couponType, String orderStatus, String name, String startTime, String endTime) {
+    public IPage<LifeUserOrderVo> queryUserOrderList(Integer page, Integer size, String userId, String storeId, String couponType, String orderStatus, String name, String startTime, String endTime, String orderNo) {
         IPage<LifeUserOrderVo> brandedPage = new Page<>(page, size);
         QueryWrapper<LifeUserOrderVo> lifeUserOrderQueryWrapper = new QueryWrapper<>();
         lifeUserOrderQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(userId), "luo.user_id", userId);
@@ -91,6 +91,7 @@ public class LifeUserOrderPlatformServiceImpl extends ServiceImpl<LifeUserOrderM
             }
         }
         lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(name), "tc.coupon_name", name);
+        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(orderNo), "luo.order_no", orderNo);
         lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(startTime), "luo.created_time", startTime + " 00:00:00");
         lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(endTime), "luo.created_time", endTime + " 23:59:59");
         lifeUserOrderQueryWrapper.eq("luo.delete_flag", 0);