From f325084e07eaf9c22be7542ab711fb3fc47cecb7 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 10:42:15 +0800 Subject: [PATCH] =?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 --- .../service/impl/CardGiftServiceImpl.java | 4 +- .../controller/LJUserController.java | 16 ++++ .../userManager/mapper/LJUserMapper.java | 2 +- .../userManager/mapper/xml/LJUserMapper.xml | 74 ++++++++++++++++--- .../userManager/service/LJUserService.java | 2 +- .../service/impl/LJUserServiceImpl.java | 17 ++++- .../business/userManager/vo/LJUserVos.java | 0 7 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVos.java 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 0e207b819..f3dffe356 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 @@ -178,8 +178,8 @@ public class CardGiftServiceImpl extends ServiceImpl i //会员信息 // LJUserVo ljUserVo = ljUserMapper.selectUserById(userId); // UserBalance userBalance = userBalanceService.selectUserBalance(userId,ljUserVo.getChainStoreId()); - MtStore store = storeService.getById(cardGift.getStoreId()); - UserBalance userBalance = userBalanceService.selectUserBalance(userId,store.getChainStoreId()); + //MtStore store = storeService.getById(cardGift.getStoreId()); + UserBalance userBalance = userBalanceService.selectUserBalance(userId,TokenUtil.getNowAccountInfo().getChainStoreId()); Double cardBalance = userBalance.getCardBalance(); BigDecimal bigDecimal = BigDecimal.valueOf(cardAmount); BigDecimal bigDecimal1 = BigDecimal.valueOf(cardBalance); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java index 10cccaded..007112f7f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java @@ -48,6 +48,22 @@ public class LJUserController extends BaseController { return getSuccessResult(list); } + /** + * 查询不活跃会员信息 + * @param user + * @param pageNo + * @param pageSize + * @return + */ + @GetMapping("/getUserList") + public ResponseObject getUserList(LJUserVo user, + @RequestParam(value = "page",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ + Page page =new Page(pageNo,pageSize); + IPage list = userService.getUserList(page,user); + return getSuccessResult(list); + } + /** * 获取当前登录用户信息 * @return 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 45a87f60e..52b0ef501 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 @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.userManager.entity.LJUser; import com.fuint.business.userManager.vo.LJUserVo; import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -20,6 +19,7 @@ public interface LJUserMapper extends BaseMapper { * @return */ public IPage selectUserList(Page page, @Param("user") LJUserVo user); + public IPage getUserList(Page page, @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 0b09afe52..135c28ab7 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 @@ -5,8 +5,8 @@ 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, mi.storeId,mi.staffId,mi.inviterId,mub.chain_store_id from mt_user mu - inner join mt_user_balance mub on mu.id = mub.mt_user_id - inner join mt_invitation mi on mu.id = mi.userId + inner join mt_user_balance mub on mu.id = mub.mt_user_id + inner join mt_invitation mi on mu.id = mi.userId select mu.*,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.refuel_money, @@ -15,9 +15,23 @@ LEFT JOIN mt_user_balance mub ON mu.id = mub.mt_user_id - + 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 + oo.create_time <= DATE_SUB(NOW(), INTERVAL 14 DAY) and mub.chain_store_id = #{user.chainStoreId} @@ -52,15 +66,51 @@ and date_format(mu.create_time,'%y%m%d') <= date_format(#{user.params.endTime},'%y%m%d') + GROUP BY mu.id + ORDER BY oo.create_time desc - + + + + - + 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,mub.chain_store_id from mt_user mu - inner join mt_user_balance mub on mu.id = mub.mt_user_id + mub.second_card,mub.fixing_level,mub.chain_store_id from mt_user mu + inner join mt_user_balance mub on mu.id = mub.mt_user_id mu.mobile = #{mobile} and mub.chain_store_id = #{chainStoreId} @@ -105,9 +155,9 @@ mub.growth_value growthValue, mub.refuel_money refuelMoney from mt_user mu - left join mt_user_balance mub on mu.id = mub.mt_user_id + left join mt_user_balance mub on mu.id = mub.mt_user_id where mu.id = #{userId} - limit 1 + limit 1 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 c12ff8080..15e752271 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 @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.userManager.entity.LJUser; import com.fuint.business.userManager.vo.LJUserVo; - import java.util.List; import java.util.Map; @@ -19,6 +18,7 @@ public interface LJUserService extends IService { * @return */ public IPage selectUserList(Page page, LJUserVo user); + public IPage getUserList(Page page, 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 83f72cae8..028f9821b 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 @@ -10,7 +10,6 @@ import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValud import com.fuint.business.storeInformation.entity.LJStore; import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.business.userManager.entity.*; -import com.fuint.business.userManager.mapper.CertifiedMemberMapper; import com.fuint.business.userManager.mapper.LJUserMapper; import com.fuint.business.userManager.mapper.MtInvitationMapper; import com.fuint.business.userManager.service.*; @@ -21,7 +20,6 @@ import com.fuint.common.util.TokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; - import javax.annotation.Resource; import java.util.*; @@ -53,6 +51,21 @@ public class LJUserServiceImpl extends ServiceImpl impleme return ljUserIPage; } + /** + * 根据条件分页查询会员信息 + * @param page + * @param user + * @return + */ + @Override + public IPage getUserList(Page page, LJUserVo user) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId()); + user.setChainStoreId(store.getChainStoreId()); + IPage ljUserIPage = baseMapper.getUserList(page, user); + return ljUserIPage; + } + @Override public Integer userNum(Integer storeId) { // 构建查询条件 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVos.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVos.java new file mode 100644 index 000000000..e69de29bb