测试数据

src/main/java/com/usky/dxtop/common/core/domain/ApiResult.java

@@ -0,0 +1,97 @@
+package com.usky.dxtop.common.core.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.beans.Transient;
+import java.io.Serializable;
+
+
+/**
+ * <p>Api 调用结果统一包装类</p>
+ *
+ * @param <T>
+ * @author chenpeng
+ * Create time 2018年11月30日 下午5:17:42
+ */
+@Data
+@ApiModel(description = "API 响应结果")
+public class ApiResult<T> implements Serializable {
+
+    private static final long serialVersionUID = 5247512550376272642L;
+
+    private static final String SUCCESS_CODE = "0";
+
+    @ApiModelProperty(value = "状态", required = true)
+    private ResultStatus status;
+
+    @ApiModelProperty(value = "状态码", required = true)
+    private String code;
+
+    @ApiModelProperty(value = "消息")
+    private String msg;
+
+    @ApiModelProperty(value = "内容")
+    private T data;
+
+    @ApiModelProperty(value = "异常类")
+    private String exception;
+
+    public ApiResult() {
+    }
+
+    public ApiResult(T content) {
+        this.status = ResultStatus.SUCCESS;
+        this.code = SUCCESS_CODE;
+        this.data = content;
+    }
+
+    public ApiResult(String code, String message) {
+        this.status = ResultStatus.ERROR;
+        this.code = code;
+        this.msg = message;
+    }
+
+    public static <T> ApiResult<T> success(T content) {
+        return new ApiResult<>(content);
+    }
+
+    public static ApiResult<Void> success() {
+        return new ApiResult<>(null);
+    }
+
+    public static <T> ApiResult<T> error(String code, String message) {
+        return new ApiResult<>(code, message);
+    }
+
+    public static <T> ApiResult<T> error(String code, String exception, String message) {
+        ApiResult<T> apiResult = new ApiResult<>(code, message);
+        apiResult.setException(exception);
+        return apiResult;
+    }
+
+    @Transient
+    public boolean isSuccess() {
+        return ResultStatus.SUCCESS == status;
+    }
+
+    @Transient
+    public boolean isError() {
+        return !isSuccess();
+    }
+
+    /**
+     * 业务响应状态
+     */
+    public enum ResultStatus {
+        /**
+         * 返回状态：成功
+         */
+        SUCCESS,
+        /**
+         * 返回状态：失败
+         */
+        ERROR
+    }
+}

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

@@ -1,20 +1,48 @@
 package com.usky.dxtop.controller.web;
 
 
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.model.Charge;
+import com.usky.dxtop.service.ChargeService;
+import com.usky.dxtop.service.vo.ChargeRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
+ * 充值模块
  * @author yq
  * @since 2021-09-09
  */
-@Controller
+@RestController
 @RequestMapping("/dxtop/charge")
 public class ChargeController {
 
+
+    @Autowired
+    private ChargeService chargeService;
+
+
+    /**
+     * 分页
+     * @param chargeRequest
+     * @return
+     */
+    @PostMapping("/page")
+    public ApiResult<CommonPage<Charge>> page(@RequestBody ChargeRequest chargeRequest){
+        return ApiResult.success(chargeService.page(chargeRequest));
+    }
+
+    /**
+     * 充值详情
+     * @param seq
+     * @return
+     */
+    @GetMapping(value = "/{seq}")
+    public ApiResult<Charge> one(@PathVariable Long seq){
+        return ApiResult.success(chargeService.one(seq));
+    }
+
+
 }
 

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

@@ -1,20 +1,47 @@
 package com.usky.dxtop.controller.web;
 
 
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.model.Dish;
+import com.usky.dxtop.service.DishService;
+import com.usky.dxtop.service.vo.DishRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
+ * 消费模块
  * @author yq
  * @since 2021-09-09
  */
