测试完善

src/main/java/com/usky/dxtop/controller/web/TestController.java

@@ -13,7 +13,6 @@ import com.usky.dxtop.service.api.TopApi;
 import com.usky.dxtop.service.config.RabbitmqConfig;
 import com.usky.dxtop.service.emun.OrderPayType;
 import com.usky.dxtop.service.emun.OrderStatus;
-import com.usky.dxtop.service.vo.CardLogsRequest;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.core.util.JsonUtils;

src/main/java/com/usky/dxtop/service/ChargeService.java

@@ -1,8 +1,12 @@
 package com.usky.dxtop.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.Charge;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -13,5 +17,10 @@ import com.usky.dxtop.model.Charge;
  * @since 2021-09-09
  */
 public interface ChargeService extends IService<Charge> {
-
+    /**
+     * 分页
+     * @param charge
+     * @return
+     */
+    CommonPage<Charge> page(Charge charge);
 }

src/main/java/com/usky/dxtop/service/vo/CardLogsRequest.java

@@ -1,52 +0,0 @@
-package com.usky.dxtop.service.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author yq
- * @date 2021/9/6 14:37
- */
-@Data
-public class CardLogsRequest {
-
-    /**
-     * 卡消费类型(1 查询卡消费日志（包含消费撤单日志）
-     * 2 查询卡充值日志（包含充值撤单日志）
-     * 3 查询卡消费和充值日志（包含消费和充值撤
-     * 单日志）)
-     */
-    private Integer type;
-    /**
-     * 开始时间
-     */
-    private Date startTime;
-    /**
-     * 结束时间
-     */
-    private Date endTime;
-    /**
-     * 卡号
-     */
-    private String cid;
-    /**
-     * 卡面编码
-     */
-    private String cno;
-    /**
-     * 账号类型(0 主帐户（默认）
-     * 1 补贴帐户
-     * -1 所有帐户)
-     */
-    private Integer account;
-    /**
-     * 页数
-     */
-    private Integer current;
-    /**
-     * 条数
-     */
-    private Integer size;
-
-}

src/main/java/com/usky/dxtop/service/vo/CardLogsVO.java

@@ -1,61 +0,0 @@
-package com.usky.dxtop.service.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author yq
- * @date 2021/9/6 14:48
- */
-@Data
-public class CardLogsVO {
-    /**
-     * 中心流水码
-     */
-    private Long seq;
-    /**
-     * 物理卡号
-     */
-    private String cid;
-    /**
-     *卡片编号
-     */
-    private String cno;
-    /**
-     *记录类型(1：消费
-     * 5：消费撤单
-     * 11：消费已撤单
-     * 3：充值
-     * 2120：充值撤单
-     * 24：发卡
-     * 31：余额减值
-     * 32：余额加值
-     * 3111：押金
-     * 3121：发卡工本费
-     * 说明：原始单据状态=1 为消费，如存在撤单时，原单据状态改成 11（已撤
-     * 单），同时生成一张新单据（单据状态=5（消费撤单））；)
-     */
-    private Integer type;
-    /**
-     *操作员
-     */
-    private String operator;
-    /**
-     *记录创建时间
-     */
-    private Date creteTime;
-    /**
-     *变更金额
-     */
-    private Double amt;
-    /**
-     *变更后余额
-     */
-    private Double balance;
-    /**
-     *终端流水号
-     */
-    private String invoice;
-
-}

src/main/java/com/usky/dxtop/service/vo/MfaceVO.java → src/main/java/com/usky/dxtop/service/vo/ChargeRequest.java

@@ -4,8 +4,9 @@ import lombok.Data;
 
 /**
  * @author yq
- * @date 2021/9/7 17:58
+ * @date 2021/9/9 15:57
  */
 @Data
-public class MfaceVO {
+public class ChargeRequest {
+
 }

src/main/java/com/usky/dxtop/service/vo/McardVO.java

@@ -1,38 +0,0 @@
-package com.usky.dxtop.service.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author yq
- * @date 2021/9/7 17:57
- */
-@Data
-public class McardVO {
-
-    private Long seq;
-
-    private Date createDate;
-
-    private String card;
-
-    private String cardNo;
-
-    private Integer type;
-
-    private Integer term;
-
-    private Integer shop;
-
-    private String termName;
-
-    private String shopName;
-
-    private Double amt;
-
-    private Double balance;
-
-    private Integer account;
-
-}

src/main/java/com/usky/dxtop/service/vo/MchargeVO.java

@@ -1,37 +0,0 @@
-package com.usky.dxtop.service.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author yq
- * @date 2021/9/7 17:57
- */
-@Data
-public class MchargeVO {
-
-    private Long seq;
-
-    private Date createDate;
-
-    private String card;
-
-    private String cardNo;
-
-    private Integer type;
-
-    private Integer term;
-
-    private Integer shop;
-
-    private String termName;
-
-    private String shopName;
-
-    private Double amt;
-
-    private Double balance;
-
-    private Integer account;
-}

src/main/java/com/usky/dxtop/service/vo/MdishVO.java

@@ -1,62 +0,0 @@
-package com.usky.dxtop.service.vo;
-
-import io.lettuce.core.output.DoubleOutput;
-import lombok.Data;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Date;
-
-/**
- * @author yq
- * @date 2021/9/7 17:57
- */
-@Data
-public class MdishVO {
-
-    private Long seq;
-
-    private Date createDate;
-
-    private String card;
-
-    private String cardNo;
-
-    private Integer type;
-
-    private Integer part;
-
-    private Integer shop;
-
-    private String termName;
-
-    private String shopName;
-
-    private Double amt;
-
-    private Double balance;
-
-    private Integer account;
-
-
-    private String name;
-
-    private String mob;
-
-
-    private Details details;
-
-    private Payments payments;
-    @Data
-    public static class Details{
-        private Integer pid;
-        private String name;
-        private Double price;
-        private Double amt;
-    }
-    @Data
-    public static class Payments{
-        private Integer type;
-        private Double amt;
-        private Double balance;
-    }
-}

src/main/java/com/usky/dxtop/service/vo/MpersonVO.java

@@ -1,11 +0,0 @@
-package com.usky.dxtop.service.vo;
-
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/9/7 17:57
- */
-@Data
-public class MpersonVO {
-}

src/main/java/com/usky/dxtop/service/vo/MprodVO.java

@@ -1,37 +0,0 @@
-package com.usky.dxtop.service.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author yq
- * @date 2021/9/7 17:58
- */
-@Data
-public class MprodVO {
-
-    private Long seq;
-
-    private Date createDate;
-
-    private String card;
-
-    private String cardNo;
-
-    private Integer type;
-
-    private Integer profile;
-
-    private String name;
-
-    private String mob;
-
-    private String tel;
-
-    private Integer gender;
-
-    private Date birthday;
-
-
-}