zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改为双11活动

Browse Source
This commit is contained in:
wuchunlei
2025-11-13 09:31:04 +08:00
parent 28017dbe90
commit c3e4dd90df
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/peanut/modules/common/controller/JfTransactionDetailsController.java
View File

@@ -56,8 +56,8 @@ public class JfTransactionDetailsController {
@Transactional @Transactional
public R activityDonateJF(){ public R activityDonateJF(){
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
String startTime = "2025-06-14 00:00:00"; String startTime = "2025-11-08 00:00:00";
String endTime = "2025-06-17 09:30:00"; String endTime = "2025-11-13 09:22:00";
//查询时间段内所有充值的人 //查询时间段内所有充值的人
List<TransactionDetailsEntity> list = transactionDetailsService.list(new LambdaQueryWrapper<TransactionDetailsEntity>() List<TransactionDetailsEntity> list = transactionDetailsService.list(new LambdaQueryWrapper<TransactionDetailsEntity>()
.between(TransactionDetailsEntity::getCreateTime,startTime,endTime) .between(TransactionDetailsEntity::getCreateTime,startTime,endTime)
@@ -76,6 +76,7 @@ public class JfTransactionDetailsController {
//时间段内获得的积分 //时间段内获得的积分
Map<String,Object> jftd = jfService.getMap(new MPJLambdaWrapper<JfTransactionDetails>() Map<String,Object> jftd = jfService.getMap(new MPJLambdaWrapper<JfTransactionDetails>()
.eq(JfTransactionDetails::getUserId,transactionDetail.getUserId()) .eq(JfTransactionDetails::getUserId,transactionDetail.getUserId())
.like(JfTransactionDetails::getRemark,"双11")
.between(JfTransactionDetails::getCreateTime,startTime,endTime) .between(JfTransactionDetails::getCreateTime,startTime,endTime)
.gt(TransactionDetailsEntity::getChangeAmount,0) .gt(TransactionDetailsEntity::getChangeAmount,0)
.selectSum(TransactionDetailsEntity::getChangeAmount)); .selectSum(TransactionDetailsEntity::getChangeAmount));
@@ -87,22 +88,22 @@ public class JfTransactionDetailsController {
} }
changeJf = chgf(changeJf,shouldJf,new BigDecimal(td.get("changeAmount").toString()),jf); changeJf = chgf(changeJf,shouldJf,new BigDecimal(td.get("changeAmount").toString()),jf);
if (changeJf.compareTo(BigDecimal.ZERO)>0){ if (changeJf.compareTo(BigDecimal.ZERO)>0){
// sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+ sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+
// "获得积分"+jf+"补积分"+changeJf+"\n"); "获得积分"+jf+"补积分"+changeJf+"\n");
// user.setJf(user.getJf().add(changeJf)); user.setJf(user.getJf().add(changeJf));
// userService.updateById(user); userService.updateById(user);
// addJf(user,changeJf); addJf(user,changeJf);
}else if (changeJf.compareTo(BigDecimal.ZERO)==0){ }else if (changeJf.compareTo(BigDecimal.ZERO)==0){
// sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+ sb.append((StringUtils.isEmpty(user.getName())?"无名氏":user.getName())+"-"+user.getTel()+"充值"+td.get("changeAmount").toString()+
// "获得积分"+jf+"补积分"+changeJf+"\n"); "获得积分"+jf+"补积分"+changeJf+"\n");
}else if (changeJf.compareTo(BigDecimal.ZERO)<0){ }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 { }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(); 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(1000))>=0||
new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(500))>=0){ new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(500))>=0){
if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(5000))>=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)); changeAmount = changeAmount.subtract(new BigDecimal(5000));
}else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(3000))>=0){ }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)); changeAmount = changeAmount.subtract(new BigDecimal(3000));
}else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(2000))>=0){ }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)); changeAmount = changeAmount.subtract(new BigDecimal(2000));
}else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(1000))>=0){ }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)); changeAmount = changeAmount.subtract(new BigDecimal(1000));
}else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(500))>=0){ }else if (new BigDecimal(changeAmount.toString()).compareTo(new BigDecimal(500))>=0){
shouldJf = shouldJf.add(new BigDecimal(100)); shouldJf = shouldJf.add(new BigDecimal(120));
// changeJf = new BigDecimal(100).subtract(jf);
changeAmount = changeAmount.subtract(new BigDecimal(500)); changeAmount = changeAmount.subtract(new BigDecimal(500));
} }
return chgf(changeJf,shouldJf,changeAmount,jf); return chgf(changeJf,shouldJf,changeAmount,jf);
@@ -143,7 +143,7 @@ public class JfTransactionDetailsController {
jfTransactionDetails.setActType(0); jfTransactionDetails.setActType(0);
jfTransactionDetails.setChangeAmount(changeAmount); jfTransactionDetails.setChangeAmount(changeAmount);
jfTransactionDetails.setUserBalance(user.getJf()); jfTransactionDetails.setUserBalance(user.getJf());
jfTransactionDetails.setRemark("2025年618活动赠与"); jfTransactionDetails.setRemark("2025年双11活动赠与补送");
jfService.save(jfTransactionDetails); jfService.save(jfTransactionDetails);
} }