q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Java21

Browse Source
This commit is contained in:
Jerry Yan
2025-05-30 10:31:21 +08:00
parent 115edc19fa
commit 80f4491836
73 changed files with 310 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/ycwl/basic/profitsharing/biz/ProfitSharingBiz.java
View File

@ -45,12 +45,10 @@ public class ProfitSharingBiz {
userAmount = amount.multiply(user.getRealRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
wxAmount = amount.multiply(user.getWxRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
manualAmount = userAmount.subtract(wxAmount);
} else if (user.getRateMode() == 3) { // 固定抽成
} else { // 固定抽成
userAmount = user.getRealRate();
wxAmount = user.getWxRate();
manualAmount = userAmount.subtract(wxAmount);
} else {
return;
}
ProfitSharingRecord record = new ProfitSharingRecord();
record.setScenicId(scenicId);
@ -77,13 +75,10 @@ public class ProfitSharingBiz {
BigDecimal userAmount;
BigDecimal wxAmount;
BigDecimal manualAmount;
if (user.getRateMode() == 2) { // 扣除固定抽成后的动态比例
userAmount = mode2RemainAmount.multiply(user.getRealRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
wxAmount = mode2RemainAmount.multiply(user.getWxRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
manualAmount = userAmount.subtract(wxAmount);
} else {
return;
}
// 扣除固定抽成后的动态比例
userAmount = mode2RemainAmount.multiply(user.getRealRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
wxAmount = mode2RemainAmount.multiply(user.getWxRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
manualAmount = userAmount.subtract(wxAmount);
ProfitSharingRecord record = new ProfitSharingRecord();
record.setScenicId(scenicId);
record.setOrderId(orderId);
@ -109,13 +104,10 @@ public class ProfitSharingBiz {
BigDecimal userAmount;
BigDecimal wxAmount;
BigDecimal manualAmount;
if (user.getRateMode() == 4) { // 扣除其他所有类型抽成后的动态比例
userAmount = mode4RemainAmount.multiply(user.getRealRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
wxAmount = mode4RemainAmount.multiply(user.getWxRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
manualAmount = userAmount.subtract(wxAmount);
} else {
return;
}
// 扣除其他所有类型抽成后的动态比例
userAmount = mode4RemainAmount.multiply(user.getRealRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
wxAmount = mode4RemainAmount.multiply(user.getWxRate()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN);
manualAmount = userAmount.subtract(wxAmount);
ProfitSharingRecord record = new ProfitSharingRecord();
record.setScenicId(scenicId);
record.setOrderId(orderId);

2
src/main/java/com/ycwl/basic/profitsharing/dto/ProfitSharingConfigVO.java
View File

@ -5,7 +5,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode
@EqualsAndHashCode(callSuper = true)
public class ProfitSharingConfigVO extends ProfitSharingConfig {
private String scenicName;
}

2
src/main/java/com/ycwl/basic/profitsharing/service/impl/ProfitSharingRecordServiceImpl.java
View File

@ -66,7 +66,7 @@ public class ProfitSharingRecordServiceImpl implements ProfitSharingRecordServic
map.put(item.getUserName(), item);
});
ProfitSharingTableRecordVO vo = new ProfitSharingTableRecordVO();
ProfitSharingRecordRespVO recordRespVO = value.get(0);
ProfitSharingRecordRespVO recordRespVO = value.getFirst();
vo.setOrderId(recordRespVO.getOrderId());
vo.setScenicId(recordRespVO.getScenicId());
vo.setScenicName(recordRespVO.getScenicName());