|
|
|
@@ -324,6 +324,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
} |
|
|
|
|
|
|
|
private void handlerGrantItem(WxOfflineActivity activity, WxOfflineActivityGrantAward wxOfflineActivityGrantAward){ |
|
|
|
if(wxOfflineActivityGrantAward.getActivityItemList() == null){ |
|
|
|
throw new MallinkException(Result.ERROR, "请检查活动项参数"); |
|
|
|
} |
|
|
|
|
|
|
|
List<WxOfflineActivityItem> activityItemList = wxOfflineActivityItemService.getActivityItemList(activity.getId(), activity.getTenantId()); |
|
|
|
Map<Long, WxOfflineActivityItem> activityItemMap = activityItemList.stream().collect(toMap(WxOfflineActivityItem::getId, Function.identity())); |
|
|
|
@@ -402,10 +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) |
|
|
|
|| (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); |
|
|
|
|
|
|
|
@@ -621,6 +627,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
// activityGrantObject.put("signImg",DownFileUtil.url2byte(grantAward.getSignImg())); |
|
|
|
// }catch (Exception e){} |
|
|
|
// } |
|
|
|
activityGrantObject.put("signImg",grantAward.getSignImg()); |
|
|
|
activityGrantObjectList.add(activityGrantObject); |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -632,7 +639,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
List<ExcelExportEntity> headList = new ArrayList<>(); |
|
|
|
ExcelExportEntity entity1 = new ExcelExportEntity("活动名称","activityName",20); |
|
|
|
headList.add(entity1); |
|
|
|
ExcelExportEntity entity2 = new ExcelExportEntity("订单[门店]","merchantOrder",20); |
|
|
|
ExcelExportEntity entity2 = new ExcelExportEntity("订单[门店]","merchantOrder",30); |
|
|
|
headList.add(entity2); |
|
|
|
ExcelExportEntity entity3 = new ExcelExportEntity("订单总金额","orderMoneySum",20); |
|
|
|
headList.add(entity3); |
|
|
|
@@ -685,7 +692,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
ExcelExportEntity entity16 = new ExcelExportEntity("周年庆抽奖编码","anniversaryLotteryNum",20); |
|
|
|
headList.add(entity16); |
|
|
|
ExcelExportEntity entity17 = new ExcelExportEntity("签名图片","signImg",20); |
|
|
|
// entity17.setType(BaseEntityTypeConstants.IMAGE_TYPE); |
|
|
|
entity17.setType(BaseEntityTypeConstants.IMAGE_TYPE); |
|
|
|
entity17.setExportImageType(1); |
|
|
|
entity17.setHeight(20); |
|
|
|
|
|
|
|
headList.add(entity17); |
|
|
|
|
|
|
|
return headList; |
|
|
|
|