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 524c4ab10..0c5fbbc68 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -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 activityItemList = wxOfflineActivityItemService.getActivityItemList(activity.getId(), activity.getTenantId()); Map 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 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; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantItemServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantItemServiceImpl.java index a114806a2..305101b0f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantItemServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantItemServiceImpl.java @@ -48,13 +48,13 @@ public class WxOfflineActivityGrantItemServiceImpl implements WxOfflineActivityG BigDecimal awardPrice = wxOfflineActivityGrantAward.getOrderMoneySum() .multiply(grantGrantItem.getCashBackRatio().divide(new BigDecimal(100))); if(EnumOfflineActivityAwardsRule.DEF.getCode().equals(grantGrantItem.getAwardsItemRule())){ - grantGrantItem.setAwardPrice(awardPrice.setScale(0, BigDecimal.ROUND_HALF_UP)); + grantGrantItem.setAwardPrice(awardPrice.setScale(2, BigDecimal.ROUND_HALF_UP)); } else if (EnumOfflineActivityAwardsRule.YUAN.getCode().equals(grantGrantItem.getAwardsItemRule())) { - BigDecimal awardPriceYuan = awardPrice.divide(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP); + BigDecimal awardPriceYuan = awardPrice.setScale(0, BigDecimal.ROUND_HALF_UP); grantGrantItem.setAwardPrice(awardPriceYuan.multiply(new BigDecimal(100))); }else if (EnumOfflineActivityAwardsRule.TEN.getCode().equals(grantGrantItem.getAwardsItemRule())){ - BigDecimal awardPriceTen = awardPrice.divide(new BigDecimal(1000)).setScale(0, BigDecimal.ROUND_HALF_UP); - grantGrantItem.setAwardPrice(awardPriceTen.multiply(new BigDecimal(1000))); + BigDecimal awardPriceTen = awardPrice.divide(new BigDecimal(10)).setScale(0, BigDecimal.ROUND_HALF_UP); + grantGrantItem.setAwardPrice(awardPriceTen.multiply(new BigDecimal(10))); } } rantItemList.add(grantGrantItem); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java index 1bf5835e4..1896b5034 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java @@ -62,9 +62,8 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct for(int i=0; i SELECT DISTINCT rg.record_id - FROM wx_offline_activity_grant_award ga - left join wx_offline_activity_record_grant rg + from wx_offline_activity_record_grant rg + left join wx_offline_activity_grant_award ga on ga.id = rg.grant_id where 1 = 1 and ga.`tenant_id` = #{tenantId}