From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 15:05:15 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
index e127461..32acc73 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -6,14 +6,17 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.member.domain.dto.AppMemberCouponPageDto;
+import com.ruoyi.member.domain.dto.MerGoodsCouponListDto;
import com.ruoyi.member.domain.vo.AppMemberCouponPageVo;
import com.ruoyi.member.mapper.member.MemberCouponMapper;
import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+import com.ruoyi.system.api.domain.vo.MerMemberCouponVo;
import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.service.RemoteGoodsService;
@@ -53,8 +56,8 @@
* @version 1.0
*/
@Override
- public List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId){
- List<AppMemberCouponVo> appMemberCouponVoList = memberCouponMapper.listVoMemberCouponByUserId(userId);
+ public List<AppMemberCouponVo> listVoMemberCouponByUserId(MerBaseDto merBaseDto){
+ List<AppMemberCouponVo> appMemberCouponVoList = memberCouponMapper.listVoMemberCouponByUserId(merBaseDto);
return appMemberCouponVoList;
}
@@ -78,7 +81,7 @@
throw new ServiceException(AppErrorConstant.COUPON_EXPIRED);
} else if (couponStatus == 2) {
throw new ServiceException(AppErrorConstant.COUPON_USED);
- } else if (couponStatus != 0) {
+ } else if (couponStatus != 1) {
throw new ServiceException(AppErrorConstant.COUPON_NO_FIND);
}
// 检查优惠券类型
@@ -120,7 +123,7 @@
throw new ServiceException(AppErrorConstant.COUPON_EXPIRED);
}else if(memberCoupon.getCouponStatus()==2){
throw new ServiceException(AppErrorConstant.COUPON_USED);
- }else if(memberCoupon.getCouponStatus()==-1){
+ }else if(memberCoupon.getCouponStatus()!=1){
throw new ServiceException(AppErrorConstant.COUPON_NO_FIND);
}
if(memberCoupon.getCouponType()!=4){
@@ -140,6 +143,7 @@
merVerifyCouponGetVo.setCouponFrom("平台");
}
memberCoupon.setCouponStatus(2);
+
memberCoupon.setUseTime(new Date());
this.saveOrUpdate(memberCoupon);
merVerifyCouponGetVo.setMemberCoupon(memberCoupon);
@@ -180,7 +184,12 @@
List<String> goodsLimitList = null;
HashSet<Long> shopIdSet = new HashSet<>();
for(AppMemberCouponPageVo appGetAbleCouponPageVo : memberCouponPageVoList){
- shopIdSet.add(appGetAbleCouponPageVo.getShopId());
+ if(appGetAbleCouponPageVo.getShopId()!=null){
+ shopIdSet.add(appGetAbleCouponPageVo.getShopId());
+ }
+ if(appGetAbleCouponPageVo.getCouponType()==4){
+ appGetAbleCouponPageVo.setVerifyCode("2-"+appGetAbleCouponPageVo.getMemberCouponId());
+ }
}
String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
@@ -192,7 +201,7 @@
relGoodsIds = appGetAbleCouponPageVo.getRelGoodsIds();
if(StringUtils.isNotBlank(relGoodsIds)){
goodsList = remoteGoodsService.listGoodsByGoodsId(relGoodsIds).getData();
- if(!goodsList.isEmpty()){
+ if(goodsList!=null&&!goodsList.isEmpty()){
goodsLimitList = goodsList.stream().map(goods -> {
String goodsName = goods.getGoodsName();
goodsName = "限制" + goodsName + "适用";
@@ -208,7 +217,9 @@
}
}
appGetAbleCouponPageVo.setGoodsLimitList(goodsLimitList);
- appGetAbleCouponPageVo.setVerifyShopName(shopMap.get(appGetAbleCouponPageVo.getShopId()).getShopName());
+ if(appGetAbleCouponPageVo.getShopId()!=null){
+ appGetAbleCouponPageVo.setVerifyShopName(shopMap.get(appGetAbleCouponPageVo.getShopId()).getShopName());
+ }
}
}
return memberCouponPageVoList;
@@ -249,4 +260,16 @@
public void backMemberCoupon(String memberCouponIds){
memberCouponMapper.backMemberCoupon(memberCouponIds);
}
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/19 17:35
+ * @param
+ * @return List<MerMemberCouponVo>
+ */
+ @Override
+ public List<MerMemberCouponVo> listMerShopGoodsMemberCoupon(MerGoodsCouponListDto merGoodsCouponListDto){
+ return memberCouponMapper.listMerShopGoodsMemberCoupon(merGoodsCouponListDto);
+ }
}
--
Gitblit v1.7.1