| @@ -66,7 +66,7 @@ public class WxVtwoActivityGrantSettlementServiceImpl extends ServiceImpl<WxVtwo | |||||
| if(countGrantAwardList != null && !countGrantAwardList.isEmpty()){ | if(countGrantAwardList != null && !countGrantAwardList.isEmpty()){ | ||||
| handleOrderRatio(cmountOrderList); | handleOrderRatio(cmountOrderList); | ||||
| for (WxVtwoActivityGrantAward grant : countGrantAwardList) { | for (WxVtwoActivityGrantAward grant : countGrantAwardList) { | ||||
| for (WxVtwoActivityOrder order : amountOrderList){ | |||||
| for (WxVtwoActivityOrder order : cmountOrderList){ | |||||
| WxVtwoActivityGrantSettlement settlement = getGrantSettlement(grant,order,idWorker,false); | WxVtwoActivityGrantSettlement settlement = getGrantSettlement(grant,order,idWorker,false); | ||||
| settlementList.add(settlement); | settlementList.add(settlement); | ||||
| } | } | ||||
| @@ -161,7 +161,7 @@ public class WxVtwoActivityGrantSettlementServiceImpl extends ServiceImpl<WxVtwo | |||||
| if(countGrantAwardList != null && !countGrantAwardList.isEmpty()){ | if(countGrantAwardList != null && !countGrantAwardList.isEmpty()){ | ||||
| handleOrderRatio(cmountOrderList); | handleOrderRatio(cmountOrderList); | ||||
| for (WxVtwoCashBackGrantAward grant : countGrantAwardList) { | for (WxVtwoCashBackGrantAward grant : countGrantAwardList) { | ||||
| for (WxVtwoActivityOrder order : amountOrderList){ | |||||
| for (WxVtwoActivityOrder order : cmountOrderList){ | |||||
| WxVtwoActivityGrantSettlement settlement = getGrantSettlement(grant,order,idWorker,false); | WxVtwoActivityGrantSettlement settlement = getGrantSettlement(grant,order,idWorker,false); | ||||
| settlementList.add(settlement); | settlementList.add(settlement); | ||||
| } | } | ||||