소스 검색

fix

release_toaliyun_real
winter 2 년 전
부모
커밋
b0c11789e1
1개의 변경된 파일12개의 추가작업 그리고 7개의 파일을 삭제
  1. +12
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java

+ 12
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java 파일 보기

@@ -473,13 +473,15 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
final IdWorker idWorker = IdWorker.get();
for (int i = 0 ;i < record.getRecordItemList().size() ; i ++) {
WxRaffleActivityRecordItem _ri = record.getRecordItemList().get(i);
_ri.setId(idWorker.nextId());
_ri.setActivityId(r.getActivityId());
_ri.setMerchantId(r.getMerchantId());
_ri.setRecordId(r.getId());
_ri.updateTenantInfo(r);
calcuteMoney(_ri);
wxActivityRecordItemMapper.insert(_ri);
if (null != ri.getItemId()) {
_ri.setId(idWorker.nextId());
_ri.setActivityId(r.getActivityId());
_ri.setMerchantId(r.getMerchantId());
_ri.setRecordId(r.getId());
_ri.updateTenantInfo(r);
calcuteMoney(_ri);
wxActivityRecordItemMapper.insert(_ri);
}
}
}
}
@@ -491,6 +493,9 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
record.setCashMoney(item.getTotalMoney().setScale(3,BigDecimal.ROUND_HALF_UP));
record.setMallRate(item.getMallBackRate());
record.setMerchantRate(item.getMerchantBackRate());
if (null == record.getItemSize()) {
record.setItemSize(1);
}
if (moneyRule == EnumCashBackActivityItemRule.MALL_ONLY) {
record.setMallCashMoney(record.getCashMoney().multiply(new BigDecimal(record.getItemSize())));
record.setMerchantCashMoney(new BigDecimal(0));


불러오는 중...
취소
저장