更改分页参数包名

admin/src/main/java/com/kym/admin/controller/ActivityController.java

@@ -1,10 +1,9 @@
 package com.kym.admin.controller;
 
-import cn.dev33.satoken.stp.StpUtil;
 import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.queryParams.ActivityQueryParam;
-import com.kym.entity.admin.queryParams.PageParams;
+import com.kym.entity.common.PageParams;
 import com.kym.entity.admin.vo.ActivityVo;
 import com.kym.service.admin.ActivityService;
 import com.kym.service.admin.RechargeRightsService;

entity/src/main/java/com/kym/entity/admin/queryParams/ActivityQueryParam.java

@@ -1,8 +1,8 @@
 package com.kym.entity.admin.queryParams;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kym.entity.common.PageParams;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.time.LocalDateTime;
 

entity/src/main/java/com/kym/entity/admin/queryParams/BannerQueryParam.java

@@ -1,6 +1,7 @@
 package com.kym.entity.admin.queryParams;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kym.entity.common.PageParams;
 import lombok.Data;
 
 import java.time.LocalDateTime;

entity/src/main/java/com/kym/entity/admin/queryParams/CommonQueryParam.java

@@ -1,5 +1,6 @@
 package com.kym.entity.admin.queryParams;
 
+import com.kym.entity.common.PageParams;
 import lombok.Data;
 
 /**

entity/src/main/java/com/kym/entity/admin/queryParams/CustomChargeOrdersQueryParam.java

@@ -1,5 +1,6 @@
 package com.kym.entity.admin.queryParams;
 
+import com.kym.entity.common.PageParams;
 import lombok.Data;
 
 import java.time.LocalDate;

entity/src/main/java/com/kym/entity/admin/queryParams/EquipmentQueryParam.java

@@ -1,5 +1,6 @@
 package com.kym.entity.admin.queryParams;
 
+import com.kym.entity.common.PageParams;
 import lombok.Data;
 
 /**

entity/src/main/java/com/kym/entity/admin/queryParams/InvoiceQueryParam.java

@@ -1,5 +1,6 @@
 package com.kym.entity.admin.queryParams;
 
+import com.kym.entity.common.PageParams;
 import lombok.Data;
 
 

entity/src/main/java/com/kym/entity/admin/queryParams/StatQueryParam.java

@@ -1,5 +1,6 @@
 package com.kym.entity.admin.queryParams;
 
+import com.kym.entity.common.PageParams;
 import lombok.Data;
 
 import java.time.LocalDate;

entity/src/main/java/com/kym/entity/admin/queryParams/PageParams.java → entity/src/main/java/com/kym/entity/common/PageParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.admin.queryParams;
+package com.kym.entity.common;
 
 import lombok.Data;
 

entity/src/main/java/com/kym/entity/miniapp/params/ApplyInvoiceParams.java → entity/src/main/java/com/kym/entity/miniapp/queryParams/ApplyInvoiceParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.params;
+package com.kym.entity.miniapp.queryParams;
 
 import lombok.Data;
 

entity/src/main/java/com/kym/entity/miniapp/queryParams/OrderQueryParams.java

@@ -0,0 +1,14 @@
+package com.kym.entity.miniapp.queryParams;
+
+import com.kym.entity.common.PageParams;
+import lombok.Data;
+
+/**
+ * @author skyline
+ * @description 订单查询
+ * @date 2023-11-06 11:59
+ */
+@Data
+public class OrderQueryParams extends PageParams {
+    private Integer invoiceStatus;
+}

entity/src/main/java/com/kym/entity/miniapp/params/WxLoginParams.java → entity/src/main/java/com/kym/entity/miniapp/queryParams/WxLoginParams.java

@@ -1,4 +1,4 @@
-package com.kym.entity.miniapp.params;
+package com.kym.entity.miniapp.queryParams;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

miniapp/src/main/java/com/kym/miniapp/controller/ChargeOrderController.java

@@ -1,7 +1,7 @@
 package com.kym.miniapp.controller;
 
 import com.kym.common.R;
