From ad79642adf7d56b1c54898ce971a976683a88dd3 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 10 十月 2024 11:31:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java index 2a82173..8ff8b9d 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java @@ -368,13 +368,19 @@ GrantVO grantVO = new GrantVO(); grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime())); grantVO.setType("红包"); - JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId()); - BigDecimal temp = new BigDecimal(BigInteger.ZERO); - for (int i = 0; i < objects.size(); i++) { - String string = objects.getJSONObject(i).getString("money"); - temp = temp.add(new BigDecimal(string)); +// JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId()); +// BigDecimal temp = new BigDecimal(BigInteger.ZERO); +// for (int i = 0; i < objects.size(); i++) { +// String string = objects.getJSONObject(i).getString("money"); +// temp = temp.add(new BigDecimal(string)); +// } + if (userRedPacketRecord.getRedPacketMoney()==null){ + continue; } - grantVO.setAmount(temp.toString()); + if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){ + continue; + } + grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString()); TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId()); if (tUser!=null){ grantVO.setName(tUser.getNickName()); @@ -767,19 +773,25 @@ grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime())); grantVO.setType("红包"); JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId()); - BigDecimal temp = new BigDecimal(BigInteger.ZERO); - for (int i = 0; i < objects.size(); i++) { - String string = objects.getJSONObject(i).getString("money"); - temp = temp.add(new BigDecimal(string)); +// BigDecimal temp = new BigDecimal(BigInteger.ZERO); +// for (int i = 0; i < objects.size(); i++) { +// String string = objects.getJSONObject(i).getString("money"); +// temp = temp.add(new BigDecimal(string)); +// } + if (userRedPacketRecord.getRedPacketMoney()==null){ + continue; } - grantVO.setAmount(temp.toString()); + if (userRedPacketRecord.getRedPacketMoney().compareTo(new BigDecimal("0"))==0){ + continue; + } + grantVO.setAmount(userRedPacketRecord.getRedPacketMoney().toString()); TUser tUser = appUserService.selectById(userRedPacketRecord.getUserId()); if (tUser!=null){ grantVO.setName(tUser.getNickName()); } grantVO.setRemark("订单号:"+userRedPacketRecord.getOrderNum()); res.add(grantVO); - redPackage = redPackage.add(new BigDecimal(temp.toString())); + redPackage = redPackage.add(userRedPacketRecord.getRedPacketMoney()); } for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) { if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){ @@ -901,6 +913,8 @@ return useMoneyVO; } + @Autowired + private ISysRedPacketRecordService sysRedPacketRecordService; /** * 发放补贴统计 */ @@ -1147,10 +1161,11 @@ if (tUser!=null){ grantVO.setName(tUser.getNickName()); } - if (userRedPacketRecord.getRedPacketActivityId() == null){ + if (userRedPacketRecord.getIsGrant() == 1){ // 后台发放的红包 - grantVO.setRemark("后台指定派发"); + grantVO.setRemark("指定发放"); } + UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId()); if (userActivityRedenvelope!=null){ -- Gitblit v1.7.1