Просмотр исходного кода

//activity v.

release_toaliyun_real
xiaohu 9 месяцев назад
Родитель
Сommit
1b8545f9ac
6 измененных файлов: 209 добавлений и 193 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java
  2. +8
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java
  3. +60
    -56
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java
  4. +65
    -61
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java
  5. +73
    -68
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java
  6. +2
    -2
      mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxVtwoActivityGrantOrderMapper.java Просмотреть файл

@@ -19,7 +19,7 @@ public interface WxVtwoActivityGrantOrderMapper extends CommonMapper<WxVtwoActiv

List<WxVtwoActivityGrantOrder> findOrderNoList(@Param("grantId")Long grantId, @Param("tenantId")String tenantId);

List<Long> findIdList(WxVtwoActivityGrantOrder grantOrderQ);
List<Long> findOrderIdList(WxVtwoActivityGrantOrder grantOrderQ);
}




+ 8
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantExportTwoServiceImpl.java Просмотреть файл

@@ -64,7 +64,9 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl<WxVtwoA
orderGrantAwardList.forEach(orderGrantAward -> {
orderGrantAward.setGrantSettlementList(grantSettlementMap.get(orderGrantAward.getId()));
});
wxVtwoActivityGrantExportTwo.setOrderGrantDetail(JSONObject.toJSONString(orderGrantAwardList));
}

List<WxVtwoActivityGrantAward> jointGrantAwardList = grantAwardMap.get(EnumOfflineActivityAwardsModeType.COUNT.getCode());
Integer jointGrantCount = 0;
if (jointGrantAwardList != null && !jointGrantAwardList.isEmpty()){
@@ -72,11 +74,11 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl<WxVtwoA
jointGrantAwardList.forEach(jointGrantAward -> {
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<WxVtwoA
entity7.setNeedMerge(true);
headList.add(entity7);
ExcelExportEntity entity8 = new ExcelExportEntity("发奖时间","grantTime",20);
entity8.setFormat("yyyy-MM-dd HH:mm:ss");
entity8.setNeedMerge(true);
headList.add(entity8);
ExcelExportEntity entity9 = new ExcelExportEntity("抽奖券编码","lotteryNum",20);
@@ -165,7 +168,7 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl<WxVtwoA
entity12.setNeedMerge(true);
headList.add(entity12);
ExcelExportEntity entity13 = new ExcelExportEntity("发奖备注","remark",20);
entity11.setNeedMerge(true);
entity13.setNeedMerge(true);
headList.add(entity13);

//订单
@@ -191,7 +194,7 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl<WxVtwoA
entity20_list.add(entity20_8_);
ExcelExportEntity entity20_9 = new ExcelExportEntity("商户名称","merchantName",20);
entity20_list.add(entity20_9);
ExcelExportEntity entity20_10 = new ExcelExportEntity("铺位号","merchantShopNum",20);
ExcelExportEntity entity20_10 = new ExcelExportEntity("铺位号","shopNumber",20);
entity20_list.add(entity20_10);
ExcelExportEntity entity20_11 = new ExcelExportEntity("业态","businessName",20);
entity20_list.add(entity20_11);
@@ -230,7 +233,7 @@ public class WxVtwoActivityGrantExportTwoServiceImpl extends ServiceImpl<WxVtwoA
WxVtwoActivityGrantOrder grantOrderQ = new WxVtwoActivityGrantOrder();
exportQ.setTenantId(tenantId);
exportQ.setActivityId(activityId);
List<Long> orderIds = wxVtwoActivityGrantOrderMapper.findIdList(grantOrderQ);
List<Long> orderIds = wxVtwoActivityGrantOrderMapper.findOrderIdList(grantOrderQ);

Map<Long,WxVtwoActivityOrder> auditDetailMap = wxVtwoActivityOrderService.findAuditDetailMap(orderIds,tenantId);
for(WxVtwoActivityGrantExportTwo export : exportList){


+ 60
- 56
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java Просмотреть файл

@@ -473,7 +473,7 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun
headList.add(entity19_c);

ExcelExportEntity entity20_c = new ExcelExportEntity(null,
"_sharePriceList_c",40);
"sharePriceList_c",40);
List<ExcelExportEntity> 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<WxVtwoAmoun
}

List<WxVtwoActivityGrantAward> orderGrantAward = JSONObject.parseArray(e.getOrderGrantDetail(), WxVtwoActivityGrantAward.class);
if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){
Map<Long, WxVtwoActivityGrantAward> orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoActivityGrantAward::getOrderId, Function.identity()));
List<WxVtwoActivityGrantAward> 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<Long, WxVtwoActivityGrantAward> orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoActivityGrantAward::getOrderId, Function.identity()));
List<WxVtwoActivityGrantAward> 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<Map<String,Object>> sharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> 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<WxVtwoActivityGrantAward> 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<Map<String,Object>> sharePriceList = new ArrayList<>();
List<Map<String,Object>> jointSharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> sharePriceObject = new HashMap<>();
Map<String,Object> 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<WxVtwoActivityGrantAward> 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<Map<String,Object>> jointSharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> 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());
}


