| @@ -742,13 +742,12 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||
| map.put("orderGrantList",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()); | |||
| WxVtwoActivityGrantAward grantAward = orderGrantAward.get(0); | |||
| map.put("awardName_o",grantAward.getAwardName()); | |||
| map.put("awardCount_o",grantAward.getAwardCount()); | |||
| map.put("grantPrice_o",grantAward.getGrantPrice()); | |||
| map.put("mallShareRate_o",grantAward.getMallShareRate()); | |||
| map.put("merchantShareRate_o",grantAward.getMerchantShareRate()); | |||
| List<Map<String,Object>> sharePriceList = new ArrayList<>(); | |||
| @@ -766,20 +765,18 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||
| sharePriceList.add(sharePriceObject); | |||
| }); | |||
| map.put("sharePriceList_o"+i,sharePriceList); | |||
| } | |||
| } | |||
| map.put("sharePriceList_o",sharePriceList); | |||
| } | |||
| } | |||
| List<WxVtwoActivityGrantAward> 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()); | |||
| WxVtwoActivityGrantAward jointOne = jointGrantAward.get(0); | |||
| map.put("awardName_c",jointOne.getAwardName()); | |||
| map.put("awardCount_c",jointOne.getAwardCount()); | |||
| map.put("grantPrice_c",jointOne.getGrantPrice()); | |||
| map.put("mallShareRate_c",jointOne.getMallShareRate()); | |||
| map.put("merchantShareRate_c",jointOne.getMerchantShareRate()); | |||
| List<Map<String,Object>> jointSharePriceList = new ArrayList<>(); | |||
| @@ -797,8 +794,7 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||
| jointSharePriceList.add(jointSharePriceObject); | |||
| }); | |||
| map.put("sharePriceList_c"+j,jointSharePriceList); | |||
| } | |||
| map.put("sharePriceList_c",jointSharePriceList); | |||
| } | |||
| return map; | |||