diff --git a/src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java b/src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java index fac6a0dd..3d37118a 100644 --- a/src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java +++ b/src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java @@ -56,8 +56,8 @@ public class JfTransactionDetailsController { @Transactional public R activityDonateJF(){ StringBuffer sb = new StringBuffer(); - String startTime = "2025-06-14 00:00:00"; - String endTime = "2025-06-17 09:30:00"; + String startTime = "2025-11-08 00:00:00"; + String endTime = "2025-11-13 09:22:00"; //查询时间段内所有充值的人 List list = transactionDetailsService.list(new LambdaQueryWrapper() .between(TransactionDetailsEntity::getCreateTime,startTime,endTime) @@ -76,6 +76,7 @@ public class JfTransactionDetailsController { //时间段内获得的积分 Map jftd = jfService.getMap(new MPJLambdaWrapper() .eq(JfTransactionDetails::getUserId,transactionDetail.getUserId()) + .like(JfTransactionDetails::getRemark,"双11") .between(JfTransactionDetails::getCreateTime,startTime,endTime) .gt(TransactionDetailsEntity::getChangeAmount,0) .selectSum(TransactionDetailsEntity::getChangeAmount)); @@ -87,22 +88,22 @@ public class JfTransactionDetailsController { } changeJf = chgf(changeJf,shouldJf,new BigDecimal(td.get("changeAmount").toString()),jf); if (changeJf.compareTo(BigDecimal.ZERO)>0){ -// sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+ -// "获得积分"+jf+"补积分"+changeJf+"\n"); -// user.setJf(user.getJf().add(changeJf)); -// userService.updateById(user); -// addJf(user,changeJf); + sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+ + "获得积分"+jf+"补积分"+changeJf+"\n"); + user.setJf(user.getJf().add(changeJf)); + userService.updateById(user); + addJf(user,changeJf); }else if (changeJf.compareTo(BigDecimal.ZERO)==0){ -// sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+ -// "获得积分"+jf+"补积分"+changeJf+"\n"); + sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+ + "获得积分"+jf+"补积分"+changeJf+"\n"); }else if (changeJf.compareTo(BigDecimal.ZERO)<0){ -// sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"特殊情况\n"); + sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"特殊情况\n"); } }else { -// sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+"未达标\n"); + sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+"未达标\n"); } } -// System.out.println(sb.toString()); + System.out.println(sb.toString()); return R.ok(); } @@ -113,20 +114,19 @@ public class JfTransactionDetailsController { new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(1000))>=0|| new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(500))>=0){ if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(5000))>=0){ - shouldJf = shouldJf.add(new BigDecimal(2200)); + shouldJf = shouldJf.add(new BigDecimal(2500)); changeAmount = changeAmount.subtract(new BigDecimal(5000)); }else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(3000))>=0){ - shouldJf = shouldJf.add(new BigDecimal(1000)); + shouldJf = shouldJf.add(new BigDecimal(1300)); changeAmount = changeAmount.subtract(new BigDecimal(3000)); }else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(2000))>=0){ - shouldJf = shouldJf.add(new BigDecimal(600)); + shouldJf = shouldJf.add(new BigDecimal(800)); changeAmount = changeAmount.subtract(new BigDecimal(2000)); }else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(1000))>=0){ - shouldJf = shouldJf.add(new BigDecimal(240)); + shouldJf = shouldJf.add(new BigDecimal(300)); changeAmount = changeAmount.subtract(new BigDecimal(1000)); }else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(500))>=0){ - shouldJf = shouldJf.add(new BigDecimal(100)); -// changeJf = new BigDecimal(100).subtract(jf); + shouldJf = shouldJf.add(new BigDecimal(120)); changeAmount = changeAmount.subtract(new BigDecimal(500)); } return chgf(changeJf,shouldJf,changeAmount,jf); @@ -143,7 +143,7 @@ public class JfTransactionDetailsController { jfTransactionDetails.setActType(0); jfTransactionDetails.setChangeAmount(changeAmount); jfTransactionDetails.setUserBalance(user.getJf()); - jfTransactionDetails.setRemark("2025年618活动赠与"); + jfTransactionDetails.setRemark("2025年双11活动赠与补送"); jfService.save(jfTransactionDetails); }