From c927b4d36b9e04a8b2ba08c8789f5277aa1c277d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 27 七月 2023 21:01:15 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
index ba04ab2..b224026 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -25,6 +25,7 @@
import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerGoodsPriceListVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.service.RemoteActivityService;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteGoodsService;
@@ -34,11 +35,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.StringJoiner;
+import java.util.*;
import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -633,6 +632,7 @@
Date validEndTime;
Integer validDay;
String validTime = "";
+ HashSet<Long> shopIdSet = new HashSet<>();
for(MgtCouponAuditPageVo mgtCouponAuditPageVo : mgtCouponAuditPageVoList){
//处理有效期
validTimeType = mgtCouponAuditPageVo.getValidTimeType();
@@ -645,6 +645,20 @@
validTime = "领取之日起" + validDay.toString() + "天";
}
mgtCouponAuditPageVo.setValidTime(validTime);
+ if(mgtCouponAuditPageVo.getShopId()!=null){
+ shopIdSet.add(mgtCouponAuditPageVo.getShopId());
+ }
+ }
+ String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
+ MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
+ mgtBaseBathDto.setIds(shopJoinedString);
+ List<MgtSimpleShopVo> simpleShopVoList = remoteShopService.listShopSimpleVoByIds(mgtBaseBathDto).getData();
+ Map<Long, MgtSimpleShopVo> shopMap = simpleShopVoList.stream()
+ .collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
+ for(MgtCouponAuditPageVo mgtCouponAuditPageVo : mgtCouponAuditPageVoList){
+ if(mgtCouponAuditPageVo.getShopId()!=null){
+ mgtCouponAuditPageVo.setShopName(shopMap.get(mgtCouponAuditPageVo.getShopId()).getShopName());
+ }
}
}
return mgtCouponAuditPageVoList;
@@ -906,7 +920,8 @@
coupon.setCouponName(merCouponEditDto.getCouponName());
coupon.setSendType(merCouponEditDto.getSendType());
coupon.setSendTarget(merCouponEditDto.getSendTarget());
- coupon.setSendTimeType(merCouponEditDto.getSendTimeType());
+ //商户端默认立即发放
+ coupon.setSendTimeType(1);
coupon.setSendTime(merCouponEditDto.getSendTime());
coupon.setMoneyThreshold(merCouponEditDto.getMoneyThreshold());
coupon.setDiscountMoney(merCouponEditDto.getDiscountMoney());
--
Gitblit v1.7.1