From a7bf9371d2d057ecf227d4b4a6ee437c940fa5d6 Mon Sep 17 00:00:00 2001 From: xyiege Date: Fri, 5 May 2023 11:32:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=88=86=E9=85=8D=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminAccountCloseController.java | 8 +++++++- .../szwh/mapper/UserAccountBillMapper.java | 12 ++++++++++++ .../chjyj/szwh/service/AccountCloseService.java | 5 +++-- .../service/impl/AccountCloseServiceImpl.java | 14 +++++++++++--- .../mapper/szwh/UserAccountBillMapper.xml | 17 +++++++++++++++++ 5 files changed, 50 insertions(+), 6 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java index a8546d0..65de4b1 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java @@ -137,6 +137,7 @@ public class AdminAccountCloseController extends BaseController { */ @PostMapping("/getBillDetail") public JSONObject getBillDetail(@RequestBody String rejson){ + //{"batchcode":"1657003731168089","close_status":"1","user_isli":"899998-000000001038-3","limit":10,"page":1} JSONObject request = JSONObject.parseObject(rejson); String uesrIsli= request.getString("user_isli"); String msg="成功"; @@ -149,8 +150,13 @@ public class AdminAccountCloseController extends BaseController { int ilimit = StringUtils.isNotBlank(limit)?Integer.valueOf(limit):20; String page = request.getString("page"); int ipage = StringUtils.isNotBlank(page)?Integer.valueOf(page):1; + // 订单编号 + String batchcode=request.getString("batchcode"); + if(StringUtils.isEmpty(batchcode)){ + batchcode=null; + } // - Map rmap = accountCloseService.getBillDetail(uesrIsli,ipage,ilimit); + Map rmap = accountCloseService.getBillDetail(uesrIsli,batchcode,ipage,ilimit); jsonObject.put("data",rmap); jsonObject.put("msg",msg); jsonObject.put("code",code); diff --git a/src/main/java/cn/chjyj/szwh/mapper/UserAccountBillMapper.java b/src/main/java/cn/chjyj/szwh/mapper/UserAccountBillMapper.java index 21d2b46..8009a57 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/UserAccountBillMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/UserAccountBillMapper.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.PostMapping; import java.util.List; +import java.util.Map; @Component public interface UserAccountBillMapper { @@ -20,6 +21,17 @@ public interface UserAccountBillMapper { @Param("startrs") int statrs, @Param("limit") int limit); + /** + * 多条件查询核销 + * @param map + * @param statrs + * @param limit + * @return + */ + List getUserAccBillMap(@Param("map") Map map, + @Param("startrs") int statrs, + @Param("limit") int limit); + /** * 统计用户的交易总笔数 * @param userisli diff --git a/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java b/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java index 32796bf..b6b52b4 100644 --- a/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java +++ b/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java @@ -59,12 +59,13 @@ public interface AccountCloseService { /** * 账单明细 - * @param uesrIsli + * @param userIsli 用户编号 + * @param batchcode 订单编号 * @param ipage * @param ilimit * @return */ - Map getBillDetail(String uesrIsli,int ipage,int ilimit); + Map getBillDetail(String userIsli,String batchcode,int ipage,int ilimit); /** * 设置分配比例 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 bad3e6e..5bf0feb 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java @@ -202,11 +202,11 @@ public class AccountCloseServiceImpl implements AccountCloseService { * @return */ @Override - public Map getBillDetail(String uesrIsli, int ipage, int ilimit) { + public Map getBillDetail(String userIsli,String batchcode, int ipage, int ilimit) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map retmap =new HashMap(); int startrs =ipage>1?(ipage-1)*ilimit:0; - int total = userAccountBillMapper.countUserAccBill(uesrIsli); + int total = userAccountBillMapper.countUserAccBill(userIsli); Integer end = ipage*ilimit; Integer start =startrs+1; if(total < end){ @@ -222,8 +222,16 @@ public class AccountCloseServiceImpl implements AccountCloseService { retmap.put("pre_page",ilimit); retmap.put("total",total); + // 查询map + Map somap = new HashMap<>(); + somap.put("user_isli",userIsli); + if(batchcode!=null){ + somap.put("batchcode",batchcode.trim()); + } + List uacblist = userAccountBillMapper.getUserAccBillMap(somap,start,ilimit); + // list - List uacblist = userAccountBillMapper.getUserAccBill(uesrIsli,ipage,ilimit); + //List uacblist = userAccountBillMapper.getUserAccBill(uesrIsli,ipage,ilimit); BigDecimal income = new BigDecimal(0.00); // 收入 BigDecimal disburse = new BigDecimal(0.00); //支出 diff --git a/src/main/resources/mapper/szwh/UserAccountBillMapper.xml b/src/main/resources/mapper/szwh/UserAccountBillMapper.xml index 6158c1e..338fa9a 100644 --- a/src/main/resources/mapper/szwh/UserAccountBillMapper.xml +++ b/src/main/resources/mapper/szwh/UserAccountBillMapper.xml @@ -22,6 +22,23 @@ limit #{startrs},#{limit} + + +