BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 728308cbc0bd1ade3086c8459f75290caa38bd37

Authored by YunaiV
1 parent 94c2ad5d

member：优化部分变量的命名

Inline Side-by-side
Showing 25 changed files with 80 additions and 87 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/mq/message/coupon/UserCreateMessage.java
  View file @728308c
... ... @@ -23,7 +23,7 @@ public class UserCreateMessage extends AbstractStreamMessage {
23 23  
24 24 @Override
25 25 public String getStreamKey() {
26   - return "member.create.send";
  26 + return "member.user.create";
27 27 }
28 28  
29 29 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @728308c
... ... @@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
7 7 import cn.iocoder.yudao.framework.common.util.string.StrUtils;
8 8 import cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils;
9 9 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
10   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  10 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
11 11 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
12 12 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
13 13 import cn.iocoder.yudao.module.pay.enums.DictTypeConstants;
... ... @@ -241,7 +241,7 @@ public interface TradeOrderConvert {
241 241 return reqBO;
242 242 }
243 243  
244   - default AppTradeOrderSettlementRespVO convert(TradePriceCalculateRespBO calculate, AddressRespDTO address) {
  244 + default AppTradeOrderSettlementRespVO convert(TradePriceCalculateRespBO calculate, MemberAddressRespDTO address) {
245 245 AppTradeOrderSettlementRespVO respVO = convert0(calculate, address);
246 246 if (address != null) {
247 247 respVO.getAddress().setAreaName(AreaUtils.format(address.getAreaId()));
... ... @@ -249,7 +249,7 @@ public interface TradeOrderConvert {
249 249 return respVO;
250 250 }
251 251  
252   - AppTradeOrderSettlementRespVO convert0(TradePriceCalculateRespBO calculate, AddressRespDTO address);
  252 + AppTradeOrderSettlementRespVO convert0(TradePriceCalculateRespBO calculate, MemberAddressRespDTO address);
253 253  
254 254 List<AppOrderExpressTrackRespDTO> convertList02(List<ExpressTrackRespDTO> list);
255 255  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @728308c
... ... @@ -11,8 +11,8 @@ import cn.iocoder.yudao.framework.common.core.KeyValue;
11 11 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
12 12 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
13 13 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
14   -import cn.iocoder.yudao.module.member.api.address.AddressApi;
15   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  14 +import cn.iocoder.yudao.module.member.api.address.MemberAddressApi;
  15 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
16 16 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
17 17 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
18 18 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO;
... ... @@ -98,7 +98,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
98 98 @Resource
99 99 private PayOrderApi payOrderApi;
100 100 @Resource
101   - private AddressApi addressApi;
  101 + private MemberAddressApi addressApi;
102 102 @Resource
103 103 private ProductCommentApi productCommentApi;
104 104  
... ... @@ -110,7 +110,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
110 110 @Override
111 111 public AppTradeOrderSettlementRespVO settlementOrder(Long userId, AppTradeOrderSettlementReqVO settlementReqVO) {
112 112 // 1. 获得收货地址
113   - AddressRespDTO address = getAddress(userId, settlementReqVO.getAddressId());
  113 + MemberAddressRespDTO address = getAddress(userId, settlementReqVO.getAddressId());
114 114 if (address != null) {
115 115 settlementReqVO.setAddressId(address.getId());
116 116 }
... ... @@ -129,7 +129,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
129 129 * @param addressId 地址编号
130 130 * @return 地址
131 131 */
132   - private AddressRespDTO getAddress(Long userId, Long addressId) {
  132 + private MemberAddressRespDTO getAddress(Long userId, Long addressId) {
133 133 if (addressId != null) {
134 134 return addressApi.getAddress(addressId, userId);
135 135 }
... ... @@ -193,7 +193,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
193 193 // 物流信息
194 194 order.setDeliveryType(createReqVO.getDeliveryType());
195 195 if (Objects.equals(createReqVO.getDeliveryType(), DeliveryTypeEnum.EXPRESS.getType())) {
196   - AddressRespDTO address = addressApi.getAddress(createReqVO.getAddressId(), userId);
  196 + MemberAddressRespDTO address = addressApi.getAddress(createReqVO.getAddressId(), userId);
197 197 Assert.notNull(address, "地址({}) 不能为空", createReqVO.getAddressId()); // 价格计算时，已经计算
198 198 order.setReceiverName(address.getName()).setReceiverMobile(address.getMobile())
199 199 .setReceiverAreaId(address.getAreaId()).setReceiverDetailAddress(address.getDetailAddress());
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
  View file @728308c
... ... @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.lang.Assert;
5 5 import cn.hutool.core.util.StrUtil;
6 6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7   -import cn.iocoder.yudao.module.member.api.address.AddressApi;
8   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  7 +import cn.iocoder.yudao.module.member.api.address.MemberAddressApi;
  8 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
9 9 import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
10 10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
11 11 import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryExpressChargeModeEnum;
... ... @@ -41,7 +41,7 @@ import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
41 41 public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
42 42  
43 43 @Resource
44   - private AddressApi addressApi;
  44 + private MemberAddressApi addressApi;
45 45  
46 46 @Resource
47 47 private DeliveryPickUpStoreService deliveryPickUpStoreService;
... ... @@ -81,7 +81,7 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
81 81 // 价格计算时，如果为空就不算~最终下单，会校验该字段不允许空
82 82 return;
83 83 }
84   - AddressRespDTO address = addressApi.getAddress(param.getAddressId(), param.getUserId());
  84 + MemberAddressRespDTO address = addressApi.getAddress(param.getAddressId(), param.getUserId());
85 85 Assert.notNull(address, "收件人({})的地址，不能为空", param.getUserId());
86 86  
87 87 // 情况一：全局包邮
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
  View file @728308c
... ... @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.trade.service.order;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
4 4 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
5   -import cn.iocoder.yudao.module.member.api.address.AddressApi;
6   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  5 +import cn.iocoder.yudao.module.member.api.address.MemberAddressApi;
  6 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
7 7 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
8 8 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
9 9 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO;
... ... @@ -77,7 +77,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest {
77 77 @MockBean
78 78 private PayOrderApi payOrderApi;
79 79 @MockBean
80   - private AddressApi addressApi;
  80 + private MemberAddressApi addressApi;
81 81 @MockBean
82 82 private CouponApi couponApi;
83 83  
... ... @@ -116,7 +116,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest {
116 116 .setStatus(ProductSpuStatusEnum.ENABLE.getStatus()));
117 117 when(productSpuApi.getSpuList(eq(asSet(11L, 21L)))).thenReturn(Arrays.asList(spu01, spu02));
118 118 // mock 方法（用户收件地址的校验）
119   - AddressRespDTO addressRespDTO = new AddressRespDTO().setId(10L).setUserId(userId).setName("芋艿")
  119 + MemberAddressRespDTO addressRespDTO = new MemberAddressRespDTO().setId(10L).setUserId(userId).setName("芋艿")
120 120 .setMobile("15601691300").setAreaId(3306).setDetailAddress("土豆村");
121 121 when(addressApi.getAddress(eq(10L), eq(userId))).thenReturn(addressRespDTO);
122 122 // mock 方法（价格计算）
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java
  View file @728308c
... ... @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.trade.service.price.calculator;
2 2  
3 3 import cn.hutool.core.map.MapUtil;
4 4 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
5   -import cn.iocoder.yudao.module.member.api.address.AddressApi;
6   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  5 +import cn.iocoder.yudao.module.member.api.address.MemberAddressApi;
  6 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
7 7 import cn.iocoder.yudao.module.trade.dal.dataobject.config.TradeConfigDO;
8 8 import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryExpressChargeModeEnum;
9 9 import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
... ... @@ -38,7 +38,7 @@ public class TradeDeliveryPriceCalculatorTest extends BaseMockitoUnitTest {
38 38 private TradeDeliveryPriceCalculator calculator;
39 39  
40 40 @Mock
41   - private AddressApi addressApi;
  41 + private MemberAddressApi addressApi;
42 42  
43 43 @Mock
44 44 private DeliveryExpressTemplateService deliveryExpressTemplateService;
... ... @@ -80,7 +80,7 @@ public class TradeDeliveryPriceCalculatorTest extends BaseMockitoUnitTest {
80 80 TradePriceCalculatorHelper.recountAllPrice(resultBO);
81 81  
82 82 // 准备收件地址数据
83   - AddressRespDTO addressResp = randomPojo(AddressRespDTO.class, item -> item.setAreaId(10));
  83 + MemberAddressRespDTO addressResp = randomPojo(MemberAddressRespDTO.class, item -> item.setAreaId(10));
84 84 when(addressApi.getAddress(eq(10L), eq(1L))).thenReturn(addressResp);
85 85  
86 86 // 准备运费模板费用配置数据
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/AddressApi.java renamed to yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApi.java
  View file @728308c
1 1 package cn.iocoder.yudao.module.member.api.address;
2 2  
3   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  3 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
4 4  
5 5 /**
6 6 * 用户收件地址 API 接口
7 7 *
8 8 * @author 芋道源码
9 9 */
10   -public interface AddressApi {
  10 +public interface MemberAddressApi {
11 11  
12 12 /**
13 13 * 获得用户收件地址
... ... @@ -16,7 +16,7 @@ public interface AddressApi {
16 16 * @param userId 用户编号
17 17 * @return 用户收件地址
18 18 */
19   - AddressRespDTO getAddress(Long id, Long userId);
  19 + MemberAddressRespDTO getAddress(Long id, Long userId);
20 20  
21 21 /**
22 22 * 获得用户默认收件地址
... ... @@ -24,6 +24,6 @@ public interface AddressApi {
24 24 * @param userId 用户编号
25 25 * @return 用户收件地址
26 26 */
27   - AddressRespDTO getDefaultAddress(Long userId);
  27 + MemberAddressRespDTO getDefaultAddress(Long userId);
28 28  
29 29 }
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/AddressRespDTO.java renamed to yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/MemberAddressRespDTO.java
  View file @728308c
... ... @@ -8,7 +8,7 @@ import lombok.Data;
8 8 * @author 芋道源码
9 9 */
10 10 @Data
11   -public class AddressRespDTO {
  11 +public class MemberAddressRespDTO {
12 12  
13 13 /**
14 14 * 编号
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/AddressApiImpl.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApiImpl.java
  View file @728308c
1 1 package cn.iocoder.yudao.module.member.api.address;
2 2  
3   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  3 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
4 4 import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
5 5 import cn.iocoder.yudao.module.member.service.address.AddressService;
6 6 import org.springframework.stereotype.Service;
... ... @@ -15,18 +15,18 @@ import javax.annotation.Resource;
15 15 */
16 16 @Service
17 17 @Validated
18   -public class AddressApiImpl implements AddressApi {
  18 +public class MemberAddressApiImpl implements MemberAddressApi {
19 19  
20 20 @Resource
21 21 private AddressService addressService;
22 22  
23 23 @Override
24   - public AddressRespDTO getAddress(Long id, Long userId) {
  24 + public MemberAddressRespDTO getAddress(Long id, Long userId) {
25 25 return AddressConvert.INSTANCE.convert02(addressService.getAddress(userId, id));
26 26 }
27 27  
28 28 @Override
29   - public AddressRespDTO getDefaultAddress(Long userId) {
  29 + public MemberAddressRespDTO getDefaultAddress(Long userId) {
30 30 return AddressConvert.INSTANCE.convert02(addressService.getDefaultUserAddress(userId));
31 31 }
32 32  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointRecordController.java
  View file @728308c
... ... @@ -2,13 +2,13 @@ package cn.iocoder.yudao.module.member.controller.admin.point;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
6   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 5 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
8 6 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
9 7 import cn.iocoder.yudao.module.member.convert.point.MemberPointRecordConvert;
10 8 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
  9 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
11 10 import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
  11 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
12 12 import io.swagger.v3.oas.annotations.Operation;
13 13 import io.swagger.v3.oas.annotations.tags.Tag;
14 14 import org.springframework.security.access.prepost.PreAuthorize;
... ... @@ -35,7 +35,7 @@ public class MemberPointRecordController {
35 35 private MemberPointRecordService pointRecordService;
36 36  
37 37 @Resource
38   - private MemberUserApi memberUserApi;
  38 + private MemberUserService memberUserService;
39 39  
40 40 @GetMapping("/page")
41 41 @Operation(summary = "获得用户积分记录分页")
... ... @@ -48,7 +48,7 @@ public class MemberPointRecordController {
48 48 }
49 49  
50 50 // 拼接结果返回
51   - List<MemberUserRespDTO> users = memberUserApi.getUserList(
  51 + List<MemberUserDO> users = memberUserService.getUserList(
52 52 convertSet(pageResult.getList(), MemberPointRecordDO::getUserId));
53 53 return success(MemberPointRecordConvert.INSTANCE.convertPage(pageResult, users));
54 54 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInRecordController.java
  View file @728308c
... ... @@ -2,13 +2,13 @@ package cn.iocoder.yudao.module.member.controller.admin.signin;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
6   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 5 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
8 6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
9 7 import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
10 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  9 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
11 10 import cn.iocoder.yudao.module.member.service.signin.MemberSignInRecordService;
  11 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
12 12 import io.swagger.v3.oas.annotations.Operation;
13 13 import io.swagger.v3.oas.annotations.tags.Tag;
14 14 import org.springframework.security.access.prepost.PreAuthorize;
... ... @@ -35,7 +35,7 @@ public class MemberSignInRecordController {
35 35 private MemberSignInRecordService signInRecordService;
36 36  
37 37 @Resource
38   - private MemberUserApi memberUserApi;
  38 + private MemberUserService memberUserService;
39 39  
40 40 @GetMapping("/page")
41 41 @Operation(summary = "获得签到记录分页")
... ... @@ -48,7 +48,7 @@ public class MemberSignInRecordController {
48 48 }
49 49  
50 50 // 拼接结果返回
51   - List<MemberUserRespDTO> users = memberUserApi.getUserList(
  51 + List<MemberUserDO> users = memberUserService.getUserList(
52 52 convertSet(pageResult.getList(), MemberSignInRecordDO::getUserId));
53 53 return success(MemberSignInRecordConvert.INSTANCE.convertPage(pageResult, users));
54 54 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
  View file @728308c
1 1 package cn.iocoder.yudao.module.member.convert.address;
2 2  
3 3 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
4   -import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
  4 +import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
5 5 import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
6 6 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
7 7 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO;
... ... @@ -33,7 +33,7 @@ public interface AddressConvert {
33 33  
34 34 List<AppAddressRespVO> convertList(List<MemberAddressDO> list);
35 35  
36   - AddressRespDTO convert02(MemberAddressDO bean);
  36 + MemberAddressRespDTO convert02(MemberAddressDO bean);
37 37  
38 38 @Named("convertAreaIdToAreaName")
39 39 default String convertAreaIdToAreaName(Integer areaId) {
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/point/MemberPointRecordConvert.java
  View file @728308c
... ... @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.member.convert.point;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
5   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 5 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
7 6 import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
8 7 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
9 9 import org.mapstruct.Mapper;
10 10 import org.mapstruct.factory.Mappers;
11 11  
... ... @@ -24,10 +24,10 @@ public interface MemberPointRecordConvert {
24 24  
25 25 MemberPointRecordConvert INSTANCE = Mappers.getMapper(MemberPointRecordConvert.class);
26 26  
27   - default PageResult<MemberPointRecordRespVO> convertPage(PageResult<MemberPointRecordDO> pageResult, List<MemberUserRespDTO> users) {
  27 + default PageResult<MemberPointRecordRespVO> convertPage(PageResult<MemberPointRecordDO> pageResult, List<MemberUserDO> users) {
28 28 PageResult<MemberPointRecordRespVO> voPageResult = convertPage(pageResult);
29 29 // user 拼接
30   - Map<Long, MemberUserRespDTO> userMap = convertMap(users, MemberUserRespDTO::getId);
  30 + Map<Long, MemberUserDO> userMap = convertMap(users, MemberUserDO::getId);
31 31 voPageResult.getList().forEach(record -> MapUtils.findAndThen(userMap, record.getUserId(),
32 32 memberUserRespDTO -> record.setNickname(memberUserRespDTO.getNickname())));
33 33 return voPageResult;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
  View file @728308c
... ... @@ -4,11 +4,11 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.util.ObjUtil;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
7   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8 7 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
9 8 import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
10 9 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
11 10 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  11 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
12 12 import org.mapstruct.Mapper;
13 13 import org.mapstruct.factory.Mappers;
14 14  
... ... @@ -29,10 +29,10 @@ public interface MemberSignInRecordConvert {
29 29  
30 30 MemberSignInRecordConvert INSTANCE = Mappers.getMapper(MemberSignInRecordConvert.class);
31 31  
32   - default PageResult<MemberSignInRecordRespVO> convertPage(PageResult<MemberSignInRecordDO> pageResult, List<MemberUserRespDTO> users) {
  32 + default PageResult<MemberSignInRecordRespVO> convertPage(PageResult<MemberSignInRecordDO> pageResult, List<MemberUserDO> users) {
33 33 PageResult<MemberSignInRecordRespVO> voPageResult = convertPage(pageResult);
34 34 // user 拼接
35   - Map<Long, MemberUserRespDTO> userMap = convertMap(users, MemberUserRespDTO::getId);
  35 + Map<Long, MemberUserDO> userMap = convertMap(users, MemberUserDO::getId);
36 36 voPageResult.getList().forEach(record -> MapUtils.findAndThen(userMap, record.getUserId(),
37 37 memberUserRespDTO -> record.setNickname(memberUserRespDTO.getNickname())));
38 38 return voPageResult;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/message/user/UserCreateMessage.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/message/user/MemberUserCreateMessage.java
  View file @728308c
... ... @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
13 13 */
14 14 @Data
15 15 @EqualsAndHashCode(callSuper = true)
16   -public class UserCreateMessage extends AbstractStreamMessage {
  16 +public class MemberUserCreateMessage extends AbstractStreamMessage {
17 17  
18 18 /**
19 19 * 用户编号
... ... @@ -23,7 +23,7 @@ public class UserCreateMessage extends AbstractStreamMessage {
23 23  
24 24 @Override
25 25 public String getStreamKey() {
26   - return "member.create.send";
  26 + return "member.user.create";
27 27 }
28 28  
29 29 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/producer/user/UserCreateProducer.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/mq/producer/user/MemberUserProducer.java
  View file @728308c
1 1 package cn.iocoder.yudao.module.member.mq.producer.user;
2 2  
3 3 import cn.iocoder.yudao.framework.mq.core.RedisMQTemplate;
4   -import cn.iocoder.yudao.module.member.mq.message.user.UserCreateMessage;
  4 +import cn.iocoder.yudao.module.member.mq.message.user.MemberUserCreateMessage;
5 5 import lombok.extern.slf4j.Slf4j;
6 6 import org.springframework.stereotype.Component;
7 7  
8 8 import javax.annotation.Resource;
9 9  
10 10 /**
11   - * 会员用户创建 Producer
  11 + * 会员用户 Producer
12 12 *
13 13 * @author owen
14 14 */
15 15 @Slf4j
16 16 @Component
17   -public class UserCreateProducer {
  17 +public class MemberUserProducer {
18 18  
19 19 @Resource
20 20 private RedisMQTemplate redisMQTemplate;
21 21  
22 22 /**
23   - * 发送 {@link UserCreateMessage} 消息
  23 + * 发送 {@link MemberUserCreateMessage} 消息
24 24 *
25 25 * @param userId 用户编号
26 26 */
27 27 public void sendUserCreateMessage(Long userId) {
28   - redisMQTemplate.send(new UserCreateMessage().setUserId(userId));
  28 + redisMQTemplate.send(new MemberUserCreateMessage().setUserId(userId));
29 29 }
30 30  
31 31 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @728308c
... ... @@ -7,18 +7,18 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
7 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 8 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
9 9 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
10   -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
11   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
12 10 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
13 11 import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
14 12 import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
15 13 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
16 14 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  15 +import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
17 16 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
18 17 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
19 18 import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
20 19 import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
21 20 import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
  21 +import cn.iocoder.yudao.module.member.service.user.MemberUserService;
22 22 import org.apache.commons.lang3.StringUtils;
23 23 import org.springframework.stereotype.Service;
24 24 import org.springframework.transaction.annotation.Transactional;
... ... @@ -53,7 +53,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
53 53 private MemberLevelService memberLevelService;
54 54  
55 55 @Resource
56   - private MemberUserApi memberUserApi;
  56 + private MemberUserService memberUserService;
57 57  
58 58 @Override
59 59 public AppMemberSignInRecordSummaryRespVO getSignInRecordSummary(Long userId) {
... ... @@ -124,12 +124,12 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
124 124 // 根据用户昵称查询出用户ids
125 125 Set<Long> userIds = null;
126 126 if (StringUtils.isNotBlank(pageReqVO.getNickname())) {
127   - List<MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
  127 + List<MemberUserDO> users = memberUserService.getUserListByNickname(pageReqVO.getNickname());
128 128 // 如果查询用户结果为空直接返回无需继续查询
129 129 if (CollUtil.isEmpty(users)) {
130 130 return PageResult.empty();
131 131 }
132   - userIds = convertSet(users, MemberUserRespDTO::getId);
  132 + userIds = convertSet(users, MemberUserDO::getId);
133 133 }
134 134 // 分页查询
135 135 return signInRecordMapper.selectPage(pageReqVO, userIds);
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
  View file @728308c
... ... @@ -7,7 +7,6 @@ import cn.hutool.core.util.ObjectUtil;
7 7 import cn.hutool.core.util.StrUtil;
8 8 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
9 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10   -import cn.iocoder.yudao.module.infra.api.file.FileApi;
11 10 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
12 11 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
13 12 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO;
... ... @@ -18,7 +17,7 @@ import cn.iocoder.yudao.module.member.convert.auth.AuthConvert;
18 17 import cn.iocoder.yudao.module.member.convert.user.MemberUserConvert;
19 18 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
20 19 import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
21   -import cn.iocoder.yudao.module.member.mq.producer.user.UserCreateProducer;
  20 +import cn.iocoder.yudao.module.member.mq.producer.user.MemberUserProducer;
22 21 import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi;
23 22 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
24 23 import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum;
... ... @@ -29,7 +28,6 @@ import org.springframework.stereotype.Service;
29 28 import org.springframework.transaction.annotation.Transactional;
30 29 import org.springframework.transaction.support.TransactionSynchronization;
31 30 import org.springframework.transaction.support.TransactionSynchronizationManager;
32   -import org.springframework.transaction.support.TransactionTemplate;
33 31  
34 32 import javax.annotation.Resource;
35 33 import javax.validation.Valid;
... ... @@ -55,18 +53,13 @@ public class MemberUserServiceImpl implements MemberUserService {
55 53 private MemberUserMapper memberUserMapper;
56 54  
57 55 @Resource
58   - private FileApi fileApi;
59   - @Resource
60 56 private SmsCodeApi smsCodeApi;
61 57  
62 58 @Resource
63 59 private PasswordEncoder passwordEncoder;
64 60  
65 61 @Resource
66   - private UserCreateProducer registerCouponProducer;
67   -
68   - @Resource
69   - private TransactionTemplate transactionTemplate;
  62 + private MemberUserProducer memberUserProducer;
70 63  
71 64 @Override
72 65 public MemberUserDO getUserByMobile(String mobile) {
... ... @@ -107,7 +100,7 @@ public class MemberUserServiceImpl implements MemberUserService {
107 100  
108 101 @Override
109 102 public void afterCommit() {
110   - registerCouponProducer.sendUserCreateMessage(user.getId());
  103 + memberUserProducer.sendUserCreateMessage(user.getId());
111 104 }
112 105  
113 106 });
... ...
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApi.java
  View file @728308c
... ... @@ -14,12 +14,12 @@ public interface SocialClientApi {
14 14 /**
15 15 * 获得社交平台的授权 URL
16 16 *
17   - * @param type 社交平台的类型 {@link SocialTypeEnum}
  17 + * @param socialType 社交平台的类型 {@link SocialTypeEnum}
18 18 * @param userType 用户类型
19 19 * @param redirectUri 重定向 URL
20 20 * @return 社交平台的授权 URL
21 21 */
22   - String getAuthorizeUrl(Integer type, Integer userType, String redirectUri);
  22 + String getAuthorizeUrl(Integer socialType, Integer userType, String redirectUri);
23 23  
24 24 /**
25 25 * 创建微信公众号 JS SDK 初始化所需的签名
... ...
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
  View file @728308c
... ... @@ -35,12 +35,12 @@ public interface SocialUserApi {
35 35 * 在认证信息不正确的情况下，也会抛出 {@link ServiceException} 业务异常
36 36 *
37 37 * @param userType 用户类型
38   - * @param type 社交平台的类型
  38 + * @param socialType 社交平台的类型
39 39 * @param code 授权码
40 40 * @param state state
41 41 * @return 社交用户
42 42 */
43   - SocialUserRespDTO getSocialUser(Integer userType, Integer type,
  43 + SocialUserRespDTO getSocialUser(Integer userType, Integer socialType,
44 44 String code, String state);
45 45  
46 46 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialClientApiImpl.java
  View file @728308c
... ... @@ -24,8 +24,8 @@ public class SocialClientApiImpl implements SocialClientApi {
24 24 private SocialClientService socialClientService;
25 25  
26 26 @Override
27   - public String getAuthorizeUrl(Integer type, Integer userType, String redirectUri) {
28   - return socialClientService.getAuthorizeUrl(type, userType, redirectUri);
  27 + public String getAuthorizeUrl(Integer socialType, Integer userType, String redirectUri) {
  28 + return socialClientService.getAuthorizeUrl(socialType, userType, redirectUri);
29 29 }
30 30  
31 31 @Override
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApiImpl.java
  View file @728308c
... ... @@ -33,8 +33,8 @@ public class SocialUserApiImpl implements SocialUserApi {
33 33 }
34 34  
35 35 @Override
36   - public SocialUserRespDTO getSocialUser(Integer userType, Integer type, String code, String state) {
37   - return socialUserService.getSocialUser(userType, type, code, state);
  36 + public SocialUserRespDTO getSocialUser(Integer userType, Integer socialType, String code, String state) {
  37 + return socialUserService.getSocialUser(userType, socialType, code, state);
38 38 }
39 39  
40 40 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
  View file @728308c
... ... @@ -148,7 +148,8 @@ public class AuthController {
148 148 })
149 149 public CommonResult<String> socialLogin(@RequestParam("type") Integer type,
150 150 @RequestParam("redirectUri") String redirectUri) {
151   - return success(socialClientService.getAuthorizeUrl(type, UserTypeEnum.ADMIN.getValue(), redirectUri));
  151 + return success(socialClientService.getAuthorizeUrl(
  152 + type, UserTypeEnum.ADMIN.getValue(), redirectUri));
152 153 }
153 154  
154 155 @PostMapping("/social-login")
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
  View file @728308c
... ... @@ -16,7 +16,6 @@ import java.util.List;
16 16 */
17 17 public interface SocialUserService {
18 18  
19   - // TODO @芋艿：需要传递 userType
20 19 /**
21 20 * 获得指定用户的社交用户列表
22 21 *
... ... @@ -39,10 +38,10 @@ public interface SocialUserService {
39 38 *
40 39 * @param userId 用户编号
41 40 * @param userType 全局用户类型
42   - * @param type 社交平台的类型 {@link SocialTypeEnum}
  41 + * @param socialType 社交平台的类型 {@link SocialTypeEnum}
43 42 * @param openid 社交平台的 openid
44 43 */
45   - void unbindSocialUser(Long userId, Integer userType, Integer type, String openid);
  44 + void unbindSocialUser(Long userId, Integer userType, Integer socialType, String openid);
46 45  
47 46 /**
48 47 * 获得社交用户
... ... @@ -50,11 +49,11 @@ public interface SocialUserService {
50 49 * 在认证信息不正确的情况下，也会抛出 {@link ServiceException} 业务异常
51 50 *
52 51 * @param userType 用户类型
53   - * @param type 社交平台的类型
  52 + * @param socialType 社交平台的类型
54 53 * @param code 授权码
55 54 * @param state state
56 55 * @return 社交用户
57 56 */
58   - SocialUserRespDTO getSocialUser(Integer userType, Integer type, String code, String state);
  57 + SocialUserRespDTO getSocialUser(Integer userType, Integer socialType, String code, String state);
59 58  
60 59 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
  View file @728308c
... ... @@ -80,9 +80,9 @@ public class SocialUserServiceImpl implements SocialUserService {
80 80 }
81 81  
82 82 @Override
83   - public void unbindSocialUser(Long userId, Integer userType, Integer type, String openid) {
  83 + public void unbindSocialUser(Long userId, Integer userType, Integer socialType, String openid) {
84 84 // 获得 openid 对应的 SocialUserDO 社交用户
85   - SocialUserDO socialUser = socialUserMapper.selectByTypeAndOpenid(type, openid);
  85 + SocialUserDO socialUser = socialUserMapper.selectByTypeAndOpenid(socialType, openid);
86 86 if (socialUser == null) {
87 87 throw exception(SOCIAL_USER_NOT_FOUND);
88 88 }
... ... @@ -92,9 +92,9 @@ public class SocialUserServiceImpl implements SocialUserService {
92 92 }
93 93  
94 94 @Override
95   - public SocialUserRespDTO getSocialUser(Integer userType, Integer type, String code, String state) {
  95 + public SocialUserRespDTO getSocialUser(Integer userType, Integer socialType, String code, String state) {
96 96 // 获得社交用户
97   - SocialUserDO socialUser = authSocialUser(type, userType, code, state);
  97 + SocialUserDO socialUser = authSocialUser(socialType, userType, code, state);
98 98 Assert.notNull(socialUser, "社交用户不能为空");
99 99  
100 100 // 如果未绑定的社交用户，则无法自动登录，进行报错
... ...