From 10f1422bc8f401b06b1e55ee63b23016d74abce8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 28 二月 2024 11:34:09 +0800
Subject: [PATCH] 优化商户发券逻辑

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 8062e06..fee79df 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
@@ -495,6 +495,13 @@
                 userIdList = relUserIdList;
             }
         }
+        //商户发送全部,则发送没有绑定的会员及绑定了当前商户端会员
+        if(coupon.getCouponFrom() == 2 && sendTarget == 2){
+            shopId = coupon.getShopId();
+            userIdList = memberService.listIdBySendType2(shopId);
+        }
+
+
         if(userIdList!=null&&!userIdList.isEmpty()){
             List<MemberCoupon> memberCouponList = new ArrayList<>();
             MemberCoupon memberCoupon;
@@ -645,6 +652,12 @@
                 userIdList = relUserIdList;
             }
         }
+        //商户发送全部,则发送没有绑定的会员及绑定了当前商户端会员
+        if(coupon.getCouponFrom() == 2 && sendTarget == 2){
+            shopId = coupon.getShopId();
+            userIdList = memberService.listIdBySendType2(shopId);
+        }
+
         if(relUserIdList!=null&&!relUserIdList.isEmpty()){
             List<MemberCoupon> memberCouponList = new ArrayList<>();
             MemberCoupon memberCoupon;

--
Gitblit v1.7.1