From f5d3adf884a49cb8f4563be0c7086a506011d64d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 14:35:47 +0800
Subject: [PATCH] 修改订单查询
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 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 d1b673c..e54413b 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,6 +6,7 @@
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.MemberSelectCouponDto;
import com.ruoyi.member.domain.dto.MerGoodsCouponListDto;
import com.ruoyi.member.domain.vo.AppMemberCouponPageVo;
import com.ruoyi.member.mapper.member.MemberCouponMapper;
@@ -24,6 +25,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -81,7 +83,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);
}
// 检查优惠券类型
@@ -123,7 +125,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){
@@ -217,7 +219,9 @@
}
}
appGetAbleCouponPageVo.setGoodsLimitList(goodsLimitList);
- appGetAbleCouponPageVo.setVerifyShopName(shopMap.get(appGetAbleCouponPageVo.getShopId()).getShopName());
+ if(appGetAbleCouponPageVo.getShopId()!=null){
+ appGetAbleCouponPageVo.setVerifyShopName(shopMap.get(appGetAbleCouponPageVo.getShopId()).getShopName());
+ }
}
}
return memberCouponPageVoList;
@@ -268,6 +272,56 @@
*/
@Override
public List<MerMemberCouponVo> listMerShopGoodsMemberCoupon(MerGoodsCouponListDto merGoodsCouponListDto){
- return memberCouponMapper.listMerShopGoodsMemberCoupon(merGoodsCouponListDto);
+ List<MerMemberCouponVo> merMemberCouponVoList = memberCouponMapper.listMerShopGoodsMemberCoupon(merGoodsCouponListDto);
+ if(merMemberCouponVoList!=null&&merMemberCouponVoList.size()>0){
+ List<MemberSelectCouponDto> goodsCpuponList = merGoodsCouponListDto.getGoodsCpuponList();
+ List<String> selectCouponList = new ArrayList<>();
+ Map<String, String> selectCouponMap = new HashMap<>();
+ Boolean checkSelect = false;
+ if(merGoodsCouponListDto.getGoodsCpuponList()!=null&&merGoodsCouponListDto.getGoodsCpuponList().size()>0) {
+ for (MemberSelectCouponDto couponDto : goodsCpuponList) {
+ selectCouponList.add(couponDto.getMemberCouponId());
+ selectCouponMap.put(couponDto.getMemberCouponId(), couponDto.getGoodsId());
+ }
+ checkSelect = true;
+ }
+ Iterator<MerMemberCouponVo> iterator = merMemberCouponVoList.iterator();
+ while (iterator.hasNext()) {
+ MerMemberCouponVo couponVo = iterator.next();
+ log.debug("couponVo"+couponVo.toString());
+ if(checkSelect){
+ if (selectCouponList.contains(couponVo.getMemberCouponId()) && selectCouponMap.containsKey(couponVo.getMemberCouponId())) {
+ String goodsId = selectCouponMap.get(couponVo.getMemberCouponId());
+ if (!merGoodsCouponListDto.getGoodsId().equals(goodsId)) {
+ iterator.remove();
+ continue;
+ }
+ }
+ }
+ if(merGoodsCouponListDto.getBuyNum()!=null&&merGoodsCouponListDto.getSalesPrice()!=null){
+ if(couponVo.getCouponType()==1){
+ BigDecimal goodsMoney = merGoodsCouponListDto.getSalesPrice().multiply(new BigDecimal(merGoodsCouponListDto.getBuyNum().toString()));
+ if(goodsMoney.compareTo(couponVo.getMoneyThreshold())<0){
+ iterator.remove();
+ }
+ }
+ }
+ }
+ }
+ return merMemberCouponVoList;
+ }
+
+
+ /**
+ * @description 确认核销优惠券
+ * @author jqs
+ * @date 2023/8/15 11:21
+ * @param memberCouponId
+ * @param shopId
+ * @return void
+ */
+ @Override
+ public void sureMemberCoupon(String memberCouponId,Long shopId){
+ memberCouponMapper.sureMemberCoupon(memberCouponId, shopId);
}
}
--
Gitblit v1.7.1