|
@ -118,8 +118,8 @@ public class ConsumeServiceImpl implements ConsumeService { |
|
|
userGoldRecord.setOrderCode("XF" + timestampPart + counterPart); |
|
|
userGoldRecord.setOrderCode("XF" + timestampPart + counterPart); |
|
|
userGoldRecord.setJwcode(consumeUser.getJwcode()); |
|
|
userGoldRecord.setJwcode(consumeUser.getJwcode()); |
|
|
userGoldRecord.setGoodsName(consumeUser.getGoodsName()); |
|
|
userGoldRecord.setGoodsName(consumeUser.getGoodsName()); |
|
|
userGoldRecord.setSumGold(consumeUser.getSumGold()); |
|
|
|
|
|
userGoldRecord.setPermanentGold(consumeUser.getPermanentGold()); |
|
|
|
|
|
|
|
|
userGoldRecord.setSumGold(-consumeUser.getSumGold()); |
|
|
|
|
|
userGoldRecord.setPermanentGold(-consumeUser.getPermanentGold()); |
|
|
// 获取当前月份(1-12) |
|
|
// 获取当前月份(1-12) |
|
|
int currentMonth = LocalDate.now().getMonthValue(); |
|
|
int currentMonth = LocalDate.now().getMonthValue(); |
|
|
GoldUser gold = userMapper.selectGold(consumeUser.getJwcode().toString()); |
|
|
GoldUser gold = userMapper.selectGold(consumeUser.getJwcode().toString()); |
|
@ -131,23 +131,23 @@ public class ConsumeServiceImpl implements ConsumeService { |
|
|
if (currentMonth >= 1 && currentMonth <= 6) { |
|
|
if (currentMonth >= 1 && currentMonth <= 6) { |
|
|
// 1-6月:设置6月额度,12月保持默认值 |
|
|
// 1-6月:设置6月额度,12月保持默认值 |
|
|
if (consumeUser.getFreeGold() > gold.getNowFreeJune()) { |
|
|
if (consumeUser.getFreeGold() > gold.getNowFreeJune()) { |
|
|
userGoldRecord.setFreeJune(gold.getNowFreeJune()); |
|
|
|
|
|
userGoldRecord.setFreeDecember(consumeUser.getFreeGold() - gold.getNowFreeJune()); |
|
|
|
|
|
|
|
|
userGoldRecord.setFreeJune(-gold.getNowFreeJune()); |
|
|
|
|
|
userGoldRecord.setFreeDecember(-(consumeUser.getFreeGold() - gold.getNowFreeJune())); |
|
|
} else { |
|
|
} else { |
|
|
userGoldRecord.setFreeJune(consumeUser.getFreeGold()); |
|
|
|
|
|
|
|
|
userGoldRecord.setFreeJune(-consumeUser.getFreeGold()); |
|
|
userGoldRecord.setFreeDecember(0); |
|
|
userGoldRecord.setFreeDecember(0); |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
// 7-12月:设置12月额度,6月保持默认值 |
|
|
// 7-12月:设置12月额度,6月保持默认值 |
|
|
if (consumeUser.getFreeGold() > gold.getNowFreeDecember()) { |
|
|
if (consumeUser.getFreeGold() > gold.getNowFreeDecember()) { |
|
|
userGoldRecord.setFreeDecember(gold.getNowFreeDecember()); |
|
|
|
|
|
userGoldRecord.setFreeJune(consumeUser.getFreeGold() - gold.getNowFreeDecember()); |
|
|
|
|
|
|
|
|
userGoldRecord.setFreeDecember(-gold.getNowFreeDecember()); |
|
|
|
|
|
userGoldRecord.setFreeJune(-(consumeUser.getFreeGold() - gold.getNowFreeDecember())); |
|
|
} else { |
|
|
} else { |
|
|
userGoldRecord.setFreeDecember(consumeUser.getFreeGold()); |
|
|
|
|
|
|
|
|
userGoldRecord.setFreeDecember(-consumeUser.getFreeGold()); |
|
|
userGoldRecord.setFreeJune(0); |
|
|
userGoldRecord.setFreeJune(0); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
userGoldRecord.setTaskGold(consumeUser.getTaskGold()); |
|
|
|
|
|
|
|
|
userGoldRecord.setTaskGold(-consumeUser.getTaskGold()); |
|
|
userGoldRecord.setRemark(consumeUser.getRemark()); |
|
|
userGoldRecord.setRemark(consumeUser.getRemark()); |
|
|
userGoldRecord.setType((byte) 1); |
|
|
userGoldRecord.setType((byte) 1); |
|
|
userGoldRecord.setIsRefund((byte) 0); |
|
|
userGoldRecord.setIsRefund((byte) 0); |
|
|