+ 65
- 61
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java Просмотреть файл

@@ -433,7 +433,7 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl<WxVtwoCashBac
headList.add(entity19_c);

ExcelExportEntity entity20_c = new ExcelExportEntity(null,
"_sharePriceList_c",40);
"sharePriceList_c",40);
List<ExcelExportEntity> 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<WxVtwoCashBac
}

List<WxVtwoCashBackGrantAward> orderGrantAward = JSONObject.parseArray(e.getOrderGrantDetail(), WxVtwoCashBackGrantAward.class);
if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){
Map<Long, WxVtwoCashBackGrantAward> orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoCashBackGrantAward::getOrderId, Function.identity()));
List<WxVtwoCashBackGrantAward> 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<Long, WxVtwoCashBackGrantAward> orderGrantAwardMap = orderGrantAward.stream().collect(toMap(WxVtwoCashBackGrantAward::getOrderId, Function.identity()));
List<WxVtwoCashBackGrantAward> 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<Map<String,Object>> sharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> 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<WxVtwoCashBackGrantAward> 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<Map<String,Object>> sharePriceList = new ArrayList<>();
List<Map<String,Object>> jointSharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = one.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> sharePriceObject = new HashMap<>();
Map<String,Object> 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<WxVtwoCashBackGrantAward> 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<Map<String,Object>> jointSharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> 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());


+ 73
- 68
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java Просмотреть файл

@@ -502,7 +502,7 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD
headList.add(entity19_c);

ExcelExportEntity entity20_c = new ExcelExportEntity(null,
"_sharePriceList_c"+j,40);
"sharePriceList_c"+j,40);
List<ExcelExportEntity> 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<WxVtwoPrizeD
}

List<WxVtwoActivityGrantAward> orderGrantAward = JSONObject.parseArray(e.getOrderGrantDetail(), WxVtwoActivityGrantAward.class);
if(EnumOfflineActivityMode.ONE.getCode().equals(activity.getAmountModel())){
Map<Long, List<WxVtwoActivityGrantAward>> orderGrantAwardMap = orderGrantAward.stream().collect(groupingBy(WxVtwoActivityGrantAward::getOrderId));
for(int i=1;i<=orderGrantCount;i++){
List<WxVtwoActivityGrantAward> sortList = new ArrayList<>();
int finalI = i-1;
e.getOrderList().forEach(order -> {
List<WxVtwoActivityGrantAward> 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<Long, List<WxVtwoActivityGrantAward>> orderGrantAwardMap = orderGrantAward.stream().collect(groupingBy(WxVtwoActivityGrantAward::getOrderId));
for(int i=1;i<=orderGrantCount;i++){
List<WxVtwoActivityGrantAward> sortList = new ArrayList<>();
int finalI = i-1;
e.getOrderList().forEach(order -> {
List<WxVtwoActivityGrantAward> 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<Map<String,Object>> sharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = grantAward.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> 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<Map<String,Object>> sharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = grantAward.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
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());

List<Map<String,Object>> jointSharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> sharePriceObject = new HashMap<>();
Map<String,Object> 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<WxVtwoActivityGrantAward> 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<Map<String,Object>> jointSharePriceList = new ArrayList<>();

Map<Long, WxVtwoActivityGrantSettlement> grantSettlementMap = jointOne.getGrantSettlementList().stream().collect(toMap(WxVtwoActivityGrantSettlement::getOrderId, Function.identity()));
e.getOrderList().forEach(order -> {
WxVtwoActivityGrantSettlement grantSettlement = grantSettlementMap.get(order.getId());
Map<String,Object> 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());
}


+ 2
- 2
mallinkService/src/main/resources/mapper/WxVtwoActivityGrantOrderMapper.xml Просмотреть файл

@@ -71,8 +71,8 @@
select <include refid="allColumns" /> from wx_vtwo_activity_grant_order
where id = #{id} and tenant_id=#{tenantId}
</select>
<select id="findIdList" parameterType="com.iformall.domain.po.WxVtwoActivityGrantOrder" resultType="java.lang.Long">
select id from wx_vtwo_activity_grant_order
<select id="findOrderIdList" parameterType="com.iformall.domain.po.WxVtwoActivityGrantOrder" resultType="java.lang.Long">
select order_id from wx_vtwo_activity_grant_order
<include refid="dynamicWhereConditions" />
</select>



Загрузка…
Отмена
Сохранить