-@Controller
+@RestController
 @RequestMapping("/dxtop/dish")
 public class DishController {
 
+
+
+    @Autowired
+    private DishService dishService;
+
+
+    /**
+     * 分页
+     * @param dishRequest
+     * @return
+     */
+    @PostMapping("page")
+    public ApiResult<CommonPage<Dish>> page(@RequestBody DishRequest dishRequest){
+        return ApiResult.success(dishService.page(dishRequest));
+    }
+
+    /**
+     * 消费详情
+     * @param seq
+     * @return
+     */
+    @GetMapping(value = "/{seq}")
+    public ApiResult<Dish> one(@PathVariable Long seq){
+        return ApiResult.success(dishService.one(seq));
+    }
 }
 

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

@@ -12,9 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author yq
@@ -76,14 +74,18 @@ public class TestController {
         Map<String,Object> details = new HashMap<>();
         details.put("pid",1);
         details.put("name",1);
-        details.put("price",1);
-        details.put("amt",1);
-        map.put("details",details);
+        details.put("price",1.0);
+        details.put("amt",1.0);
+        List<Object> objectList = new ArrayList<>();
+        objectList.add(details);
+        map.put("details",objectList);
         Map<String,Object> payments = new HashMap<>();
         payments.put("type",1);
-        payments.put("amt",1);
-        payments.put("balance",1);
-        map.put("payments",payments);
+        payments.put("amt",1.0);
+        payments.put("balance",1.0);
+        List<Object> objectList1 = new ArrayList<>();
+        objectList1.add(payments);
+        map.put("payments",objectList1);
         dishTransRabbitTemplate.convertAndSend(DishTransConfig.NAME, DishTransConfig.NAME, map);
         return "ok";
     }

src/main/java/com/usky/dxtop/mapper/ChargeMapper.java

@@ -1,7 +1,12 @@
 package com.usky.dxtop.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.dxtop.model.Charge;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 
 /**
@@ -14,4 +19,20 @@ import com.usky.dxtop.model.Charge;
  */
 public interface ChargeMapper extends BaseMapper<Charge> {
 
+
+    /**
+     * 分页
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @param cart
+     * @param userName
+     * @return
+     */
+    Page<Charge> page(IPage<Charge> page,
+                      @Param("startTime") Date startTime,
+                      @Param("endTime")Date endTime,
+                      @Param("cart")String cart,
+                      @Param("userName")String userName,
+                      @Param("userId")Long userId);
 }

src/main/java/com/usky/dxtop/mapper/DishMapper.java

@@ -1,7 +1,12 @@
 package com.usky.dxtop.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.dxtop.model.Dish;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 
 /**
@@ -14,4 +19,20 @@ import com.usky.dxtop.model.Dish;
  */
 public interface DishMapper extends BaseMapper<Dish> {
 
+
+    /**
+     * 分页
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @param cart
+     * @param userName
+     * @return
+     */
+    Page<Dish> page(IPage<Dish> page,
+                      @Param("startTime") Date startTime,
+                      @Param("endTime")Date endTime,
+                      @Param("cart")String cart,
+                      @Param("userName")String userName,
+                        @Param("userId")String userId);
 }

src/main/java/com/usky/dxtop/model/Charge.java

@@ -2,6 +2,7 @@ package com.usky.dxtop.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,7 +10,6 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -26,34 +26,73 @@ import java.util.Date;
 public class Charge implements Serializable {
 
     private static final long serialVersionUID=1L;
-
+    /**
+     * 序列号
+     */
     @TableId(value = "seq",type = IdType.INPUT)
     private Long seq;
-
+    /**
+     * 创建时间
+     */
     @JSONField(name="create_date")
     private Date createTime;
-
+    /**
+     * 卡id
+     */
     private String card;
+    /**
+     * 卡编号
+     */
     @JSONField(name="card_no")
     private String cardNo;
-
+    /**
+     * 充值类型(
+     * 1131 自定义补 贴 1 1132 自定义补 贴 2 1133 自定义补 贴 3 1134 自定义补 贴 4 1135 自定义补 贴 5 1136 自定义补 贴 6 1137 自定义补 贴 7
+     * 1138 自定义补 贴 8 1139 自定义补 贴 9 31 余额减值 32 余额加值 2120 充值撤单
+     * )
+     */
     private Integer type;
-
+    /**
+     * 终端id
+     */
     private Integer term;
-
+    /**
+     * 餐厅id
+     */
     private Integer shop;
 
+    /**
+     * 终端名称
+     */
     @JSONField(name="term_name")
     private String termName;
-
+    /**
+     * 餐厅名称
+     */
     @JSONField(name="shop_name")
     private String shopName;
-
+    /**
+     *  金额
+     */
     private BigDecimal amt;
-
+    /**
+     * 卡余额
+     */
     private BigDecimal balance;
-
+    /**
+     * 账号类型0主账号1补贴用户
+     */
     private Integer account;
+    /**
+     * 用户名称
+     */
+    @TableField(exist = false)
+    private String userName;
+    /**
+     * 用户手机号
+     */
+    @TableField(exist = false)
+    private String userPhone;
 
 
 }

