From 4e4621e815cf0837ac9744c49fa5480883e0f032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Tue, 24 Sep 2024 11:23:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B09.24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/fleet/service/impl/FleetMemberServiceImpl.java | 2 +- .../fuint/business/integral/mapper/xml/IntegralGiftMapper.xml | 2 ++ .../java/com/fuint/business/integral/vo/IntegralGiftVO.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java index d86bad434..3fdf38dc9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java @@ -41,7 +41,7 @@ public class FleetMemberServiceImpl extends ServiceImpl queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); +// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); return baseMapper.queryPageByNameOrMobile(page,fleetMember); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml index eeb764e6c..83ac7b0c8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml @@ -89,10 +89,12 @@ ig.used_inventory, ig.market, igc.category_name, + ms.name storeName, mg.name goodsName from integral_gift ig left join integral_gift_category igc ON ig.category_id = igc.id left join (select * from mt_goods where stock >0) mg ON ig.goods_id = mg.id + left join mt_store ms on ig.store_id = ms.id ig.store_id = #{integralGift.storeId} and ig.remaining_inventory >0 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java index 1b57741d6..3e2840831 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java @@ -9,6 +9,7 @@ public class IntegralGiftVO extends IntegralGift { private String categoryName; private String goodsName; private Boolean ifRedemptionIsOnline; + private String storeName; // 商品 // 优惠卷 }