diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java index 725e9750c..03c860fac 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java @@ -19,7 +19,7 @@ public interface WxVtwoActivityGrantOrderMapper extends CommonMapper findOrderNoList(@Param("grantId")Long grantId, @Param("tenantId")String tenantId); - List findIdList(WxVtwoActivityGrantOrder grantOrderQ); + List findOrderIdList(WxVtwoActivityGrantOrder grantOrderQ); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java index f8593140b..9daa1de01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java @@ -64,7 +64,9 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl { orderGrantAward.setGrantSettlementList(grantSettlementMap.get(orderGrantAward.getId())); }); + wxVtwoActivityGrantExportTwo.setOrderGrantDetail(JSONObject.toJSONString(orderGrantAwardList)); } + List jointGrantAwardList = grantAwardMap.get(EnumOfflineActivityAwardsModeType.COUNT.getCode()); Integer jointGrantCount = 0; if (jointGrantAwardList != null && !jointGrantAwardList.isEmpty()){ @@ -72,11 +74,11 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl { jointGrantAward.setGrantSettlementList(grantSettlementMap.get(jointGrantAward.getId())); }); + wxVtwoActivityGrantExportTwo.setJointGrantDetail(JSONObject.toJSONString(jointGrantAwardList)); } - wxVtwoActivityGrantExportTwo.setOrderGrantDetail(JSONObject.toJSONString(orderGrantAwardList)); + wxVtwoActivityGrantExportTwo.setOrderGrantCount(orderGrantCount); - wxVtwoActivityGrantExportTwo.setJointGrantDetail(JSONObject.toJSONString(jointGrantAwardList)); wxVtwoActivityGrantExportTwo.setJointGrantCount(jointGrantCount); wxVtwoActivityGrantExportTwoMapper.insert(wxVtwoActivityGrantExportTwo); } @@ -147,6 +149,7 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl orderIds = wxVtwoActivityGrantOrderMapper.findIdList(grantOrderQ); + List orderIds = wxVtwoActivityGrantOrderMapper.findOrderIdList(grantOrderQ); Map auditDetailMap = wxVtwoActivityOrderService.findAuditDetailMap(orderIds,tenantId); for(WxVtwoActivityGrantExportTwo export : exportList){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java index 594c9b3a3..9d0b18c2a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java @@ -473,7 +473,7 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl entity20_c_list = new ArrayList<>(); ExcelExportEntity entity20_c_1 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); entity20_c_list.add(entity20_c_1); @@ -494,73 +494,77 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl orderGrantAward = JSONObject.parseArray(e.getOrderGrantDetail(), WxVtwoActivityGrantAward.class); - if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ - Map orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoActivityGrantAward::getOrderId, Function.identity())); - List sortList = new ArrayList<>(); - e.getOrderList().forEach(order -> { - WxVtwoActivityGrantAward grantAward = orderGrantAwardMap.get(order.getId()); - if(grantAward != null){ - WxVtwoActivityGrantSettlement grantSettlement = grantAward.getGrantSettlementList().get(0); - grantAward.setMallSharePrice(grantSettlement.getOrderMallSharePrice()); - grantAward.setMerchantSharePrice(grantSettlement.getOrderMerchantSharePrice()); - sortList.add(grantAward); - } else{ - sortList.add(new WxVtwoActivityGrantAward()); - } - }); + if(orderGrantAward != null && !orderGrantAward.isEmpty()){ + if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ + Map orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoActivityGrantAward::getOrderId, Function.identity())); + List sortList = new ArrayList<>(); + e.getOrderList().forEach(order -> { + WxVtwoActivityGrantAward grantAward = orderGrantAwardMap.get(order.getId()); + if(grantAward != null){ + WxVtwoActivityGrantSettlement grantSettlement = grantAward.getGrantSettlementList().get(0); + grantAward.setMallSharePrice(grantSettlement.getOrderMallSharePrice()); + grantAward.setMerchantSharePrice(grantSettlement.getOrderMerchantSharePrice()); + sortList.add(grantAward); + } else{ + sortList.add(new WxVtwoActivityGrantAward()); + } + }); + + map.put("orderGrantList",sortList); - map.put("orderGrantList",sortList); + }else{ + WxVtwoActivityGrantAward one = orderGrantAward.get(0); + map.put("awardName_o",one.getAwardName()); + map.put("grantPrice_o",one.getGrantPrice()); + map.put("mallShareRate_o",one.getMallShareRate()); + map.put("merchantShareRate_o",one.getMerchantShareRate()); + + List> sharePriceList = new ArrayList<>(); + + Map grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); + e.getOrderList().forEach(order -> { + WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); + Map sharePriceObject = new HashMap<>(); + if(grantSettlement != null){ + sharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); + sharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); + }else{ + sharePriceObject.put("mallSharePrice",0); + sharePriceObject.put("merchantSharePrice",0); + } + sharePriceList.add(sharePriceObject); + }); + + map.put("sharePriceList_o",sharePriceList); + } + } - }else{ - WxVtwoActivityGrantAward one = orderGrantAward.get(0); - map.put("awardName_o",one.getAwardName()); - map.put("grantPrice_o",one.getGrantPrice()); - map.put("mallShareRate_o",one.getMallShareRate()); - map.put("merchantShareRate_o",one.getMerchantShareRate()); + List jointGrantAward = JSONObject.parseArray(e.getJointGrantDetail(), WxVtwoActivityGrantAward.class); + if(jointGrantAward != null && !jointGrantAward.isEmpty()){ + WxVtwoActivityGrantAward jointOne = jointGrantAward.get(0); + map.put("awardName_c",jointOne.getAwardName()); + map.put("grantPrice_c",jointOne.getGrantPrice()); + map.put("mallShareRate_c",jointOne.getMallShareRate()); + map.put("merchantShareRate_c",jointOne.getMerchantShareRate()); - List> sharePriceList = new ArrayList<>(); + List> jointSharePriceList = new ArrayList<>(); - Map grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); + Map grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); e.getOrderList().forEach(order -> { WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); - Map sharePriceObject = new HashMap<>(); + Map jointSharePriceObject = new HashMap<>(); if(grantSettlement != null){ - sharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); - sharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); + jointSharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); + jointSharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); }else{ - sharePriceObject.put("mallSharePrice",0); - sharePriceObject.put("merchantSharePrice",0); + jointSharePriceObject.put("mallSharePrice",0); + jointSharePriceObject.put("merchantSharePrice",0); } - sharePriceList.add(sharePriceObject); + jointSharePriceList.add(jointSharePriceObject); }); - map.put("sharePriceList_o",sharePriceList); + map.put("sharePriceList_c",jointSharePriceList); } - - List jointGrantAward = JSONObject.parseArray(e.getJointGrantDetail(), WxVtwoActivityGrantAward.class); - WxVtwoActivityGrantAward jointOne = jointGrantAward.get(0); - map.put("awardName_c",jointOne.getAwardName()); - map.put("grantPrice_c",jointOne.getGrantPrice()); - map.put("mallShareRate_c",jointOne.getMallShareRate()); - map.put("merchantShareRate_c",jointOne.getMerchantShareRate()); - - List> jointSharePriceList = new ArrayList<>(); - - Map grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); - e.getOrderList().forEach(order -> { - WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); - Map jointSharePriceObject = new HashMap<>(); - if(grantSettlement != null){ - jointSharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); - jointSharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); - }else{ - jointSharePriceObject.put("mallSharePrice",0); - jointSharePriceObject.put("merchantSharePrice",0); - } - jointSharePriceList.add(jointSharePriceObject); - }); - - map.put("sharePriceList_c",jointSharePriceList); return map; }).collect(toList()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java index b860793bd..79f9d00cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java @@ -433,7 +433,7 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl entity20_c_list = new ArrayList<>(); ExcelExportEntity entity20_c_1 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); entity20_c_list.add(entity20_c_1); @@ -480,78 +480,82 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl orderGrantAward = JSONObject.parseArray(e.getOrderGrantDetail(), WxVtwoCashBackGrantAward.class); - if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ - Map orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoCashBackGrantAward::getOrderId, Function.identity())); - List sortList = new ArrayList<>(); - e.getOrderList().forEach(order -> { - WxVtwoCashBackGrantAward grantAward = orderGrantAwardMap.get(order.getId()); - if(grantAward != null){ - WxVtwoActivityGrantSettlement grantSettlement = grantAward.getGrantSettlementList().get(0); - grantAward.setMallSharePrice(grantSettlement.getOrderMallSharePrice()); - grantAward.setMerchantSharePrice(grantSettlement.getOrderMerchantSharePrice()); - grantAward.setTaxAmount(grantSettlement.getTaxAmount()); - sortList.add(grantAward); - } else{ - sortList.add(new WxVtwoCashBackGrantAward()); - } - }); + if(orderGrantAward != null && !orderGrantAward.isEmpty()){ + if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ + Map orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoCashBackGrantAward::getOrderId, Function.identity())); + List sortList = new ArrayList<>(); + e.getOrderList().forEach(order -> { + WxVtwoCashBackGrantAward grantAward = orderGrantAwardMap.get(order.getId()); + if(grantAward != null){ + WxVtwoActivityGrantSettlement grantSettlement = grantAward.getGrantSettlementList().get(0); + grantAward.setMallSharePrice(grantSettlement.getOrderMallSharePrice()); + grantAward.setMerchantSharePrice(grantSettlement.getOrderMerchantSharePrice()); + grantAward.setTaxAmount(grantSettlement.getTaxAmount()); + sortList.add(grantAward); + } else{ + sortList.add(new WxVtwoCashBackGrantAward()); + } + }); + + map.put("orderGrantList",sortList); - map.put("orderGrantList",sortList); + }else{ + WxVtwoCashBackGrantAward one = orderGrantAward.get(0); + map.put("awardName_o",one.getAwardName()); + map.put("cashBackRatio_o",one.getCashBackRatio()); + map.put("cashBack_o",one.getCashBack()); + map.put("mallShareRate_o",one.getMallShareRate()); + map.put("merchantShareRate_o",one.getMerchantShareRate()); + + List> sharePriceList = new ArrayList<>(); + + Map grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); + e.getOrderList().forEach(order -> { + WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); + Map sharePriceObject = new HashMap<>(); + if(grantSettlement != null){ + sharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); + sharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); + }else{ + sharePriceObject.put("mallSharePrice",0); + sharePriceObject.put("merchantSharePrice",0); + } + sharePriceList.add(sharePriceObject); + }); + + map.put("sharePriceList_o",sharePriceList); + } + } - }else{ - WxVtwoCashBackGrantAward one = orderGrantAward.get(0); - map.put("awardName_o",one.getAwardName()); - map.put("cashBackRatio_o",one.getCashBackRatio()); - map.put("cashBack_o",one.getCashBack()); - map.put("mallShareRate_o",one.getMallShareRate()); - map.put("merchantShareRate_o",one.getMerchantShareRate()); + List jointGrantAward = JSONObject.parseArray(e.getJointGrantDetail(), WxVtwoCashBackGrantAward.class); + if(jointGrantAward != null && !jointGrantAward.isEmpty()){ + WxVtwoCashBackGrantAward jointOne = jointGrantAward.get(0); + map.put("awardName_c",jointOne.getAwardName()); + map.put("cashBackRatio_c",jointOne.getCashBackRatio()); + map.put("cashBack_c",jointOne.getCashBack()); + map.put("mallShareRate_c",jointOne.getMallShareRate()); + map.put("merchantShareRate_c",jointOne.getMerchantShareRate()); - List> sharePriceList = new ArrayList<>(); + List> jointSharePriceList = new ArrayList<>(); - Map grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); + Map grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); e.getOrderList().forEach(order -> { WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); - Map sharePriceObject = new HashMap<>(); + Map jointSharePriceObject = new HashMap<>(); if(grantSettlement != null){ - sharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); - sharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); + jointSharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); + jointSharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); }else{ - sharePriceObject.put("mallSharePrice",0); - sharePriceObject.put("merchantSharePrice",0); + jointSharePriceObject.put("mallSharePrice",0); + jointSharePriceObject.put("merchantSharePrice",0); } - sharePriceList.add(sharePriceObject); + jointSharePriceList.add(jointSharePriceObject); }); - map.put("sharePriceList_o",sharePriceList); - } - - List jointGrantAward = JSONObject.parseArray(e.getJointGrantDetail(), WxVtwoCashBackGrantAward.class); - WxVtwoCashBackGrantAward jointOne = jointGrantAward.get(0); - map.put("awardName_c",jointOne.getAwardName()); - map.put("cashBackRatio_c",jointOne.getCashBackRatio()); - map.put("cashBack_c",jointOne.getCashBack()); - map.put("mallShareRate_c",jointOne.getMallShareRate()); - map.put("merchantShareRate_c",jointOne.getMerchantShareRate()); - - List> jointSharePriceList = new ArrayList<>(); - - Map grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); - e.getOrderList().forEach(order -> { - WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); - Map jointSharePriceObject = new HashMap<>(); - if(grantSettlement != null){ - jointSharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); - jointSharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); - }else{ - jointSharePriceObject.put("mallSharePrice",0); - jointSharePriceObject.put("merchantSharePrice",0); + map.put("sharePriceList_c",jointSharePriceList); + if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ + map.put("taxAmount_c",jointOne.getTaxAmount()); } - jointSharePriceList.add(jointSharePriceObject); - }); - - map.put("sharePriceList_c",jointSharePriceList); - if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ - map.put("taxAmount_c",jointOne.getTaxAmount()); } return map; }).collect(toList()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java index 41a2975c4..6c94de2c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java @@ -502,7 +502,7 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl entity20_c_list = new ArrayList<>(); ExcelExportEntity entity20_c_1 = new ExcelExportEntity("商管承担金额","mallSharePrice",20); entity20_c_list.add(entity20_c_1); @@ -523,86 +523,91 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl orderGrantAward = JSONObject.parseArray(e.getOrderGrantDetail(), WxVtwoActivityGrantAward.class); - if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ - Map> orderGrantAwardMap = orderGrantAward.stream().collect(groupingBy(WxVtwoActivityGrantAward::getOrderId)); - for(int i=1;i<=orderGrantCount;i++){ - List sortList = new ArrayList<>(); - int finalI = i-1; - e.getOrderList().forEach(order -> { - List grantAwardList = orderGrantAwardMap.get(order.getId()); - WxVtwoActivityGrantAward grantAward = null; - if(grantAwardList != null && !grantAwardList.isEmpty() && grantAwardList.size() <= finalI){ - grantAward = grantAwardList.get(finalI); - } - if(grantAward != null){ - WxVtwoActivityGrantSettlement grantSettlement = grantAward.getGrantSettlementList().get(0); - grantAward.setMallSharePrice(grantSettlement.getOrderMallSharePrice()); - grantAward.setMerchantSharePrice(grantSettlement.getOrderMerchantSharePrice()); - sortList.add(grantAward); - } else{ - sortList.add(new WxVtwoActivityGrantAward()); - } - }); + if(orderGrantAward != null && !orderGrantAward.isEmpty()){ + if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){ + Map> orderGrantAwardMap = orderGrantAward.stream().collect(groupingBy(WxVtwoActivityGrantAward::getOrderId)); + for(int i=1;i<=orderGrantCount;i++){ + List sortList = new ArrayList<>(); + int finalI = i-1; + e.getOrderList().forEach(order -> { + List grantAwardList = orderGrantAwardMap.get(order.getId()); + WxVtwoActivityGrantAward grantAward = null; + if(grantAwardList != null && !grantAwardList.isEmpty() && grantAwardList.size() <= finalI){ + grantAward = grantAwardList.get(finalI); + } + if(grantAward != null){ + WxVtwoActivityGrantSettlement grantSettlement = grantAward.getGrantSettlementList().get(0); + grantAward.setMallSharePrice(grantSettlement.getOrderMallSharePrice()); + grantAward.setMerchantSharePrice(grantSettlement.getOrderMerchantSharePrice()); + sortList.add(grantAward); + } else{ + sortList.add(new WxVtwoActivityGrantAward()); + } + }); + + map.put("orderGrantList"+i,sortList); + } - map.put("orderGrantList"+i,sortList); + }else{ + for(int i=1;i<=orderGrantAward.size();i++){ + WxVtwoActivityGrantAward grantAward = orderGrantAward.get(i - 1); + map.put("awardName_o"+i,grantAward.getAwardName()); + map.put("awardCount_o"+i,grantAward.getAwardCount()); + map.put("grantPrice_o"+i,grantAward.getGrantPrice()); + map.put("mallShareRate_o"+i,grantAward.getMallShareRate()); + map.put("merchantShareRate_o"+i,grantAward.getMerchantShareRate()); + + List> sharePriceList = new ArrayList<>(); + + Map grantSettlementMap = grantAward.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); + e.getOrderList().forEach(order -> { + WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); + Map sharePriceObject = new HashMap<>(); + if(grantSettlement != null){ + sharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); + sharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); + }else{ + sharePriceObject.put("mallSharePrice",0); + sharePriceObject.put("merchantSharePrice",0); + } + sharePriceList.add(sharePriceObject); + }); + + map.put("sharePriceList_o"+i,sharePriceList); + } } + } - }else{ - for(int i=1;i<=orderGrantAward.size();i++){ - WxVtwoActivityGrantAward grantAward = orderGrantAward.get(i - 1); - map.put("awardName_o"+i,grantAward.getAwardName()); - map.put("awardCount_o"+i,grantAward.getAwardCount()); - map.put("grantPrice_o"+i,grantAward.getGrantPrice()); - map.put("mallShareRate_o"+i,grantAward.getMallShareRate()); - map.put("merchantShareRate_o"+i,grantAward.getMerchantShareRate()); - - List> sharePriceList = new ArrayList<>(); - - Map grantSettlementMap = grantAward.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); + List jointGrantAward = JSONObject.parseArray(e.getJointGrantDetail(), WxVtwoActivityGrantAward.class); + if(jointGrantAward != null && !jointGrantAward.isEmpty()){ + for(int j=1;j<=jointGrantAward.size();j++){ + WxVtwoActivityGrantAward jointOne = jointGrantAward.get(j-1); + map.put("awardName_c"+j,jointOne.getAwardName()); + map.put("awardCount_c"+j,jointOne.getAwardCount()); + map.put("grantPrice_c"+j,jointOne.getGrantPrice()); + map.put("mallShareRate_c"+j,jointOne.getMallShareRate()); + map.put("merchantShareRate_c"+j,jointOne.getMerchantShareRate()); + + List> jointSharePriceList = new ArrayList<>(); + + Map grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); e.getOrderList().forEach(order -> { WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); - Map sharePriceObject = new HashMap<>(); + Map jointSharePriceObject = new HashMap<>(); if(grantSettlement != null){ - sharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); - sharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); + jointSharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); + jointSharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); }else{ - sharePriceObject.put("mallSharePrice",0); - sharePriceObject.put("merchantSharePrice",0); + jointSharePriceObject.put("mallSharePrice",0); + jointSharePriceObject.put("merchantSharePrice",0); } - sharePriceList.add(sharePriceObject); + jointSharePriceList.add(jointSharePriceObject); }); - map.put("sharePriceList_o"+i,sharePriceList); + map.put("sharePriceList_c"+j,jointSharePriceList); } } - List jointGrantAward = JSONObject.parseArray(e.getJointGrantDetail(), WxVtwoActivityGrantAward.class); - for(int j=1;j<=jointGrantAward.size();j++){ - WxVtwoActivityGrantAward jointOne = jointGrantAward.get(j-1); - map.put("awardName_c"+j,jointOne.getAwardName()); - map.put("awardCount_c"+j,jointOne.getAwardCount()); - map.put("grantPrice_c"+j,jointOne.getGrantPrice()); - map.put("mallShareRate_c"+j,jointOne.getMallShareRate()); - map.put("merchantShareRate_c"+j,jointOne.getMerchantShareRate()); - - List> jointSharePriceList = new ArrayList<>(); - - Map grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity())); - e.getOrderList().forEach(order -> { - WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId()); - Map jointSharePriceObject = new HashMap<>(); - if(grantSettlement != null){ - jointSharePriceObject.put("mallSharePrice",grantSettlement.getOrderMallSharePrice()); - jointSharePriceObject.put("merchantSharePrice",grantSettlement.getOrderMerchantSharePrice()); - }else{ - jointSharePriceObject.put("mallSharePrice",0); - jointSharePriceObject.put("merchantSharePrice",0); - } - jointSharePriceList.add(jointSharePriceObject); - }); - - map.put("sharePriceList_c"+j,jointSharePriceList); - } return map; }).collect(toList()); } diff --git a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml index d0b86bd94..d8a5c1432 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml @@ -71,8 +71,8 @@ select from wx_vtwo_activity_grant_order where id = #{id} and tenant_id=#{tenantId} - + select order_id from wx_vtwo_activity_grant_order