|
|
|
@@ -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); |
|
|
|
|
|
|
|
|