From 3973f4160ee8e94d1fa696a63ad66cf8f273852c Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Tue, 29 Apr 2025 21:23:30 +0800 Subject: [PATCH] //item export bug --- ...xOfflineActivityGrantAwardServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 76b2b01d7..7d2c6aa27 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -2079,13 +2079,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity exportHead.add(entity_3); ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice_"+i,20); exportHead.add(entity_3_); - ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate_"+i,20); + ExcelExportEntity entity_4 = new ExcelExportEntity("商管承担比例(%)","mallShareRate_"+i,20); exportHead.add(entity_4); - ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate_"+i,20); + ExcelExportEntity entity_5 = new ExcelExportEntity("商户承担比例(%)","merchantShareRate_"+i,20); exportHead.add(entity_5); - ExcelExportEntity entity_6 = new ExcelExportEntity("商户承担金额","realMallSharePrice_"+i,20); + ExcelExportEntity entity_6 = new ExcelExportEntity("商管承担金额","realMallSharePrice_"+i,20); exportHead.add(entity_6); - ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice_"+i,20); + ExcelExportEntity entity_7 = new ExcelExportEntity("商户承担金额","realMerchantSharePrice_"+i,20); exportHead.add(entity_7); } @@ -2310,13 +2310,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity headList.add(entity_3); ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担价值","realGrantPrice",20); headList.add(entity_3_); - ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); + ExcelExportEntity entity_4 = new ExcelExportEntity("商管承担比例(%)","mallShareRate",20); headList.add(entity_4); - ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); + ExcelExportEntity entity_5 = new ExcelExportEntity("商户承担比例(%)","merchantShareRate",20); headList.add(entity_5); - ExcelExportEntity entity_6 = new ExcelExportEntity("商户承担金额","realMallSharePrice",20); + ExcelExportEntity entity_6 = new ExcelExportEntity("商管承担金额","realMallSharePrice",20); headList.add(entity_6); - ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice",20); + ExcelExportEntity entity_7 = new ExcelExportEntity("商户承担金额","realMerchantSharePrice",20); headList.add(entity_7); }else if(EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())){ @@ -2331,13 +2331,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity headList.add(entity_3); ExcelExportEntity entity_3_ = new ExcelExportEntity("实际承担金额","realGrantPrice",20); headList.add(entity_3_); - ExcelExportEntity entity_4 = new ExcelExportEntity("商户承担比例(%)","mallShareRate",20); + ExcelExportEntity entity_4 = new ExcelExportEntity("商管承担比例(%)","mallShareRate",20); headList.add(entity_4); - ExcelExportEntity entity_5 = new ExcelExportEntity("商管承担比例(%)","merchantShareRate",20); + ExcelExportEntity entity_5 = new ExcelExportEntity("商户承担比例(%)","merchantShareRate",20); headList.add(entity_5); - ExcelExportEntity entity_6 = new ExcelExportEntity("商户承担金额","realMallSharePrice",20); + ExcelExportEntity entity_6 = new ExcelExportEntity("商管承担金额","realMallSharePrice",20); headList.add(entity_6); - ExcelExportEntity entity_7 = new ExcelExportEntity("商管承担金额","realMerchantSharePrice",20); + ExcelExportEntity entity_7 = new ExcelExportEntity("商户承担金额","realMerchantSharePrice",20); headList.add(entity_7); if(EnumOfflineActivityMode.ONE.getCode().equals(activityItem.getModeType())){ ExcelExportEntity entity_8 = new ExcelExportEntity("税点金额起点","startingTaxPoint",20);