From 4d75e9588078d3c5b7acdff72753d7aef84e1bb7 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Thu, 15 Aug 2024 10:29:45 +0800 Subject: [PATCH 1/3] //OfflineActivity --- .../impl/WxOfflineActivityGrantAwardServiceImpl.java | 8 ++++---- .../impl/WxOfflineActivityGrantSettlementServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 7befddf3f..f794f5470 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -691,10 +691,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); 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 9671d8546..1f2dacfa9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java +++ b/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()); } From c01b744c471e2509bca485c869c16c0671ac6e9e Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Thu, 15 Aug 2024 11:46:40 +0800 Subject: [PATCH 2/3] //OfflineActivity --- .../impl/WxOfflineActivityGrantAwardServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 f794f5470..531a5bdca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/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); From 8045f04e969e30e6a04eb4b46b8e0cb3aad0788b Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Thu, 15 Aug 2024 12:40:12 +0800 Subject: [PATCH 3/3] //OfflineActivity --- .../po/WxOfflineActivityGrantAward.java | 26 +++++++++++++++++++ .../domain/po/WxOfflineActivityRecord.java | 4 ++- ...xOfflineActivityGrantAwardServiceImpl.java | 10 ++++--- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java index 967af5db7..ef02730a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantAward.java +++ b/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 lotteryNumList; + public List getLotteryNumList() { + if(StringUtils.isNotBlank(lotteryNum)){ + try { + List 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 anniversaryLotteryNumList; + public List getAnniversaryLotteryNumList() { + if(StringUtils.isNotBlank(anniversaryLotteryNum)){ + try { + List 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; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java index b53e6fbc8..16e97a2bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java @@ -90,7 +90,9 @@ public class WxOfflineActivityRecord extends TenantEntity { public List getLotteryNumList() { if(StringUtils.isNotBlank(lotteryNum)){ try { - lotteryNumList = JSON.parseArray(lotteryNum, String.class); + List stringList = JSON.parseArray(lotteryNum, String.class); + stringList.removeIf(String::isEmpty); + lotteryNumList = stringList.isEmpty() ? null : stringList; }catch(Exception e){} } return lotteryNumList; 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 531a5bdca..38b7f91b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -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()));