This commit is contained in:
quyixiao 2025-11-22 11:17:40 +08:00
parent f9eed324c3
commit 1b016a3079

View File

@ -358,47 +358,47 @@ public class AppOrderController {
vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity); vvTradeOrderLineDao.insertOrUpdateVvTradeOrderLine(tradeOrderLineEntity);
} }
List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId()); List<VvPromoterBuyerEntity> vvPromoterBuyerList = vvPromoterBuyerDao.selectVvPromoterBuyerByPromoterId(vvActivityDTO.getPromoterId());
if (CollectionUtils.isNotEmpty(vvPromoterBuyerList) if (CollectionUtils.isNotEmpty(vvPromoterBuyerList)
&& CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) { && CollectionUtils.isNotEmpty(vvPromoterTradeOrderLineAwardEntityList)) {
for (int i = 0; i < vvPromoterBuyerList.size(); i++) { Map<Long,List<VvPromoterTradeOrderLineAwardEntity>> vvPromoterTradeOrderLineAwardMap = new HashMap<>();
VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAwardEntity = new VvPromoterTradeOrderAwardEntity(); for (VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity : vvPromoterTradeOrderLineAwardEntityList) {
VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardIndex_0 = vvPromoterTradeOrderLineAwardEntityList.get(0); BigDecimal awardAmount = vvPromoterTradeOrderLineAwardEntity.getAwardAmount();
VvPromoterBuyerEntity vvPromoterBuyer = vvPromoterBuyerList.get(i); BigDecimal awardAmountSingle = BigDecimalUtil.divide(awardAmount, new BigDecimal(vvPromoterBuyerList.size()));
VvPromoterTradeOrderLineAwardEntity promoterTradeOrderLineAwardNew = new VvPromoterTradeOrderLineAwardEntity();
vvPromoterTradeOrderAwardEntity.setPromoterBuyerId(vvPromoterBuyer.getPromoterBuyerId()); BeanUtils.copyProperties(vvPromoterTradeOrderLineAwardEntity, promoterTradeOrderLineAwardNew);
vvPromoterTradeOrderAwardEntity.setPromoterBuyerName(vvPromoterBuyer.getPromoterBuyerName()); BigDecimal sum = BigDecimal.ZERO;
vvPromoterTradeOrderAwardEntity.setPromoterBuyerPhone(vvPromoterBuyer.getPromoterBuyerPhone()); for (int i = 0; i < vvPromoterBuyerList.size(); i++) {
vvPromoterTradeOrderAwardEntity.setPromoterBuyerWeixin(vvPromoterBuyer.getPromoterBuyerWeixin()); VvPromoterBuyerEntity vvPromoterBuyer = vvPromoterBuyerList.get(i);
BeanUtils.copyProperties(vvPromoterTradeOrderLineAwardIndex_0, vvPromoterTradeOrderAwardEntity);
vvPromoterTradeOrderAwardDao.insertVvPromoterTradeOrderAward(vvPromoterTradeOrderAwardEntity);
BigDecimal tradeOrderAward = BigDecimal.ZERO;
for (VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardEntity : vvPromoterTradeOrderLineAwardEntityList) {
BigDecimal awardAmount = vvPromoterTradeOrderLineAwardEntity.getAwardAmount();
BigDecimal awardAmountSingle = BigDecimalUtil.divide(awardAmount, new BigDecimal(vvPromoterBuyerList.size()));
VvPromoterTradeOrderLineAwardEntity promoterTradeOrderLineAwardNew = new VvPromoterTradeOrderLineAwardEntity();
BeanUtils.copyProperties(vvPromoterTradeOrderLineAwardEntity, promoterTradeOrderLineAwardNew);
BigDecimal sum = BigDecimal.ZERO;
if (i == vvPromoterBuyerList.size() - 1) { if (i == vvPromoterBuyerList.size() - 1) {
promoterTradeOrderLineAwardNew.setAwardAmount(awardAmount.subtract(sum)); promoterTradeOrderLineAwardNew.setAwardAmount(awardAmount.subtract(sum));
} else { } else {
sum = sum.add(awardAmountSingle); sum = sum.add(awardAmountSingle);
promoterTradeOrderLineAwardNew.setAwardAmount(awardAmountSingle); promoterTradeOrderLineAwardNew.setAwardAmount(awardAmountSingle);
} }
promoterTradeOrderLineAwardNew.setPromoterBuyerId(vvPromoterBuyer.getPromoterBuyerId()); promoterTradeOrderLineAwardNew.setPromoterBuyerId(vvPromoterBuyer.getPromoterBuyerId());
promoterTradeOrderLineAwardNew.setPromoterBuyerName(vvPromoterBuyer.getPromoterBuyerName()); promoterTradeOrderLineAwardNew.setPromoterBuyerName(vvPromoterBuyer.getPromoterBuyerName());
promoterTradeOrderLineAwardNew.setPromoterBuyerPhone(vvPromoterBuyer.getPromoterBuyerPhone()); promoterTradeOrderLineAwardNew.setPromoterBuyerPhone(vvPromoterBuyer.getPromoterBuyerPhone());
promoterTradeOrderLineAwardNew.setPromoterBuyerWeixin(vvPromoterBuyer.getPromoterBuyerWeixin()); promoterTradeOrderLineAwardNew.setPromoterBuyerWeixin(vvPromoterBuyer.getPromoterBuyerWeixin());
vvPromoterTradeOrderLineAwardDao.insertVvPromoterTradeOrderLineAward(promoterTradeOrderLineAwardNew);
tradeOrderAward = tradeOrderAward.add(promoterTradeOrderLineAwardNew.getAwardAmount()); List<VvPromoterTradeOrderLineAwardEntity> list = vvPromoterTradeOrderLineAwardMap.get(vvPromoterBuyer.getPromoterBuyerId());
vvPromoterTradeOrderLineAwardDao.insertVvPromoterTradeOrderLineAward(vvPromoterTradeOrderLineAwardEntity); if(list ==null){
list = new ArrayList<>();
}
list.add(promoterTradeOrderLineAwardNew);
vvPromoterTradeOrderLineAwardMap.put(vvPromoterBuyer.getPromoterBuyerId(), list);
} }
// 更新奖励金额 }
for( Map.Entry<Long,List<VvPromoterTradeOrderLineAwardEntity>> entry:vvPromoterTradeOrderLineAwardMap.entrySet()){
VvPromoterTradeOrderAwardEntity vvPromoterTradeOrderAwardEntity = new VvPromoterTradeOrderAwardEntity();
VvPromoterTradeOrderLineAwardEntity vvPromoterTradeOrderLineAwardIndex_0 = vvPromoterTradeOrderLineAwardEntityList.get(0);
BeanUtils.copyProperties(vvPromoterTradeOrderLineAwardIndex_0, vvPromoterTradeOrderAwardEntity);
List<VvPromoterTradeOrderLineAwardEntity> vvPromoterTradeOrderLineAwardEntities = entry.getValue();
BigDecimal tradeOrderAward = SanUtils.sum(vvPromoterTradeOrderLineAwardEntities,VvPromoterTradeOrderLineAwardEntity::getAwardAmount );
vvPromoterTradeOrderAwardEntity.setAwardAmount(tradeOrderAward); vvPromoterTradeOrderAwardEntity.setAwardAmount(tradeOrderAward);
vvPromoterTradeOrderAwardDao.insertVvPromoterTradeOrderAward(vvPromoterTradeOrderAwardEntity); vvPromoterTradeOrderAwardDao.insertVvPromoterTradeOrderAward(vvPromoterTradeOrderAwardEntity);
} }