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

vip日志表添加price字段，保存初始付款金额

Browse Source
This commit is contained in:
wuchunlei
2025-10-12 13:27:56 +08:00
parent dba68189ca
commit ef935c98d1
5 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/peanut/modules/common/entity/UserVipLog.java
View File

@@ -29,6 +29,7 @@ public class UserVipLog implements Serializable {
private Integer adminId;
private Date startTime;
private Date endTime;
private BigDecimal price;
private BigDecimal fee;
private BigDecimal dayAmount;
private String payType;

2
src/main/java/com/peanut/modules/common/service/impl/UserVipLogServiceImpl.java
View File

@@ -34,6 +34,7 @@ public class UserVipLogServiceImpl extends ServiceImpl<UserVipLogDao, UserVipLog
userVipLog.setOrderSn(orderSn);
userVipLog.setStartTime(startTime);
userVipLog.setEndTime(endTime);
userVipLog.setPrice(fee);
userVipLog.setFee(fee);
userVipLog.setJf(jf);
userVipLog.setPayType(payType);
@@ -51,6 +52,7 @@ public class UserVipLogServiceImpl extends ServiceImpl<UserVipLogDao, UserVipLog
userVipLog.setAdminId(Integer.parseInt(params.get("adminId").toString()));
userVipLog.setStartTime(userVip.getStartTime());
userVipLog.setEndTime(userVip.getEndTime());
userVipLog.setPrice(new BigDecimal(params.get("fee").toString()));
userVipLog.setFee(new BigDecimal(params.get("fee").toString()));
userVipLog.setJf(new BigDecimal(StringUtils.isEmpty(params.get("jf").toString()) ? "0" : params.get("jf").toString()));
userVipLog.setPayType(params.get("payType").toString());

38
src/main/java/com/peanut/modules/master/controller/StatisticsController.java
View File

@@ -281,15 +281,16 @@ public class StatisticsController {
titleRow.createCell(6).setCellValue("订单号");
titleRow.createCell(7).setCellValue("支付方式");
titleRow.createCell(8).setCellValue("备注");
titleRow.createCell(9).setCellValue("金额");
titleRow.createCell(10).setCellValue("总天数");
titleRow.createCell(11).setCellValue("每日摊销");
titleRow.createCell(12).setCellValue("已摊销天数");
titleRow.createCell(13).setCellValue("当月摊销天数");
titleRow.createCell(14).setCellValue("未摊销天数");
titleRow.createCell(15).setCellValue("已摊销金额");
titleRow.createCell(16).setCellValue("当月摊销金额");
titleRow.createCell(17).setCellValue("剩余摊销金额");
titleRow.createCell(9).setCellValue("缴费金额");
titleRow.createCell(10).setCellValue("摊销计算金额");
titleRow.createCell(11).setCellValue("总天数");
titleRow.createCell(12).setCellValue("每日摊销");
titleRow.createCell(13).setCellValue("已摊销天数");
titleRow.createCell(14).setCellValue("当月摊销天数");
titleRow.createCell(15).setCellValue("未摊销天数");
titleRow.createCell(16).setCellValue("已摊销金额");
titleRow.createCell(17).setCellValue("当月摊销金额");
titleRow.createCell(18).setCellValue("剩余摊销金额");
//序号，默认为1
int cell = 1;
//遍历
@@ -304,15 +305,16 @@ public class StatisticsController {
row.createCell(6).setCellValue(map.get("orderSn").toString());
row.createCell(7).setCellValue(map.get("payType").toString());
row.createCell(8).setCellValue(map.get("remark").toString());
row.createCell(9).setCellValue(map.get("fee").toString());
row.createCell(10).setCellValue(map.get("totalDays").toString());
row.createCell(11).setCellValue(map.get("dayAmount").toString());
row.createCell(12).setCellValue(map.get("alreadyDays").toString());
row.createCell(13).setCellValue(map.get("currentDays").toString());
row.createCell(14).setCellValue(map.get("notyetDays").toString());
row.createCell(15).setCellValue(map.get("alreadyTanxiao").toString());
row.createCell(16).setCellValue(map.get("currentTanxiao").toString());
row.createCell(17).setCellValue(map.get("notyetTanxiao").toString());
row.createCell(9).setCellValue(map.get("price").toString());
row.createCell(10).setCellValue(map.get("fee").toString());
row.createCell(11).setCellValue(map.get("totalDays").toString());
row.createCell(12).setCellValue(map.get("dayAmount").toString());
row.createCell(13).setCellValue(map.get("alreadyDays").toString());
row.createCell(14).setCellValue(map.get("currentDays").toString());
row.createCell(15).setCellValue(map.get("notyetDays").toString());
row.createCell(16).setCellValue(map.get("alreadyTanxiao").toString());
row.createCell(17).setCellValue(map.get("currentTanxiao").toString());
row.createCell(18).setCellValue(map.get("notyetTanxiao").toString());
//序号自增
cell++;
}

2
src/main/java/com/peanut/modules/master/controller/UserVipController.java
View File

@@ -218,6 +218,7 @@ public class UserVipController {
userVipLog.setEndTime(DateUtils.stringToDate(params.get("endTime").toString(), "yyyy-MM-dd HH:mm:ss"));
BigDecimal fee = new BigDecimal(params.get("fee").toString());
BigDecimal jf = new BigDecimal(params.get("jf").toString());
userVipLog.setPrice(fee.divide(new BigDecimal(userVips.size()),2, BigDecimal.ROUND_HALF_UP));
userVipLog.setFee(fee.divide(new BigDecimal(userVips.size()),2, BigDecimal.ROUND_HALF_UP));
userVipLog.setJf(jf.divide(new BigDecimal(userVips.size()),2, BigDecimal.ROUND_HALF_UP));
userVipLog.setPayType(params.get("payType").toString());
@@ -239,6 +240,7 @@ public class UserVipController {
userVipLog.setAdminId(Integer.parseInt(params.get("adminId").toString()));
userVipLog.setStartTime(DateUtils.stringToDate(params.get("startTime").toString(), "yyyy-MM-dd HH:mm:ss"));
userVipLog.setEndTime(DateUtils.stringToDate(params.get("endTime").toString(), "yyyy-MM-dd HH:mm:ss"));
userVipLog.setPrice(new BigDecimal(params.get("fee").toString()));
userVipLog.setFee(new BigDecimal(params.get("fee").toString()));
userVipLog.setJf(new BigDecimal(params.get("jf").toString()));
userVipLog.setPayType(params.get("payType").toString());