From 0d0623276bc69b8fbd53fc9c688a255ef109b79e Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 9 Jun 2023 13:52:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/service/order/impl/StoreOrderServiceImpl.java | 10 ++++------ .../controller/app/auth/vo/AppAuthSmsLoginReqVO.java | 2 +- .../member/controller/app/user/AppUserController.java | 1 - .../member/service/promoter/PromoterServiceImpl.java | 3 +++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index 3b61c1568..69acf57f8 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -1282,11 +1282,6 @@ public class StoreOrderServiceImpl extends ServiceImpl infoDOS = rechargeOrderInfoMapper.selectList(Wrappers.lambdaQuery().eq(RechargeOrderInfoDO::getOrderNo, orderId)); List recordDOS = new ArrayList<>(); @@ -1522,7 +1517,7 @@ public class StoreOrderServiceImpl extends ServiceImpl lqw = Wrappers.lambdaQuery(); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java index 141726e60..f45c0d307 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java @@ -29,7 +29,7 @@ public class AppAuthSmsLoginReqVO { @Schema(description = "手机号", required = true, example = "15601691300") @NotEmpty(message = "手机号不能为空") - @Pattern(regexp = "^[1][3,4,5,7,8][0,1,2,3,4,5,6,7,8,9][0-9]{8}$",message = "手机号不正确") + @Pattern(regexp = "^[1][3,4,5,7,8,9][1,2,4,5,6,7,8,9][0-9]{8}$",message = "手机号不正确") private String mobile; /** * 推广员id diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java index d2a3b545b..d3a65f272 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java @@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated; import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore; import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.AppPromoterCreateReqVO; -import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterCreateReqVO; import cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO; import cn.iocoder.yudao.module.member.controller.admin.user.vo.AppUserInfoReqVO; import cn.iocoder.yudao.module.member.controller.app.user.vo.AppUserInfoRespVO; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java index 26f21e461..477c28494 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java @@ -105,6 +105,9 @@ public class PromoterServiceImpl implements PromoterService { memberUserDO.setStatus(createReqVO.getStatus()); memberUserDO.setPassword(createReqVO.getMobile().substring(createReqVO.getMobile().length() - 6)); memberUserDO = memberUserService.createUserIfAbsent(createReqVO.getMobile(), createReqVO.getNickname(), getClientIP()); + } else { + memberUserDO.setNickname(createReqVO.getNickname()); + memberUserService.updateById(memberUserDO); } if(!TenantContextHolder.getTenantId().equals(memberUserDO.getTenantId())){ throw new ServiceException(PROMOTER_EXISTS_OTHER); From cf9be203b137a54641d2b8e7c62c02c9dc0f9e9d Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 9 Jun 2023 14:32:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/service/recharge/RechargeOrderServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index dbd7577dd..eee8767fb 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -202,7 +202,8 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { Assert.notNull(loginUser, "登录失效,请重新登录!"); List orderDOS = rechargeOrderMapper.selectList(Wrappers.lambdaQuery() .eq(RechargeOrderDO::getUid, loginUser.getId()) - .ne(RechargeOrderDO::getPaid, 1) + .eq(RechargeOrderDO::getPaid, 1) + .eq(RechargeOrderDO::getRefundStatus, 0) .orderByDesc(RechargeOrderDO::getCreateTime)); if (!CollectionUtils.isEmpty(orderDOS)) { List rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS); @@ -317,7 +318,9 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { @Override public List memberOrderInfoByPhone(String phone) { List orderDOS = rechargeOrderMapper.selectList(Wrappers.lambdaQuery() - .eq(RechargeOrderDO::getUserPhone, phone).eq(RechargeOrderDO::getPaid, 1)); + .eq(StringUtils.isNotBlank(phone), RechargeOrderDO::getUserPhone, phone) + .eq(RechargeOrderDO::getRefundStatus, 0) + .eq(RechargeOrderDO::getPaid, 1)); if (!CollectionUtils.isEmpty(orderDOS)) { List rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS); List collect1 = rechargeOrderRespVOS.stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList());