diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java index 967af5db7..ef02730a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java @@ -1,5 +1,7 @@ package com.iformall.domain.po; +import com.alibaba.fastjson.JSON; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -113,6 +115,18 @@ public class WxOfflineActivityGrantAward extends TenantEntity{ */ @TableField(value = "lottery_num") private String lotteryNum; + @TableField(exist = false) + private List lotteryNumList; + public List getLotteryNumList() { + if(StringUtils.isNotBlank(lotteryNum)){ + try { + List stringList = JSON.parseArray(lotteryNum, String.class); + stringList.removeIf(String::isEmpty); + lotteryNumList = stringList.isEmpty() ? null : stringList; + }catch(Exception e){} + } + return lotteryNumList; + } /** * 抽奖券数量 @@ -125,6 +139,18 @@ public class WxOfflineActivityGrantAward extends TenantEntity{ */ @TableField(value = "anniversary_lottery_num") private String anniversaryLotteryNum; + @TableField(exist = false) + private List anniversaryLotteryNumList; + public List getAnniversaryLotteryNumList() { + if(StringUtils.isNotBlank(anniversaryLotteryNum)){ + try { + List stringList = JSON.parseArray(anniversaryLotteryNum, String.class); + stringList.removeIf(String::isEmpty); + anniversaryLotteryNumList = stringList.isEmpty() ? null : stringList; + }catch(Exception e){} + } + return anniversaryLotteryNumList; + } @TableField(exist = false) private Long recordId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java index b53e6fbc8..16e97a2bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java @@ -90,7 +90,9 @@ public class WxOfflineActivityRecord extends TenantEntity { public List getLotteryNumList() { if(StringUtils.isNotBlank(lotteryNum)){ try { - lotteryNumList = JSON.parseArray(lotteryNum, String.class); + List stringList = JSON.parseArray(lotteryNum, String.class); + stringList.removeIf(String::isEmpty); + lotteryNumList = stringList.isEmpty() ? null : stringList; }catch(Exception e){} } return lotteryNumList; 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 531a5bdca..38b7f91b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -581,7 +581,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity for (WxOfflineActivityRecord record : recordList) { merchantOrder.add(record.getOrderNo()+"["+merchantMap.get(record.getMerchantId())+"]"); } - activityGrantObject.put("merchantOrder",merchantOrder.stream().collect(joining(";"))); + activityGrantObject.put("merchantOrder", String.join(";", merchantOrder)); activityGrantObject.put("orderMoneySum",grantAward.getOrderMoneySum()); activityGrantObject.put("cusName",grantAward.getCusName()); activityGrantObject.put("cusPhone",grantAward.getCusPhone()); @@ -619,9 +619,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity } } } - activityGrantObject.put("lotteryNum",grantAward.getLotteryNum()); + if(grantAward.getLotteryNumList() != null && !grantAward.getLotteryNumList().isEmpty()){ + activityGrantObject.put("lotteryNum",String.join(";", grantAward.getLotteryNumList())); + } activityGrantObject.put("lotteryCount",grantAward.getLotteryCount()); - activityGrantObject.put("anniversaryLotteryNum",grantAward.getAnniversaryLotteryNum()); + if(grantAward.getAnniversaryLotteryNumList() != null && !grantAward.getAnniversaryLotteryNumList().isEmpty()){ + activityGrantObject.put("anniversaryLotteryNum",String.join(";", grantAward.getAnniversaryLotteryNumList())); + } // if(StringUtils.isNotBlank(grantAward.getSignImg())){ // try{ // activityGrantObject.put("signImg",DownFileUtil.url2byte(grantAward.getSignImg()));