src/main/java/com/usky/dxtop/model/Dish.java

@@ -26,39 +26,78 @@ public class Dish implements Serializable {
 
     private static final long serialVersionUID=1L;
 
+    /**
+     * 序列号
+     */
     @TableId(value = "seq",type = IdType.INPUT)
     private Long seq;
+    /**
+     * 创建时间
+     */
     @JSONField(name="create_date")
     private Date createTime;
-
+    /**
+     * 卡id
+     */
     private String card;
+    /**
+     * 卡编号
+     */
     @JSONField(name="card_no")
     private String cardNo;
-
+    /**
+     *1 消费 1001 消费撤单
+     */
     private Integer type;
-
+    /**
+     *终端id
+     */
     private Integer term;
-
+    /**
+     * 餐厅id
+     */
     private Integer shop;
+    /**
+     * 终端名称
+     */
     @JSONField(name="term_name")
     private String termName;
+    /**
+     * 餐厅名称
+     */
     @JSONField(name="shop_name")
     private String shopName;
-
+    /**
+     *金额
+     */
     private BigDecimal amt;
-
+    /**
+     * 卡余额
+     */
     private BigDecimal balance;
-
+    /**
+     * 0主账号1补贴账户
+     */
     private Integer account;
-
+    /**
+     * 1 早餐 2 午餐 3 晚餐 4 夜宵
+     */
     private Integer part;
-
+    /**
+     * 用户姓名
+     */
     private String name;
-
+    /**
+     * 用户唯一识别号
+     */
     private String mob;
-
+    /**
+     * 商品信息
+     */
     private String details;
-
+    /**
+     * 支付信息
+     */
     private String payments;
 
 

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

@@ -3,7 +3,7 @@ package com.usky.dxtop.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.Charge;
-
+import com.usky.dxtop.service.vo.ChargeRequest;
 
 
 /**
@@ -17,8 +17,15 @@ import com.usky.dxtop.model.Charge;
 public interface ChargeService extends IService<Charge> {
     /**
      * 分页
-     * @param charge
+     * @param chargeRequest
+     * @return
+     */
+    CommonPage<Charge> page(ChargeRequest chargeRequest);
+
+    /**
+     * 充值详情
+     * @param seq
      * @return
      */
-    CommonPage<Charge> page(Charge charge);
+    Charge one(Long seq);
 }

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

@@ -1,7 +1,9 @@
 package com.usky.dxtop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.Dish;
+import com.usky.dxtop.service.vo.DishRequest;
 
 
 /**
@@ -14,4 +16,18 @@ import com.usky.dxtop.model.Dish;
  */
 public interface DishService extends IService<Dish> {
 
+    /**
+     * 分页
+     * @param dishRequest
+     * @return
+     */
+    CommonPage<Dish> page(DishRequest dishRequest);
+
+    /**
+     * 消费详情
+     * @param seq
+     * @return
+     */
+    Dish one(Long seq);
+
 }

src/main/java/com/usky/dxtop/service/impl/ChargeServiceImpl.java

@@ -1,11 +1,16 @@
 package com.usky.dxtop.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.ChargeMapper;
 import com.usky.dxtop.model.Charge;
 import com.usky.dxtop.service.ChargeService;
