瀏覽代碼

fix

release_toaliyun_real
winter 2 年之前
父節點
當前提交
c45230c178
共有 2 個文件被更改,包括 6 次插入8 次删除
  1. +5
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java

+ 5
- 7
mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java 查看文件

@@ -100,22 +100,20 @@ public class WxRaffleActivityRecord extends TenantEntity {
return null; return null;
} }
public List<Long> generateItemIds() {
public void generateItemIds() {
if (null != recordItemList && recordItemList.size() > 0 ) { if (null != recordItemList && recordItemList.size() > 0 ) {
List<Long> itemIdList = new ArrayList<Long>();
recordItemIdList = new ArrayList<Long>();
for (int i = 0 ; i < recordItemList.size() ; i++) { for (int i = 0 ; i < recordItemList.size() ; i++) {
WxRaffleActivityRecordItem ri = recordItemList.get(i); WxRaffleActivityRecordItem ri = recordItemList.get(i);
itemIdList.add(ri.getId());
recordItemIdList.add(ri.getItemId());
} }
return itemIdList;
} }
return null;
} }
public static Map<String,String> generateExcelTitle(Map<Long,WxRaffleActivityItem> itemMap) { public static Map<String,String> generateExcelTitle(Map<Long,WxRaffleActivityItem> itemMap) {
Map<String,String> excelTitle = new LinkedHashMap<String,String>(); Map<String,String> excelTitle = new LinkedHashMap<String,String>();
excelTitle.put("activityName", "活动名称"); excelTitle.put("activityName", "活动名称");
excelTitle.put("merchantId", "商户id");
excelTitle.put("merchantName", "商户名称");
excelTitle.put("orderNo", "订单号"); excelTitle.put("orderNo", "订单号");
excelTitle.put("orderMoney", "订单金额"); excelTitle.put("orderMoney", "订单金额");
excelTitle.put("cusName", "客户姓名"); excelTitle.put("cusName", "客户姓名");
@@ -137,7 +135,7 @@ public class WxRaffleActivityRecord extends TenantEntity {
public Map<String,Object> generateExcelData(Map<Long,WxRaffleActivityItem> itemMap) { public Map<String,Object> generateExcelData(Map<Long,WxRaffleActivityItem> itemMap) {
Map<String,Object> excelObject = new HashMap<String,Object>(); Map<String,Object> excelObject = new HashMap<String,Object>();
excelObject.put("activityName", activityName); excelObject.put("activityName", activityName);
excelObject.put("merchantId", merchantId);
excelObject.put("merchantName", merchantName);
excelObject.put("orderNo", orderNo); excelObject.put("orderNo", orderNo);
excelObject.put("orderMoney", orderMoney); excelObject.put("orderMoney", orderMoney);
excelObject.put("cusName", cusName); excelObject.put("cusName", cusName);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java 查看文件

@@ -186,7 +186,7 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
_r.setItemDetail(_r.generateItemDetaiJson()); _r.setItemDetail(_r.generateItemDetaiJson());
if (null != oneActivityExeclList && null != oneAcitvityId) { if (null != oneActivityExeclList && null != oneAcitvityId) {
_r.setRecordItemIdList(_r.generateItemIds());
_r.generateItemIds();
oneActivityExeclList.add(_r.generateExcelData(itemMap)); oneActivityExeclList.add(_r.generateExcelData(itemMap));
} }
} }


Loading…
取消
儲存