diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java index fc72c1a4..aeed3293 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java @@ -19,8 +19,9 @@ import java.time.LocalDateTime; */ public interface ShopUserMapper extends BaseMapper { - Page selectPageByKeyAndIsVip(Page objectPage, @Param("key") String key, @Param("isVip") Integer isVip, - @Param("shopId") Long shopId); + Page selectPageByKeyAndIsVip(); + + long selectPageByKeyAndIsVip_COUNT(); int incrAccount(@Param("shopId") long shopId, @Param("id") Long id, @Param("time") LocalDateTime time, @Param("money") BigDecimal money); int decrAccount(@Param("shopId") long shopId, @Param("id") Long id, @Param("time") LocalDateTime time, @Param("money") BigDecimal money); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index b71c3d7b..3d0be751 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; import com.czg.account.dto.shopuser.*; import com.czg.account.entity.ShopUser; import com.czg.account.entity.ShopUserFlow; @@ -20,6 +21,8 @@ import com.czg.service.account.mapper.ShopUserMapper; import com.czg.utils.AssertUtil; import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryCondition; +import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboService; @@ -27,6 +30,8 @@ import org.springframework.stereotype.Service; import java.math.RoundingMode; +import static com.mybatisflex.core.query.QueryMethods.column; + /** * 商户储值会员 服务层实现。 * @@ -53,7 +58,15 @@ public class ShopUserServiceImpl extends ServiceImpl i @Override public Page getPage(String key, Integer isVip) { - return mapper.selectPageByKeyAndIsVip(PageUtil.buildPage(), key, isVip, StpKit.USER.getShopId()); + QueryWrapper queryWrapper = new QueryWrapper().eq(ShopUser::getShopId, StpKit.USER.getShopId()); + if (StrUtil.isNotBlank(key)) { + queryWrapper.and(column(UserInfo::getNickName).like(key).or(column(UserInfo::getPhone).like(key))); + } + + if (isVip != null) { + queryWrapper.eq(ShopUser::getIsVip, isVip); + } + return mapper.xmlPaginate("selectPageByKeyAndIsVip", PageUtil.buildPage(), queryWrapper); } @Override diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index a8e8eb02..4b363035 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -19,17 +19,7 @@ and amount - #{money} >= 0 - + + +