From acf41325efba7960583feda3cd3191ae4d39852e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Mon, 29 Jan 2024 14:11:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=8F=91=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/EventMarketing/giftBlock/index.vue  |  4 +-
 .../impl/ActiveConsumptionServiceImpl.java    |  7 ++-
 .../CardFavorableRecordController.java        | 16 ++++++
 .../dto/CardFavorableAdnUserDTO.java          |  5 ++
 .../mapper/CardFavorableRecordMapper.java     |  1 +
 .../mapper/xml/CardFavorableRecordMapper.xml  | 27 +++++++++
 .../service/CardFavorableRecordService.java   |  1 +
 .../impl/CardFavorableRecordServiceImpl.java  | 28 +++++++--
 .../vo/CardFavorableRecordVO.java             |  2 +
 .../service/impl/CardGiftServiceImpl.java     |  7 ++-
 .../impl/CardValueRecordServiceImpl.java      |  3 +-
 .../mapper/xml/CardBalanceChangeMapper.xml    |  5 +-
 .../userManager/mapper/LJUserMapper.java      |  1 +
 .../userManager/mapper/xml/LJUserMapper.xml   | 57 ++++++++++++++++++-
 .../userManager/service/LJUserService.java    |  1 +
 .../service/impl/LJUserServiceImpl.java       | 15 +++++
 .../business/userManager/vo/LJUserVo.java     |  1 +
 17 files changed, 168 insertions(+), 13 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 7c683dd70..d0a96a691 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -147,9 +147,9 @@
               <el-radio label="2">禁用</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="卡描述" >
+<!--          <el-form-item label="卡描述" >
             <el-input type="textarea" v-model="ruleForm.remark"></el-input>
-          </el-form-item>
+          </el-form-item>-->
         </el-form>
           <span slot="footer" class="dialog-footer">
             <el-button @click="centerDialogVisible = false">取 消</el-button>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
index 6789a1afd..a65f9fd58 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
@@ -20,6 +20,7 @@ import com.fuint.business.userManager.entity.LJUserGrade;
 import com.fuint.business.userManager.service.LJUserGradeService;
 import com.fuint.common.util.TokenUtil;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -263,8 +264,12 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
             activeConsumptionAppletVO.setOilName(oilNameList);
             activeConsumptionAppletVO.setPoints(s.getPoints());
             activeConsumptionAppletVO.setAdaptUserType(adaptUserType);
+            String goodss = "";
+            if (ObjectUtils.isNotEmpty(goods)){
+                goodss = " 赠送物品："+goods;
+            }
             activeConsumptionAppletVO.setActiveDescribe(s.getName() + "："+"本活动消费需满"+
-                    s.getParticipationConditionMoney()+"元，赠送券："+card+" 赠送物品："+goods+"。");
+                    s.getParticipationConditionMoney()+"元，赠送券："+card+goodss+"。");
             return activeConsumptionAppletVO;
         }).collect(Collectors.toList());
         return appletVOList;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
index ada0f3ec9..df79494ea 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
@@ -108,6 +108,22 @@ public class CardFavorableRecordController extends BaseController {
         return getSuccessResult(this.cardFavorableRecordService.issueCardFavorable(cardFavorableAdnUserDTO));
     }
 
