fix bug
This commit is contained in:
@ -25,7 +25,7 @@ public class MemberUserNowMoneyApiImpl implements MemberUserNowMoneyApi {
|
||||
memberUserService.incMoney(increaseNowMoneyDTO.getId(), increaseNowMoneyDTO.getAmount());
|
||||
// 保存记录
|
||||
userBillService.income(increaseNowMoneyDTO.getId(),
|
||||
"充值", BillDetailEnum.CATEGORY_1.getValue(),
|
||||
increaseNowMoneyDTO.getTitle(), BillDetailEnum.CATEGORY_1.getValue(),
|
||||
BillDetailEnum.TYPE_1.getValue(),
|
||||
increaseNowMoneyDTO.getAmount(),
|
||||
increaseNowMoneyDTO.getAmount(),
|
||||
|
@ -10,6 +10,7 @@ package co.yixiang.yshop.module.member.controller.app.address;
|
||||
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import co.yixiang.yshop.framework.common.pojo.CommonResult;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.framework.ip.core.Area;
|
||||
import co.yixiang.yshop.framework.ip.core.utils.AreaUtils;
|
||||
import co.yixiang.yshop.framework.security.core.annotations.PreAuthenticated;
|
||||
@ -107,8 +108,8 @@ public class AppUserAddressController {
|
||||
@PreAuthenticated
|
||||
@GetMapping("/list")
|
||||
@Operation(summary = "用户地址列表")
|
||||
public CommonResult<List<AppUserAddressQueryVo>> getYxUserAddressPageList(@RequestParam(value = "page", defaultValue = "1") int page,
|
||||
@RequestParam(value = "limit", defaultValue = "10") int limit) {
|
||||
public CommonResult<PageResult<AppUserAddressQueryVo>> getYxUserAddressPageList(@RequestParam(value = "page", defaultValue = "1") int page,
|
||||
@RequestParam(value = "limit", defaultValue = "10") int limit) {
|
||||
Long uid = getLoginUserId();
|
||||
return success(appUserAddressService.getList(uid, page, limit));
|
||||
}
|
||||
|
@ -32,4 +32,6 @@ public interface UserAddressConvert {
|
||||
|
||||
PageResult<UserAddressRespVO> convertPage(PageResult<UserAddressDO> page);
|
||||
|
||||
PageResult<AppUserAddressQueryVo> convertQueryPage(PageResult<UserAddressDO> page);
|
||||
|
||||
}
|
||||
|
@ -1,5 +1,6 @@
|
||||
package co.yixiang.yshop.module.member.service.useraddress;
|
||||
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.module.member.controller.app.address.param.AppAddressParam;
|
||||
import co.yixiang.yshop.module.member.controller.app.address.vo.AppUserAddressQueryVo;
|
||||
import co.yixiang.yshop.module.member.dal.dataobject.useraddress.UserAddressDO;
|
||||
@ -39,6 +40,6 @@ public interface AppUserAddressService extends IService<UserAddressDO> {
|
||||
* @param limit limit
|
||||
* @return List
|
||||
*/
|
||||
List<AppUserAddressQueryVo> getList(Long uid, int page, int limit);
|
||||
PageResult<AppUserAddressQueryVo> getList(Long uid, int page, int limit);
|
||||
|
||||
}
|
||||
|
@ -3,6 +3,8 @@ package co.yixiang.yshop.module.member.service.useraddress;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import co.yixiang.yshop.framework.common.enums.ShopCommonEnum;
|
||||
import co.yixiang.yshop.framework.common.pojo.PageResult;
|
||||
import co.yixiang.yshop.module.member.controller.admin.useraddress.vo.UserAddressPageReqVO;
|
||||
import co.yixiang.yshop.module.member.controller.app.address.param.AppAddressParam;
|
||||
import co.yixiang.yshop.module.member.controller.app.address.vo.AppUserAddressQueryVo;
|
||||
import co.yixiang.yshop.module.member.convert.useraddress.UserAddressConvert;
|
||||
@ -104,11 +106,12 @@ public class AppUserAddressServiceImpl extends ServiceImpl<UserAddressMapper, Us
|
||||
* @return List
|
||||
*/
|
||||
@Override
|
||||
public List<AppUserAddressQueryVo> getList(Long uid, int page, int limit) {
|
||||
Page<UserAddressDO> pageModel = new Page<>(page, limit);
|
||||
IPage<UserAddressDO> pageList = this.lambdaQuery().eq(UserAddressDO::getUid, uid)
|
||||
.orderByDesc(UserAddressDO::getIsDefault).page(pageModel);
|
||||
return UserAddressConvert.INSTANCE.convertList02(pageList.getRecords());
|
||||
public PageResult<AppUserAddressQueryVo> getList(Long uid, int page, int limit) {
|
||||
UserAddressPageReqVO reqVO = new UserAddressPageReqVO();
|
||||
reqVO.setUid(uid);
|
||||
reqVO.setPageNo(page);
|
||||
reqVO.setPageSize(limit);
|
||||
return UserAddressConvert.INSTANCE.convertQueryPage(userAddressMapper.selectPage(reqVO));
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user