-import com.kym.entity.admin.queryParams.PageParams;
+import com.kym.entity.miniapp.queryParams.OrderQueryParams;
 import com.kym.service.miniapp.ChargeOrderService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -29,7 +29,7 @@ public class ChargeOrderController {
      * @return
      */
     @GetMapping
-    R<?> listUserChargeOrders(@ModelAttribute PageParams params) {
+    R<?> listUserChargeOrders(@ModelAttribute OrderQueryParams params) {
         return R.success(chargeOrderService.listUserChargeOrders(params));
     }
 }

miniapp/src/main/java/com/kym/miniapp/controller/InvoiceController.java

@@ -1,7 +1,7 @@
 package com.kym.miniapp.controller;
 
 import com.kym.common.R;
-import com.kym.entity.miniapp.params.ApplyInvoiceParams;
+import com.kym.entity.miniapp.queryParams.ApplyInvoiceParams;
 import com.kym.service.miniapp.InvoiceService;
 import com.kym.service.wechat.WxPayService;
 import jakarta.servlet.http.HttpServletRequest;

miniapp/src/main/java/com/kym/miniapp/controller/UserController.java

@@ -6,7 +6,7 @@ import com.kym.common.R;
 import com.kym.common.utils.IDGenerator;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.User;
-import com.kym.entity.miniapp.params.WxLoginParams;
+import com.kym.entity.miniapp.queryParams.WxLoginParams;
 import com.kym.entity.miniapp.vo.UserVo;
 import com.kym.service.miniapp.CollectService;
 import com.kym.service.miniapp.UserService;

service/src/main/java/com/kym/service/admin/RechargeRightsService.java

@@ -2,8 +2,7 @@ package com.kym.service.admin;
 
 import com.kym.entity.admin.RechargeRights;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.kym.entity.admin.queryParams.CommonQueryParam;
-import com.kym.entity.admin.queryParams.PageParams;
+import com.kym.entity.common.PageParams;
 import com.kym.entity.common.PageBean;
 
 /**

service/src/main/java/com/kym/service/admin/impl/RechargeRightsServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.RechargeRights;
-import com.kym.entity.admin.queryParams.PageParams;
+import com.kym.entity.common.PageParams;
 import com.kym.entity.common.PageBean;
 import com.kym.mapper.admin.RechargeRightsMapper;
 import com.kym.service.admin.RechargeRightsService;

service/src/main/java/com/kym/service/miniapp/ChargeOrderService.java

@@ -2,12 +2,12 @@ package com.kym.service.miniapp;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
-import com.kym.entity.admin.queryParams.PageParams;
 import com.kym.entity.admin.queryParams.StatQueryParam;
 import com.kym.entity.admin.vo.CustomOrderVo;
 import com.kym.entity.admin.vo.StationStatVo;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.ChargeOrder;
+import com.kym.entity.miniapp.queryParams.OrderQueryParams;
 import com.kym.entity.miniapp.vo.ChargeOrderVo;
 import jakarta.servlet.http.HttpServletResponse;
 
@@ -40,5 +40,5 @@ public interface ChargeOrderService extends IService<ChargeOrder> {
 
     void exportCustomChargeOrders(CustomChargeOrdersQueryParam params, HttpServletResponse response);
 
-    PageBean<ChargeOrderVo> listUserChargeOrders(PageParams params);
+    PageBean<ChargeOrderVo> listUserChargeOrders(OrderQueryParams params);
 }

service/src/main/java/com/kym/service/miniapp/InvoiceService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.kym.entity.admin.queryParams.InvoiceQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.Invoice;
-import com.kym.entity.miniapp.params.ApplyInvoiceParams;
+import com.kym.entity.miniapp.queryParams.ApplyInvoiceParams;
 import com.kym.entity.wechat.TitleUrl;
 
 import java.util.List;

service/src/main/java/com/kym/service/miniapp/UserService.java

@@ -6,7 +6,7 @@ import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.vo.CustomUserVo;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.User;
-import com.kym.entity.miniapp.params.WxLoginParams;
+import com.kym.entity.miniapp.queryParams.WxLoginParams;
 import com.kym.entity.miniapp.vo.UserVo;
 
 /**

service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -9,13 +9,13 @@ import com.github.pagehelper.PageHelper;
 import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.RechargeRights;
 import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
-import com.kym.entity.admin.queryParams.PageParams;
 import com.kym.entity.admin.queryParams.StatQueryParam;
 import com.kym.entity.admin.vo.CustomOrderVo;
 import com.kym.entity.admin.vo.StationStatVo;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.OrderRechargeRights;
+import com.kym.entity.miniapp.queryParams.OrderQueryParams;
 import com.kym.entity.miniapp.vo.ChargeOrderVo;
 import com.kym.mapper.miniapp.ChargeOrderMapper;
 import com.kym.service.admin.ExportService;
@@ -150,9 +150,11 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
     }
 
     @Override
-    public PageBean<ChargeOrderVo> listUserChargeOrders(PageParams params) {
+    public PageBean<ChargeOrderVo> listUserChargeOrders(OrderQueryParams params) {
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        var list = lambdaQuery().eq(ChargeOrder::getUserId, StpUtil.getLoginIdAsLong()).list();
+        var list = lambdaQuery()
+                .eq(!CommUtil.isEmptyOrNull(params.getInvoiceStatus()), ChargeOrder::getInvoiceStatus, params.getInvoiceStatus())
+                .eq(ChargeOrder::getUserId, StpUtil.getLoginIdAsLong()).list();
         var voList = list.stream().map(chargeOrder -> {
             var vo = new ChargeOrderVo();
             BeanUtils.copyProperties(chargeOrder, vo);

service/src/main/java/com/kym/service/miniapp/impl/InvoiceServiceImpl.java

@@ -11,7 +11,7 @@ import com.kym.entity.admin.queryParams.InvoiceQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.Invoice;
-import com.kym.entity.miniapp.params.ApplyInvoiceParams;
+import com.kym.entity.miniapp.queryParams.ApplyInvoiceParams;
 import com.kym.entity.wechat.InvoiceOrderDetail;
 import com.kym.entity.wechat.TitleUrl;
 import com.kym.mapper.miniapp.InvoiceMapper;

service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -23,7 +23,7 @@ import com.kym.entity.miniapp.Account;
 import com.kym.entity.miniapp.Cars;
 import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.UserRechargeRights;
-import com.kym.entity.miniapp.params.WxLoginParams;
+import com.kym.entity.miniapp.queryParams.WxLoginParams;
 import com.kym.entity.miniapp.vo.UserVo;
 import com.kym.entity.wechat.WxPhoneNum;
 import com.kym.mapper.miniapp.UserMapper;