Преглед на файлове

//OfflineActivity

release_toaliyun_real
xiaohu преди 1 година
родител
ревизия
8045f04e96
променени са 3 файла, в които са добавени 36 реда и са изтрити 4 реда
  1. +26
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java
  3. +7
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java

+ 26
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java Целия файл

@@ -1,5 +1,7 @@
package com.iformall.domain.po; 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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -113,6 +115,18 @@ public class WxOfflineActivityGrantAward extends TenantEntity{
*/ */
@TableField(value = "lottery_num") @TableField(value = "lottery_num")
private String lotteryNum; private String lotteryNum;
@TableField(exist = false)
private List<String> lotteryNumList;
public List<String> getLotteryNumList() {
if(StringUtils.isNotBlank(lotteryNum)){
try {
List<String> 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") @TableField(value = "anniversary_lottery_num")
private String anniversaryLotteryNum; private String anniversaryLotteryNum;
@TableField(exist = false)
private List<String> anniversaryLotteryNumList;
public List<String> getAnniversaryLotteryNumList() {
if(StringUtils.isNotBlank(anniversaryLotteryNum)){
try {
List<String> stringList = JSON.parseArray(anniversaryLotteryNum, String.class);
stringList.removeIf(String::isEmpty);
anniversaryLotteryNumList = stringList.isEmpty() ? null : stringList;
}catch(Exception e){}
}
return anniversaryLotteryNumList;
}


@TableField(exist = false) @TableField(exist = false)
private Long recordId; private Long recordId;


+ 3
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java Целия файл

@@ -90,7 +90,9 @@ public class WxOfflineActivityRecord extends TenantEntity {
public List<String> getLotteryNumList() { public List<String> getLotteryNumList() {
if(StringUtils.isNotBlank(lotteryNum)){ if(StringUtils.isNotBlank(lotteryNum)){
try { try {
lotteryNumList = JSON.parseArray(lotteryNum, String.class);
List<String> stringList = JSON.parseArray(lotteryNum, String.class);
stringList.removeIf(String::isEmpty);
lotteryNumList = stringList.isEmpty() ? null : stringList;
}catch(Exception e){} }catch(Exception e){}
} }
return lotteryNumList; return lotteryNumList;


+ 7
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Целия файл

@@ -581,7 +581,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
for (WxOfflineActivityRecord record : recordList) { for (WxOfflineActivityRecord record : recordList) {
merchantOrder.add(record.getOrderNo()+"["+merchantMap.get(record.getMerchantId())+"]"); 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("orderMoneySum",grantAward.getOrderMoneySum());
activityGrantObject.put("cusName",grantAward.getCusName()); activityGrantObject.put("cusName",grantAward.getCusName());
activityGrantObject.put("cusPhone",grantAward.getCusPhone()); 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("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())){ // if(StringUtils.isNotBlank(grantAward.getSignImg())){
// try{ // try{
// activityGrantObject.put("signImg",DownFileUtil.url2byte(grantAward.getSignImg())); // activityGrantObject.put("signImg",DownFileUtil.url2byte(grantAward.getSignImg()));


Зареждане…
Отказ
Запис