+import com.usky.dxtop.service.vo.ChargeRequest;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,7 +25,21 @@ import org.springframework.stereotype.Service;
 public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> implements ChargeService {
 
     @Override
-    public CommonPage<Charge> page(Charge charge) {
-        return null;
+    public CommonPage<Charge> page(ChargeRequest chargeRequest) {
+        //TODO 后面需要改成和user表的join操作
+        IPage<Charge> page = new Page<>(chargeRequest.getCurrent(), chargeRequest.getSize());
+        LambdaQueryWrapper<Charge> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .like(StringUtils.isNotBlank(chargeRequest.getCart()),Charge::getCard,chargeRequest.getCart())
+                .between(null != chargeRequest.getStartTime() && null != chargeRequest.getEndTime(),
+                        Charge::getCreateTime,chargeRequest.getStartTime(),chargeRequest.getEndTime())
+                .orderByDesc(Charge::getCreateTime);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+    }
+
+    @Override
+    public Charge one(Long seq) {
+        return this.getById(seq);
     }
 }

src/main/java/com/usky/dxtop/service/impl/DishServiceImpl.java

@@ -1,10 +1,17 @@
 package com.usky.dxtop.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.usky.dxtop.common.core.page.CommonPage;
+import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.DishMapper;
 import com.usky.dxtop.model.Dish;
 import com.usky.dxtop.service.DishService;
+import com.usky.dxtop.service.vo.DishRequest;
 import org.springframework.stereotype.Service;
 
 /**
@@ -18,4 +25,24 @@ import org.springframework.stereotype.Service;
 @Service
 public class DishServiceImpl extends ServiceImpl<DishMapper, Dish> implements DishService {
 
+    @Override
+    public CommonPage<Dish> page(DishRequest dishRequest) {
+        //TODO 后面需要改成和user表的join操作
+        IPage<Dish> page = new Page<>(dishRequest.getCurrent(), dishRequest.getSize());
+        LambdaQueryWrapper<Dish> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .like(StringUtils.isNotBlank(dishRequest.getCart()),Dish::getCard,dishRequest.getCart())
+                .between(null != dishRequest.getStartTime() && null != dishRequest.getEndTime(),
+                        Dish::getCreateTime,dishRequest.getStartTime(),dishRequest.getEndTime())
+                .orderByDesc(Dish::getCreateTime);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+    }
+
+    @Override
+    public Dish one(Long seq) {
+        return this.getById(seq);
+    }
+
+
 }

src/main/java/com/usky/dxtop/service/listener/ChargeMqListener.java

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.model.Order;
 import com.usky.dxtop.service.OrderService;
+import com.usky.dxtop.service.config.rabbitmq.charge.ChargeProduceConfig;
 import com.usky.dxtop.service.emun.OrderStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -22,7 +24,7 @@ public class ChargeMqListener {
 
     @Autowired
     private OrderService orderService;
-//    @RabbitListener(queues = ChargeProduceConfig.NAME, containerFactory = ChargeProduceConfig.LISTENER)
+    @RabbitListener(queues = ChargeProduceConfig.NAME, containerFactory = ChargeProduceConfig.LISTENER)
     public void dealDeclareMessage(Message message) {
         try {
             //消息类型

src/main/java/com/usky/dxtop/service/listener/ChargeTransMqListener.java

@@ -3,8 +3,10 @@ package com.usky.dxtop.service.listener;
 import com.alibaba.fastjson.JSONObject;
 import com.usky.dxtop.model.Charge;
 import com.usky.dxtop.service.ChargeService;
+import com.usky.dxtop.service.config.rabbitmq.ChargeTransConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -21,7 +23,7 @@ public class ChargeTransMqListener {
     @Autowired
     private ChargeService chargeService;
 
-//    @RabbitListener(queues = ChargeTransConfig.NAME, containerFactory = ChargeTransConfig.LISTENER)
+    @RabbitListener(queues = ChargeTransConfig.NAME, containerFactory = ChargeTransConfig.LISTENER)
     public void dealDeclareMessage(Message message) {
         try {
             //消息类型

src/main/java/com/usky/dxtop/service/listener/DishTransMqListener.java

@@ -3,8 +3,10 @@ package com.usky.dxtop.service.listener;
 import com.alibaba.fastjson.JSONObject;
 import com.usky.dxtop.model.Dish;
 import com.usky.dxtop.service.DishService;
+import com.usky.dxtop.service.config.rabbitmq.DishTransConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -22,7 +24,7 @@ public class DishTransMqListener {
     private DishService dishService;
 
 
-//    @RabbitListener(queues = DishTransConfig.NAME, containerFactory = DishTransConfig.LISTENER)
+    @RabbitListener(queues = DishTransConfig.NAME, containerFactory = DishTransConfig.LISTENER)
     public void dealDeclareMessage(Message message) {
         try {
             //消息类型

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

@@ -2,6 +2,8 @@ package com.usky.dxtop.service.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author yq
  * @date 2021/9/9 15:57
@@ -9,4 +11,32 @@ import lombok.Data;
 @Data
 public class ChargeRequest {
 
+    /**
+     * 卡号
+     */
+    private String cart;
+    /**
+     * 用户名称/手机号
+     */
+    private String nameOrPhone;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+     */
+    private Integer size;
+    /**
+     * 用戶id
+     */
+    private Long userId;
 }

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