+    /**
+     * 查询一键发券接口
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param cardFavorableRecord
+     * @return
+     */
+    @GetMapping("getCardFavorableLists")
+    public ResponseObject getCardFavorableLists(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                               @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                               @Param("cardFavorableRecord") CardFavorableRecord cardFavorableRecord) {
+        Page page = new Page(pageNo, pageSize);
+        return getSuccessResult(this.cardFavorableRecordService.getCardFavorableLists(page,cardFavorableRecord));
+    }
+
     /**
      * 小程序端判断是否领取优惠券
      * @return 新增结果
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableAdnUserDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableAdnUserDTO.java
index dd19f0820..988f08c32 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableAdnUserDTO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/dto/CardFavorableAdnUserDTO.java
@@ -9,5 +9,10 @@ import java.util.List;
 public class CardFavorableAdnUserDTO extends CardFavorable {
     //会员列表
     private List<Integer>  userIds;
+    //优惠券ids
     private List<Integer>  cardFavorableIds;
+    //等级ID
+    private List<Integer> gradeIds;
+    //天数
+    private Integer days;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
index c0be2bdf0..cade4337b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
@@ -29,6 +29,7 @@ public interface CardFavorableRecordMapper extends BaseMapper<CardFavorableRecor
 
 
     IPage<CardFavorableRecordVO> getCardFavorableList(@Param("page")Page page,@Param("cardFavorableRecord") CardFavorableRecord cardFavorableRecord);
+    IPage<CardFavorableRecordVO> getCardFavorableLists(@Param("page")Page page,@Param("cardFavorableRecord") CardFavorableRecord cardFavorableRecord);
 
     /**
      * 查询优惠券接口(小程序)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
index 991da8eeb..ba33d0fe9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
@@ -55,6 +55,33 @@
         order by cfr.create_time DESC
     </select>
 
+    <select id="getCardFavorableLists"
+            resultType="com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO">
+        select
+        cfr.name name,
+        cfr.mobile mobile,
+        cfr.status status,
+        cf.name cardFavorableName,
+        cf.discount_type discountType
+        FROM
+        card_favorable_record cfr
+        left join card_favorable cf ON cfr.card_favorable_id = cf.id
+        left join mt_store ms on  ms.id = cfr.store_id
+        <where>
+            cfr.exchange_from = "店铺一键送券"
+            <if test="cardFavorableRecord.storeId != null">
+                and cf.store_id = #{cardFavorableRecord.storeId}
+            </if>
+            <if test="cardFavorableRecord.mtUserId != null">
+                and cfr.mt_user_id = #{cardFavorableRecord.mtUserId}
+            </if>
+            <if test="cardFavorableRecord.status != null and cardFavorableRecord.status != ''">
+                and cfr.status = #{cardFavorableRecord.status}
+            </if>
+        </where>
+        order by cfr.create_time DESC
+    </select>
+
     <select id="selectAllByCondition" resultType="com.fuint.business.marketingActivity.cardFavorable.vo.CouponVO">
         SELECT
         card_favorables.couponType,
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
index 3e860cfa2..0677f5e23 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
@@ -31,6 +31,7 @@ public interface CardFavorableRecordService extends IService<CardFavorableRecord
 
 
     IPage<CardFavorableRecordVO> getCardFavorableList(Page page, CardFavorableRecord cardFavorableRecord);
+    IPage<CardFavorableRecordVO> getCardFavorableLists(Page page, CardFavorableRecord cardFavorableRecord);
 
     /**
      * 统计优惠券数量
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
index 690fb3375..954b8929b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
@@ -39,6 +39,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -125,6 +126,14 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
         return cardFavorableList;
     }
 
+    @Override
+    public IPage<CardFavorableRecordVO> getCardFavorableLists(Page page, CardFavorableRecord cardFavorableRecord) {
+        Integer storeId = TokenUtil.getNowAccountInfo().getStoreId();
+        cardFavorableRecord.setStoreId(storeId);
+        IPage<CardFavorableRecordVO> cardFavorableList = cardFavorableRecordMapper.getCardFavorableLists(page, cardFavorableRecord);
+        return cardFavorableList;
+    }
+
     /**
      * 统计优惠券使用数量
      * @param cardFavorableRecord
@@ -310,18 +319,29 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
      */
     @Override
     public boolean issueCardFavorable(CardFavorableAdnUserDTO cardFavorableAdnUserDTO) {
+        //查询用户列表
+        ArrayList<LJUserVo> ljUserVosList = new ArrayList<>();
+        List<Integer> gradeIds = cardFavorableAdnUserDTO.getGradeIds();
+        for (Integer gradeId : gradeIds) {
+            LJUserVo ljUserVo = new LJUserVo();
+            ljUserVo.setGradeId(gradeId);
+            ljUserVo.setDays(cardFavorableAdnUserDTO.getDays());
+            List<LJUserVo> userLists = userService.getUserLists(ljUserVo);
+            ljUserVosList.addAll(userLists);
+        }
+
         boolean flag = false;
         //油站信息
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         //会员ids
-        List<Integer> userIds = cardFavorableAdnUserDTO.getUserIds();
+        //List<Integer> userIds = cardFavorableAdnUserDTO.getUserIds();
         //优惠券ids
         List<Integer> cardIds = cardFavorableAdnUserDTO.getCardFavorableIds();
         for (Integer cardId : cardIds) {
             CardFavorableRecord cardFavorableRecord = new CardFavorableRecord();
-            if (CollectionUtils.isNotEmpty(userIds)){
-                for (Integer userId : userIds) {
-                    LJUser userInfo = userService.queryUserByUserId(userId);
+            if (CollectionUtils.isNotEmpty(ljUserVosList)){
+                for (LJUserVo ljUserVo : ljUserVosList) {
+                    LJUser userInfo = userService.queryUserByUserId(ljUserVo.getId());
                     cardFavorableRecord.setCardFavorableId(cardId);
                     cardFavorableRecord.setStoreId(nowAccountInfo.getStoreId());
                     cardFavorableRecord.setChainStorId(nowAccountInfo.getChainStoreId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
index b7bd63597..18554af80 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
@@ -44,4 +44,6 @@ public class CardFavorableRecordVO extends CardFavorableRecord {
     private String discountType;
     //满足金额
     private double satisfiedAmount;
+    //优惠券描述信息
+
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
index f3dffe356..181c45173 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
@@ -14,6 +14,7 @@ import com.fuint.business.store.entity.MtStore;
 import com.fuint.business.store.service.StoreService;
 import com.fuint.business.userManager.entity.UserBalance;
 import com.fuint.business.userManager.mapper.LJUserMapper;
+import com.fuint.business.userManager.service.LJUserService;
 import com.fuint.business.userManager.service.UserBalanceService;
 import com.fuint.business.userManager.vo.LJUserVo;
 import com.fuint.common.util.TokenUtil;
@@ -48,7 +49,7 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
     @Resource
     private UserBalanceService userBalanceService;
     @Resource
-    private LJUserMapper ljUserMapper;
+    private LJUserService ljUserService;
 
     /**
      * 新增数据
@@ -163,6 +164,7 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
     public CardGift exchange(CardGift cardGift) {
         //登录用户id
         Integer userId = TokenUtil.getNowAccountInfo().getId();
+        LJUserVo ljUserVo = ljUserService.selectUserById(userId, TokenUtil.getNowAccountInfo().getStoreId());
         LambdaQueryWrapper<CardGift> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CardGift::getNumber,cardGift.getNumber());
         queryWrapper.eq(CardGift::getStatus,"1");
@@ -172,6 +174,9 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
         if (ObjectUtils.isNotEmpty(one) && ObjectUtils.isNotEmpty(cardGift.getCardPassword()) && cardGift.getCardPassword().equals(one.getCardPassword())){
             one.setActivateStatus("1");
             one.setUserId(userId);
+            String name = ljUserVo.getName();
+            String mobile = ljUserVo.getMobile();
+            one.setRemark("姓名："+name+"，手机号："+mobile);
             updateById(one);
             //更新用户余额
             Double cardAmount = one.getCardAmount();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
index 79c9a8fb1..4bcdd59b0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
@@ -816,9 +816,10 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         //用户余额变化记录
         cardBalanceChange.setUserId(cardValueOrders.getMtUserId());
         cardBalanceChange.setStoreId(cardValueOrders.getStoreId());
+        cardBalanceChange.setChainStoreId(cardValueOrders.getChainStoreId());
         cardBalanceChange.setChangeType("1");
         cardBalanceChange.setFromType("储值卡充值");
-        cardBalanceChange.setBalance(cardValueOrders.getBidBalance());
+        cardBalanceChange.setBalance(cardValueOrders.getAmount());
         cardBalanceChange.setAfterTheChange(afterBalance);
         cardBalanceChange.setOrderNo(cardValueOrders.getOrderNo());
         cardBalanceChangeService.save(cardBalanceChange);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml
index 7a73be2e8..659859e05 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml
@@ -5,7 +5,6 @@
     <select id="getCardRecordList" resultType="com.fuint.business.order.vo.CardBalanceChangeVo">
         select
             ms.name storeName,
-
             cbc.change_type changeType,
             cbc.from_type fromType,
             cbc.after_the_change afterTheChange,
@@ -36,6 +35,6 @@
                 and date_format(cbc.create_time,'%y%m%d') &lt;= date_format(#{cardBalanceChange.params.endTime},'%y%m%d')
             </if>
         </where>
-order by  cbc.id DESC
+         order by  cbc.id DESC
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java
index 52b0ef501..66273d518 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java
@@ -20,6 +20,7 @@ public interface LJUserMapper extends BaseMapper<LJUser> {
      */
     public IPage<LJUserVo> selectUserList(Page page, @Param("user") LJUserVo user);
     public IPage<LJUserVo> getUserList(Page page, @Param("user") LJUserVo user);
+    public List<LJUserVo> getUserLists(@Param("user") LJUserVo user);
 
     /**
      * 根据店铺id查询所有会员信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
index 135c28ab7..4b7a9548a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
@@ -31,7 +31,62 @@
         LEFT JOIN mt_user_balance mub ON mu.id = mub.mt_user_id
         left join oil_order oo on mu.id = oo.user_id
         <where>
-            oo.create_time &lt;= DATE_SUB(NOW(), INTERVAL 14 DAY)
+            oo.create_time &lt;= DATE_SUB(NOW(), INTERVAL #{days} DAY)
+            <if test="user.chainStoreId != null and user.chainStoreId != ''">
+                and mub.chain_store_id = #{user.chainStoreId}
+            </if>
+            <if test="user.storeId != null and user.storeId != ''">
+                and mub.store_id = #{user.storeId}
+            </if>
+            <if test="user.mobile != null and user.mobile != ''">
+                and mu.mobile like concat('%', #{user.mobile}, '%')
+            </if>
+            <if test="user.userNo != null and user.userNo != ''">
+                and mu.user_no like concat('%', #{user.userNo}, '%')
+            </if>
+            <if test="user.name != null and user.name != ''">
+                and mu.name like concat('%', #{user.name}, '%')
+            </if>
+            <if test="user.gradeId != null and user.gradeId != ''">
+                and mub.grade_id = #{user.gradeId}
+            </if>
+            <if test="user.official != null and user.official != ''">
+                and mu.official = #{user.official}
+            </if>
+            <if test="user.cardBalance != null and user.cardBalance != '' and user.cardBalance == 2">
+                and mub.card_balance = 0
+            </if>
+            <if test="user.cardBalance != null and user.cardBalance != '' and user.cardBalance == 1">
+                and mub.card_balance != 0
+            </if>
+            <if test="user.params.beginTime != null and user.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(mu.create_time,'%y%m%d') &gt;= date_format(#{user.params.beginTime},'%y%m%d')
+            </if>
+            <if test="user.params.endTime != null and user.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(mu.create_time,'%y%m%d') &lt;= date_format(#{user.params.endTime},'%y%m%d')
+            </if>
+        </where>
+        GROUP BY mu.id
+        ORDER BY oo.create_time desc
+    </select>
+
+    <select id="getUserLists" resultType="com.fuint.business.userManager.vo.LJUserVo">
+        SELECT
+        mu.*,
+        mub.grade_id,
+        mub.card_balance,
+        mub.points,
+        mub.consume_num,
+        mub.growth_value,
+        mub.refuel_money,
+        mub.second_card,
+        mub.fixing_level
+        FROM
+        mt_user mu
+        LEFT JOIN mt_user_balance mub ON mu.id = mub.mt_user_id
+        left join oil_order oo on mu.id = oo.user_id
+        <where>
+            oo.create_time &lt;= DATE_SUB(NOW(), INTERVAL #{days} DAY)
             <if test="user.chainStoreId != null and user.chainStoreId != ''">
                 and mub.chain_store_id = #{user.chainStoreId}
             </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
index 15e752271..fc53c6528 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
@@ -19,6 +19,7 @@ public interface LJUserService extends IService<LJUser> {
      */
     public IPage<LJUserVo> selectUserList(Page page, LJUserVo user);
     public IPage<LJUserVo> getUserList(Page page, LJUserVo user);
+    public List<LJUserVo> getUserLists(LJUserVo user);
 
     Integer userNum(Integer storeId);
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index 028f9821b..52754726a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -66,6 +66,21 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
         return ljUserIPage;
     }
 
+    /**
+     * 根据条件分页查询会员信息
+     * @param page
+     * @param user
+     * @return
+     */
+    @Override
+    public List<LJUserVo> getUserLists(LJUserVo user) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
+        user.setChainStoreId(store.getChainStoreId());
+        List<LJUserVo> userLists = baseMapper.getUserLists(user);
+        return userLists;
+    }
+
     @Override
     public Integer userNum(Integer storeId) {
         // 构建查询条件
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
index 1cf02647e..37d24ce2f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
@@ -113,4 +113,5 @@ public class LJUserVo extends BaseEntity {
      * 连锁店id
      */
     private Integer chainStoreId;
+    private Integer days;
 }

From ab435b605545912dfd9746fba49aca727c4bff0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Mon, 29 Jan 2024 14:11:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=8F=91=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gasStation-uni/pagesHome/activeIn/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gasStation-uni/pagesHome/activeIn/index.vue b/gasStation-uni/pagesHome/activeIn/index.vue
index 218b0ba64..e6c69fd64 100644
--- a/gasStation-uni/pagesHome/activeIn/index.vue
+++ b/gasStation-uni/pagesHome/activeIn/index.vue
@@ -33,7 +33,7 @@
 					</view>
 					<view class="dis-box">
 						<view class="dian" style="background: #FA5E03;"></view>
-						<view class="h_size">获得折扣：赠送{{item.points}}积分</view>
+						<view class="h_size">获得奖励：赠送{{item.points}}积分</view>
 					</view>
 				</view>
 			</view>