Merge branch 'dev/2024/0415/update-app' of Harper/feifan-backend-zx-app into master

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/app/sharelinkregister/vo/AppShareLinkRegisterSaveReqVO.java

@@ -16,7 +16,7 @@ public class AppShareLinkRegisterSaveReqVO {
 
     @Schema(description = "分享链接表id：关联分享链接表，本记录对应的分享链接表记录", requiredMode = Schema.RequiredMode.REQUIRED, example = "12173")
     @NotNull(message = "分享链接表id：关联分享链接表，本记录对应的分享链接表记录不能为空")
-    private Long ShareLinkId;
+    private Long distriShareLinkId;
 
     @Schema(description = "注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21753")
     @NotNull(message = "注册用户id:通过distri_share_link_id分享链接，新注册的用户id，对应member_user表的id不能为空")

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/consumer/shareLinkRegister/AddShareLinkRegisterConsumer.java

@@ -26,7 +26,7 @@ public class AddShareLinkRegisterConsumer {
         log.info("[onMessage][消息内容({})]", message);
         AppShareLinkRegisterSaveReqVO reqVO = AppShareLinkRegisterSaveReqVO
                 .builder()
-                .ShareLinkId(message.getShareLinkId())
+                .distriShareLinkId(message.getShareLinkId())
                 .registerUserId(message.getRegisterUserId())
                 .build();
         shareLinkRegisterService.createShareLinkRegister(reqVO);

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharelinkregister/ShareLinkRegisterServiceImpl.java

@@ -40,7 +40,7 @@ public class ShareLinkRegisterServiceImpl implements ShareLinkRegisterService {
     public Long createShareLinkRegister(AppShareLinkRegisterSaveReqVO createReqVO) {
         //插入之前先判断有没有再插入
         ShareLinkRegisterDO shareLinkRegisterDO = shareLinkRegisterMapper.selectOne(new LambdaQueryWrapper<ShareLinkRegisterDO>()
-                .eq(ShareLinkRegisterDO::getDistriShareLinkId, createReqVO.getShareLinkId())
+                .eq(ShareLinkRegisterDO::getDistriShareLinkId, createReqVO.getDistriShareLinkId())
                 .eq(ShareLinkRegisterDO::getRegisterUserId, createReqVO.getRegisterUserId()));
         if (shareLinkRegisterDO != null) {
             return shareLinkRegisterDO.getId();
@@ -51,8 +51,8 @@ public class ShareLinkRegisterServiceImpl implements ShareLinkRegisterService {
         shareLinkRegisterMapper.insert(shareLinkRegister);
 
         //增加当前链接的累计
-        if (createReqVO.getShareLinkId() != null) {
-            shareLinkService.addRegisterUserCountById(createReqVO.getShareLinkId());
+        if (createReqVO.getDistriShareLinkId() != null) {
+            shareLinkService.addRegisterUserCountById(createReqVO.getDistriShareLinkId());
         }
         // 返回
         return shareLinkRegister.getId();