dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新9.24

Browse Source
This commit is contained in:
许允枞 2024-09-24 11:23:34 +08:00
parent eb127ee084
commit 4e4621e815
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetMemberServiceImpl.java
View File

@ -41,7 +41,7 @@ public class FleetMemberServiceImpl extends ServiceImpl<FleetMemberMapper,FleetM
} }
@Override @Override
public IPage<FleetMemberVo> queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) { public IPage<FleetMemberVo> queryPageByNameOrMobile(Page page, FleetMemberVo fleetMember) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); // AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
return baseMapper.queryPageByNameOrMobile(page,fleetMember); return baseMapper.queryPageByNameOrMobile(page,fleetMember);
} }

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml
View File

@ -89,10 +89,12 @@
ig.used_inventory, ig.used_inventory,
ig.market, ig.market,
igc.category_name, igc.category_name,
ms.name storeName,
mg.name goodsName mg.name goodsName
from integral_gift ig from integral_gift ig
left join integral_gift_category igc ON ig.category_id = igc.id 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 (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
<where> <where>
ig.store_id = #{integralGift.storeId} ig.store_id = #{integralGift.storeId}
and ig.remaining_inventory >0 and ig.remaining_inventory >0

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java
View File

@ -9,6 +9,7 @@ public class IntegralGiftVO extends IntegralGift {
private String categoryName; private String categoryName;
private String goodsName; private String goodsName;
private Boolean ifRedemptionIsOnline; private Boolean ifRedemptionIsOnline;
private String storeName;
// 商品 // 商品
// 优惠卷 // 优惠卷
} }