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

Merge branch 'release_toaliyun_real_offline_activity' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_offline_activity

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
7368e1e44f
4 измененных файлов: 48 добавлений и 16 удалений
  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. +17
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java

+ 26
- 0
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<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")
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)
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() {
if(StringUtils.isNotBlank(lotteryNum)){
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){}
}
return lotteryNumList;


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

@@ -237,7 +237,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
grantItem.setMoneyRule(grantAwardsItem.getMoneyRule());
grantItem.setMallShareRate(grantAwardsItem.getMallShareRate());
grantItem.setMerchantShareRate(grantAwardsItem.getMerchantShareRate());
activityItem.setActivityGrantItemList(Arrays.asList(grantItem));
activityItem.setActivityGrantItemList(Collections.singletonList(grantItem));
}
else if (EnumOfflineActivityType.CASHBACK.getCode().equals(activityItem.getType())) {
activityItem.setIsMeet(true);
@@ -405,13 +405,13 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
if(awardsItem == null){
throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数");
}
if(awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0){
throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数(金额不在范围类)");
}
// if((awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0)
// || (awardsItem.getMaxAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMaxAmount()) > 0)){
// if(awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0){
// throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数(金额不在范围类)");
// }
if((awardsItem.getMinAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMinAmount()) < 0)
|| (awardsItem.getMaxAmount() != null && wxOfflineActivityGrantAward.getOrderMoneySum().compareTo(awardsItem.getMaxAmount()) > 0)){
throw new MallinkException(Result.ERROR, "请检查活动"+activityItem.getName()+"奖项参数(金额不在范围类)");
}

handlerGrantItem(grantGrantItem,activity,activityItem,awardsItem);

@@ -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()));
@@ -691,10 +695,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
headList.add(entity15);
ExcelExportEntity entity16 = new ExcelExportEntity("周年庆抽奖编码","anniversaryLotteryNum",20);
headList.add(entity16);
ExcelExportEntity entity17 = new ExcelExportEntity("签名图片","signImg",20);
entity17.setType(BaseEntityTypeConstants.IMAGE_TYPE);
entity17.setExportImageType(1);
entity17.setHeight(20);
ExcelExportEntity entity17 = new ExcelExportEntity("签名图片","signImg",40);
// entity17.setType(BaseEntityTypeConstants.IMAGE_TYPE);
// entity17.setExportImageType(1);
// entity17.setHeight(20);

headList.add(entity17);



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

@@ -180,7 +180,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
private String getPercentage(BigDecimal yes, BigDecimal yesYes){

String percentage = "--";
if(yes.compareTo(BigDecimal.ZERO) > 0){
if(yesYes.compareTo(BigDecimal.ZERO) > 0){
BigDecimal count = yes.subtract(yesYes);
percentage = count.divide(yesYes,2,BigDecimal.ROUND_HALF_UP).toString();
}
@@ -192,7 +192,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
nf.setMinimumFractionDigits(2);

String percentage = "--";
if(yes > 0){
if(yesYes > 0){
Integer count = yes - yesYes;
percentage = nf.format(count.doubleValue() / new Double(yesYes).doubleValue());
}


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