Explorar el Código

//activity v.2

release_toaliyun_real
xiaohu hace 1 año
padre
commit
85d9781fb3
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantSettlementServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantSettlementServiceImpl.java Ver fichero

@@ -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);
} }


Cargando…
Cancelar
Guardar