完善充值和消费记录接口

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

@@ -34,5 +34,5 @@ public interface DishMapper extends BaseMapper<Dish> {
                       @Param("endTime")Date endTime,
                       @Param("cart")String cart,
                       @Param("userName")String userName,
-                        @Param("userId")String userId);
+                        @Param("userId")Long userId);
 }

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

@@ -60,5 +60,7 @@ public class Staff implements Serializable {
     @TableField(exist = false)
     private String deptName;
 
+    private String card;
+
 
 }

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

@@ -1,12 +1,9 @@
 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;
@@ -26,15 +23,11 @@ public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> impleme
 
     @Override
     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);
+        page = baseMapper.page(page,chargeRequest.getStartTime(),
+                chargeRequest.getEndTime(),chargeRequest.getCart(),
+                chargeRequest.getNameOrPhone(),chargeRequest.getUserId()
+        );
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 

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

@@ -1,15 +1,12 @@
 package com.usky.dxtop.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.DateUtils;
-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;
@@ -32,15 +29,9 @@ public class DishServiceImpl extends ServiceImpl<DishMapper, Dish> implements Di
 
     @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);
+        page = baseMapper.page(page,dishRequest.getStartTime(),dishRequest.getEndTime(),dishRequest.getCart(),
+                dishRequest.getNameOrPhone(),dishRequest.getUserId());
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 

src/main/resources/mapper/ChargeMapper.xml

@@ -18,10 +18,10 @@
         <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
+        select ch.*,s.name as userName
         from charge as ch
         left join staff as s
+        on ch.card = s.card
         <where>
             <if test="startTime != null and endTime != null">
                 and  create_time between #{startTime}
@@ -31,8 +31,11 @@
                 and user_name like CONCAT('%',#{searchParam},'%')
                 or user_account like CONCAT('%',#{searchParam},'%')
             </if>
+            <if test="userId != null">
+                and s.id = #{userId}
+            </if>
         </where>
-        order by create_time desc
+        order by ch.create_time desc
     </select>
 
 </mapper>

src/main/resources/mapper/DishMapper.xml

@@ -21,20 +21,24 @@
         <result column="mob" property="mob" />
     </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
+        select d.*
         from dish as d
+        left join staff as s
+        on d.card = s.card
         <where>
             <if test="startTime != null and endTime != null">
-                and  create_time between #{startTime}
+                and  d.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>
+            <if test="userId != null">
+                and s.id = #{userId}
+            </if>
         </where>
-        order by create_time desc
+        order by d.create_time desc
     </select>
 
 </mapper>