Commit 72cebfca143680718310ea30b06bf216b53dd1a5

Authored by puhui999
1 parent 8fa8f289

CombinationRecordApiImpl 重命名一下 recordService 改为 combinationRecordService 解决和 mzt-biz-log 组件的 bean 冲突

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
... ... @@ -7,11 +7,10 @@ import cn.iocoder.yudao.module.promotion.convert.combination.CombinationActivity
7 7 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationRecordDO;
8 8 import cn.iocoder.yudao.module.promotion.enums.combination.CombinationRecordStatusEnum;
9 9 import cn.iocoder.yudao.module.promotion.service.combination.CombinationRecordService;
  10 +import jakarta.annotation.Resource;
10 11 import org.springframework.stereotype.Service;
11 12 import org.springframework.validation.annotation.Validated;
12 13  
13   -import jakarta.annotation.Resource;
14   -
15 14 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
16 15 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.COMBINATION_RECORD_NOT_EXISTS;
17 16  
... ... @@ -25,21 +24,21 @@ import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.COMBINA
25 24 public class CombinationRecordApiImpl implements CombinationRecordApi {
26 25  
27 26 @Resource
28   - private CombinationRecordService recordService;
  27 + private CombinationRecordService combinationRecordService;
29 28  
30 29 @Override
31 30 public void validateCombinationRecord(Long userId, Long activityId, Long headId, Long skuId, Integer count) {
32   - recordService.validateCombinationRecord(userId, activityId, headId, skuId, count);
  31 + combinationRecordService.validateCombinationRecord(userId, activityId, headId, skuId, count);
33 32 }
34 33  
35 34 @Override
36 35 public CombinationRecordCreateRespDTO createCombinationRecord(CombinationRecordCreateReqDTO reqDTO) {
37   - return CombinationActivityConvert.INSTANCE.convert4(recordService.createCombinationRecord(reqDTO));
  36 + return CombinationActivityConvert.INSTANCE.convert4(combinationRecordService.createCombinationRecord(reqDTO));
38 37 }
39 38  
40 39 @Override
41 40 public boolean isCombinationRecordSuccess(Long userId, Long orderId) {
42   - CombinationRecordDO record = recordService.getCombinationRecord(userId, orderId);
  41 + CombinationRecordDO record = combinationRecordService.getCombinationRecord(userId, orderId);
43 42 if (record == null) {
44 43 throw exception(COMBINATION_RECORD_NOT_EXISTS);
45 44 }
... ... @@ -48,7 +47,7 @@ public class CombinationRecordApiImpl implements CombinationRecordApi {
48 47  
49 48 @Override
50 49 public CombinationValidateJoinRespDTO validateJoinCombination(Long userId, Long activityId, Long headId, Long skuId, Integer count) {
51   - return recordService.validateJoinCombination(userId, activityId, headId, skuId, count);
  50 + return combinationRecordService.validateJoinCombination(userId, activityId, headId, skuId, count);
52 51 }
53 52  
54 53 }
... ...