|
|
|
@ -349,8 +349,8 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
|
|
|
|
|
throw new ServerErrorException("请不要重复生成合伙人记录");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// financialPartnerCommissionDetailMapper.clearData(year, month, 1);
|
|
|
|
|
// financialPartnerCommissionMapper.clearData(year, month, 1);
|
|
|
|
|
financialPartnerCommissionDetailMapper.clearData(year, month, 1);
|
|
|
|
|
financialPartnerCommissionMapper.clearData(year, month, 1);
|
|
|
|
|
|
|
|
|
|
JSONObject sysConfig = sysConfigManager.getSysConfig();
|
|
|
|
|
BigDecimal alipayChargeRate = new BigDecimal("0.6");
|
|
|
|
@ -396,7 +396,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
|
|
|
|
|
channel.put("month", month);
|
|
|
|
|
channel.put("year", year);
|
|
|
|
|
channel.put("org_id", orgId);
|
|
|
|
|
// financialPartnerCommissionMapper.save(channel);
|
|
|
|
|
financialPartnerCommissionMapper.save(channel);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Map<Integer, List<JSONObject>> groupByClientMap = transactionDetail.stream().collect(Collectors.groupingBy(e -> e.getInteger("client_id")));
|
|
|
|
@ -405,7 +405,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
|
|
|
|
|
Map<String, List<JSONObject>> groupByChannel = oneClient.getValue().stream().collect(Collectors.groupingBy(e -> e.getString("channel")));
|
|
|
|
|
List<JSONObject> clientChannelAmount = clientChannelAmount(oneClient.getKey(), org, groupByChannel, channelCharge, year, month, 1);
|
|
|
|
|
for (JSONObject channel : clientChannelAmount) {
|
|
|
|
|
// financialPartnerCommissionDetailMapper.save(channel);
|
|
|
|
|
financialPartnerCommissionDetailMapper.save(channel);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Runnable task = () -> {
|
|
|
|
|