Browse Source

添加请求和相应

yq 3 years ago
parent
commit
0d03b97fab

+ 3 - 12
src/main/java/com/usky/dxtop/controller/web/TestController.java

@@ -12,6 +12,7 @@ import com.usky.dxtop.service.OrderService;
 import com.usky.dxtop.service.api.TopApi;
 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;
@@ -32,19 +33,9 @@ import java.util.TreeMap;
 @RestController
 public class TestController {
 
-    @Autowired
-    private OrderService orderService;
-
     @GetMapping("test1")
-    public AjaxResult test1(){
-        LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper
-                .ne(Order::getPayType, OrderPayType.XJ.getPayCode())
-                .and(wrapper -> wrapper.eq(Order::getOrderFlag, OrderStatus.NO_PAYMENT.getCode())
-                        .or()
-                        .eq(Order::getOrderFlag, OrderStatus.AWAIT_PAY.getCode()));
-        List<Order> list = orderService.list(queryWrapper);
-        return AjaxResult.success(list);
+    public void test1(CardLogsRequest cardLogsRequest){
+        System.out.println(cardLogsRequest);
     }
 
 }

+ 25 - 0
src/main/java/com/usky/dxtop/service/CardService.java

@@ -0,0 +1,25 @@
+package com.usky.dxtop.service;
+
+/**
+ * 卡api调度
+ * @author yq
+ * @date 2021/9/6 14:19
+ */
+public interface CardService {
+
+    /**
+     * 查询卡信息
+      * @return
+     */
+    String findCard();
+
+    /**
+     * 卡日志
+      * @return
+     */
+    String cardLogs();
+
+
+
+
+}

+ 8 - 0
src/main/java/com/usky/dxtop/service/api/OneCardApi.java

@@ -47,6 +47,14 @@ public class OneCardApi {
     private static final String LOGS = String.format("%s/%s",URL,"partner/logs");
 
 
+    private static final String SHOP = "";
+
+
+    private static final String TERM = "";
+
+    private static final String OPER = "";
+
+
     /**
      * 公用的请求参数
      * @return

+ 19 - 0
src/main/java/com/usky/dxtop/service/impl/CardServiceImpl.java

@@ -0,0 +1,19 @@
+package com.usky.dxtop.service.impl;
+
+import com.usky.dxtop.service.CardService;
+
+/**
+ * @author yq
+ * @date 2021/9/6 14:19
+ */
+public class CardServiceImpl implements CardService {
+    @Override
+    public String findCard() {
+        return null;
+    }
+
+    @Override
+    public String cardLogs() {
+        return null;
+    }
+}

+ 52 - 0
src/main/java/com/usky/dxtop/service/vo/CardLogsRequest.java

@@ -0,0 +1,52 @@
+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;
+
+}

+ 61 - 0
src/main/java/com/usky/dxtop/service/vo/CardLogsVO.java

@@ -0,0 +1,61 @@
+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;
+
+}