@@ -0,0 +1,41 @@
+package com.usky.dxtop.service.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/9/17 9:27
+ */
+@Data
+public class DishRequest {
+    /**
+     * 卡号
+     */
+    private String cart;
+    /**
+     * 用户名称或者手机号
+     */
+    private String nameOrPhone;
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+     */
+    private Integer size;
+    /**
+     * 用戶id
+     */
+    private Long userId;
+}

src/main/resources/mapper/ChargeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dxtop.dxtop.mapper.ChargeMapper">
+<mapper namespace="com.usky.dxtop.mapper.ChargeMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dxtop.model.Charge">
@@ -17,5 +17,21 @@
         <result column="balance" property="balance" />
         <result column="account" property="account" />
     </resultMap>
+    <select id="page" resultType="com.usky.dxtop.model.Charge">
+        select ch.seq,ch.create_time,ch.card,ch.card_no,ch.type,ch.term,ch.shop,ch.term_name,ch.shop_name,ch.amt
+        ch.balance,ch.account
+        from charge as ch
+        <where>
+            <if test="startTime != null and endTime != null">
+                and  create_time between #{startTime}
+                and #{endTime}
+            </if>
+            <if test="userName !=null and userName !=''">
+                and user_name like CONCAT('%',#{searchParam},'%')
+                or user_account like CONCAT('%',#{searchParam},'%')
+            </if>
+        </where>
+        order by create_time desc
+    </select>
 
 </mapper>

src/main/resources/mapper/DishMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dxtop.dxtop.mapper.DishMapper">
+<mapper namespace="com.usky.dxtop.mapper.DishMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dxtop.model.Dish">
         <id column="seq" property="seq" />
         <result column="create_time" property="createTime" />
         <result column="card" property="card" />
-        <result column="crad_no" property="cradNo" />
+        <result column="card_no" property="cardNo" />
         <result column="type" property="type" />
         <result column="term" property="term" />
         <result column="shop" property="shop" />
@@ -19,13 +19,22 @@
         <result column="part" property="part" />
         <result column="name" property="name" />
         <result column="mob" property="mob" />
-        <result column="p_id" property="pId" />
-        <result column="p_name" property="pName" />
-        <result column="p_price" property="pPrice" />
-        <result column="p_amt" property="pAmt" />
-        <result column="payment_type" property="paymentType" />
-        <result column="payment_amt" property="paymentAmt" />
-        <result column="payment_balance" property="paymentBalance" />
     </resultMap>
+    <select id="page" resultType="com.usky.dxtop.model.Dish">
+        select d.seq,d.card,d.card_no,d.type,d.term,d.shop,d.term_name,d.shop_name,d.amt,d.balance,d.account,
+        d.part,d.name,d.mob
+        from dish as d
+        <where>
+            <if test="startTime != null and endTime != null">
+                and  create_time between #{startTime}
+                and #{endTime}
+            </if>
+            <if test="userName !=null and userName !=''">
+                and user_name like CONCAT('%',#{userName},'%')
+                or user_account like CONCAT('%',#{userName},'%')
+            </if>
+        </where>
+        order by create_time desc
+    </select>
 
 </mapper>