From 75f9e2cc1604bd26bfeb788238b1b279c3bd28ca Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Thu, 14 May 2020 19:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=91=98=E4=BB=BB=E5=8A=A1=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shop/service/YxUserBillService.java       |  2 +-
 .../modules/shop/service/dto/YxUserBillDto.java       |  2 ++
 .../shop/service/impl/YxUserBillServiceImpl.java      |  4 ++--
 .../modules/shop/service/mapper/UserBillMapper.java   | 11 ++++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java
index ecaf3f24..7cf2e155 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java
@@ -36,7 +36,7 @@ public interface YxUserBillService  extends BaseService<YxUserBill>{
     * @param criteria 条件参数
     * @return List<YxUserBillDto>
     */
-    List<Map<String,Object>> queryAll(YxUserBillQueryCriteria criteria);
+    List<YxUserBillDto> queryAll(YxUserBillQueryCriteria criteria);
 
     /**
     * 导出数据
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java
index db9fa7d0..a5bf9dc4 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java
@@ -54,4 +54,6 @@ public class YxUserBillDto implements Serializable {
 
     /** 0 = 带确定 1 = 有效 -1 = 无效 */
     private Integer status;
+
+    private String nickname;
 }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java
index 581197e1..c5b2f389 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java
@@ -52,7 +52,7 @@ public class YxUserBillServiceImpl extends BaseServiceImpl<UserBillMapper, YxUse
     //@Cacheable
     public Map<String, Object> queryAll(YxUserBillQueryCriteria criteria, Pageable pageable) {
         getPage(pageable);
-        PageInfo<Map<String,Object>> page = new PageInfo<>(queryAll(criteria));
+        PageInfo<YxUserBillDto> page = new PageInfo<>(queryAll(criteria));
         Map<String, Object> map = new LinkedHashMap<>(2);
         map.put("content", page.getList());
         map.put("totalElements", page.getTotal());
@@ -62,7 +62,7 @@ public class YxUserBillServiceImpl extends BaseServiceImpl<UserBillMapper, YxUse
 
     @Override
     //@Cacheable
-    public List<Map<String,Object>> queryAll(YxUserBillQueryCriteria criteria){
+    public List<YxUserBillDto> queryAll(YxUserBillQueryCriteria criteria){
 
         return baseMapper.findAllByQueryCriteria(criteria.getCategory(),criteria.getType(),criteria.getNickname());
     }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java
index 17357f8e..a5f531c5 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/UserBillMapper.java
@@ -29,9 +29,10 @@ import java.util.Map;
 @Mapper
 public interface UserBillMapper extends CoreMapper<YxUserBill> {
 
-    @ResultType(Map.class)
-    @Select("select b.title,b.pm,b.category,b.type,b.number,b.add_time as addTime,u.nickname " +
-            "from yx_user_bill b left join yx_user u on u.uid=b.uid  where if(#{category} !='',b.category=#{category},1=1) " +
-            "and if(#{type} !='',b.type=#{type},1=1)  and if(#{nickname} !='',u.nickname LIKE CONCAT('%',#{nickname},'%'),1=1)  ")
-    List<Map<String, Object>> findAllByQueryCriteria(@Param("category") String category, @Param("type") String type, @Param("nickname") String nickname);
+    @Select("<script> select b.title,b.pm,b.category,b.type,b.number,b.add_time ,u.nickname " +
+            "from yx_user_bill b left join yx_user u on u.uid=b.uid  where 1=1  "  +
+            "<if test =\"category !=''\">and b.category=#{category}</if> " +
+            "<if test =\"type !=''\">and b.type=#{type}</if> " +
+            "<if test =\"nickname !=''\">and u.nickname= LIKE CONCAT('%',#{nickname},'%')</if> </script> ")
+    List<YxUserBillDto> findAllByQueryCriteria(@Param("category") String category, @Param("type") String type, @Param("nickname") String nickname);
 }