diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java index ea8203a..e48ec56 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java @@ -33,5 +33,5 @@ public interface OrderUserMapper { * 订单结算 * @return */ - Map ordercs(); + List ordercs(); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java index 6cb317a..3e9c4cc 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java @@ -66,9 +66,17 @@ public class AccountCloseServiceImpl implements AccountCloseService { */ @Override public Map closeList(Map qmap, int limit, int page) { + Map retmap =new HashMap(); + int start = page>1?(page-1)*limit:0; + + retmap.put("start",start); + retmap.put("end",page*limit); + retmap.put("page",page); + retmap.put("per_page",limit); // 按照用户isli 分组 //List idlist=orderUserMapper.isligroup(); - Map xmap = orderUserMapper.ordercs(); - return xmap; + List xlist = orderUserMapper.ordercs(); + retmap.put("data",xlist); + return retmap; } } diff --git a/src/main/resources/mapper/szwh/OrderUserMapper.xml b/src/main/resources/mapper/szwh/OrderUserMapper.xml index 976f8bf..7b7710c 100644 --- a/src/main/resources/mapper/szwh/OrderUserMapper.xml +++ b/src/main/resources/mapper/szwh/OrderUserMapper.xml @@ -28,7 +28,7 @@ - SELECT u.islicode as islicode,u.`name`,u.publicAccount, u.bankName,u.userType,o.close_status FROM order_user u INNER JOIN `order` o ON u.batchcode=o.batchcode diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java index 865bbfe..318916d 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java +++ b/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java @@ -34,4 +34,10 @@ public class OrderUserMapperTest { } //System.out.println(mp.size()); } + + @Test + public void ordcs(){ + List xxlist = orderUserMapper.ordercs(); + System.out.println(xxlist.size()); + } } \ No newline at end of file