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/sharelink/AppShareLinkController.java

@@ -92,7 +92,7 @@ public class AppShareLinkController {
     @GetMapping("/getObjectIdByLinkId")
     @Operation(summary = "通过链接编号获取对应的类型编号")
     public CommonResult<Long> getObjectIdByLinkId(String linkId) {
-        return success(shareLinkService.getObjectIdByLinkId(Long.parseLong(linkId)));
+        return success(shareLinkService.getObjectIdByLinkId(Long.parseLong(linkId,16)));
     }
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharelink/ShareLinkServiceImpl.java

@@ -21,6 +21,7 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.module.distri.dal.mysql.sharelink.ShareLinkMapper;
 
 import static cn.newfeifan.mall.framework.common.enums.CategoryEnum.*;
+import static cn.newfeifan.mall.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED;
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
@@ -79,7 +80,11 @@ public class ShareLinkServiceImpl implements ShareLinkService {
     @Override
     public String getShareLink(AppShareLinkReqVO appShareLinkReqVO) {
         //先判断是否存在
-        ShareLinkDO shareLinkDO = shareLinkMapper.selectByCategory(appShareLinkReqVO.getCategory(), getLoginUserId(), appShareLinkReqVO.getObjectId());
+        Long loginUserId = getLoginUserId();
+        if (ObjectUtil.isEmpty(loginUserId)) {
+            throw exception(UNAUTHORIZED);
+        }
+        ShareLinkDO shareLinkDO = shareLinkMapper.selectByCategory(appShareLinkReqVO.getCategory(), loginUserId, appShareLinkReqVO.getObjectId());
 
         if (ObjectUtil.isNotEmpty(shareLinkDO)) {
             //存在就直接返回查询出来的id - 十六进制