From a9e1505680c7dd45840975b38451ef88d451e6d4 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 17 三月 2026 14:41:12 +0800
Subject: [PATCH] 代码优化

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderDetailServiceImpl.java |    3 
 server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java                  |    1 
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java           |   53 ++++++++---------
 server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java                                    |    4 +
 .vscode/launch.json                                                                                   |   84 ++++++++++++++++++++++++++++
 .vscode/settings.json                                                                                 |    3 +
 server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java                    |    3 
 7 files changed, 119 insertions(+), 32 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..e4133bd
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,84 @@
+{
+    // 浣跨敤 IntelliSense 浜嗚В鐩稿叧灞炴�с�� 
+    // 鎮仠浠ユ煡鐪嬬幇鏈夊睘鎬х殑鎻忚堪銆�
+    // 娆蹭簡瑙f洿澶氫俊鎭紝璇疯闂�: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Current File",
+            "request": "launch",
+            "mainClass": "${file}"
+        },
+        {
+            "type": "java",
+            "name": "AdminApplication",
+            "request": "launch",
+            "mainClass": "com.doumee.AdminApplication",
+            "projectName": "dmmall_admin"
+        },
+        {
+            "type": "java",
+            "name": "CodeGenerator",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.CodeGenerator",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "CodeVerifyUtils",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.CodeVerifyUtils",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "Constants",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.Constants",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "DateUtil",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.DateUtil",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "GeneratePicUtil",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.GeneratePicUtil",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "HttpsUtil",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.HttpsUtil",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "PinYinUtil",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.PinYinUtil",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "ALiYunUtil",
+            "request": "launch",
+            "mainClass": "com.doumee.core.utils.aliyun.ALiYunUtil",
+            "projectName": "dmmall_service"
+        },
+        {
+            "type": "java",
+            "name": "InterfaceApplication",
+            "request": "launch",
+            "mainClass": "com.doumee.InterfaceApplication",
+            "projectName": "dmmall_web"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..8f2b711
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.compile.nullAnalysis.mode": "disabled"
+}
\ No newline at end of file
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java
index 00b403b..e0046d0 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java
@@ -23,7 +23,6 @@
      * @return Integer
      */
     Integer create(Activity activity);
-
     /**
      * 涓婚敭鍒犻櫎
      *
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java
index ee20e5d..3a200ee 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -12,6 +12,7 @@
 import com.doumee.dao.web.request.UpdateMemberRequest;
 import com.doumee.dao.web.request.WxPhoneRequest;
 import com.doumee.dao.web.response.AccountResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
@@ -127,7 +128,7 @@
      * @param code
      * @return
      */
-    AccountResponse wxLogin(String code);
+    AccountResponse wxLogin(String code) throws WxErrorException;
 
 
     AccountResponse wxLoginTest( Integer memberId);
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderDetailServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderDetailServiceImpl.java
index b39e0da..06561b0 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderDetailServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderDetailServiceImpl.java
@@ -1,8 +1,7 @@
 package com.doumee.service.business.impl;
 
 import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.utils.Constants;
+import com.doumee.core.model.PageWrap; 
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.GoodsorderDetailMapper;
 import com.doumee.dao.business.PlanorderDetailMapper;
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 11722ec..81433af 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -312,34 +312,33 @@
 
 
     @Override
-    public AccountResponse wxLogin(String code){
-        try {
-            //鑾峰彇寰俊鏁忔劅鏁版嵁
-            WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
-            String openId = session.getOpenid();
-            if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠$悊鍛�");
-            }
-            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenId, openId)
-                            .eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getStatus,Constants.ZERO)
-                    .last(" limit 1"));
-            AccountResponse accountResponse = new AccountResponse();
-            if(Objects.nonNull(member)){
-                memberMapper.updateById(member);
-                member.setImgFullUrl(StringUtils.isNotBlank(member.getImgurl())?systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
-                        systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl():null);
-                String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
-                accountResponse.setToken(token);
-                accountResponse.setOpenid(openId);
-                accountResponse.setMember(member);
-            }else{
-                accountResponse.setOpenid(openId);
-            }
-            return accountResponse;
-        } catch (WxErrorException e) {
-            e.printStackTrace();
+    public AccountResponse wxLogin(String code) throws WxErrorException {
+        WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
+        String openId = session.getOpenid();
+        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠$悊鍛�");
         }
-        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠$悊鍛�");
+        Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+                .eq(Member::getOpenId, openId)
+                .eq(Member::getIsdeleted,Constants.ZERO)
+                .eq(Member::getStatus,Constants.ZERO)
+                .last(" limit 1"));
+
+        AccountResponse accountResponse = new AccountResponse();
+        if(Objects.nonNull(member)){
+            String ossPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode();
+            String memberPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode();
+            if(StringUtils.isNotBlank(member.getImgurl())){
+                member.setImgFullUrl(ossPath + memberPath + member.getImgurl());
+            }
+            String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
+            accountResponse.setToken(token);
+            accountResponse.setOpenid(openId);
+            accountResponse.setMember(member);
+        }else{
+            accountResponse.setOpenid(openId);
+        }
+        return accountResponse;
     }
 
 
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
index 4180450..f890473 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java
@@ -20,6 +20,8 @@
 import io.swagger.models.auth.In;
 import lombok.extern.java.Log;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -49,7 +51,7 @@
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true)
     })
-    public ApiResponse<AccountResponse> wxLogin(@RequestParam String code) {
+    public ApiResponse<AccountResponse> wxLogin(@RequestParam String code) throws WxErrorException {
         return  ApiResponse.success(memberService.wxLogin(code));
     }
 

--
Gitblit v1.9.3