rk
2026-03-17 a9e1505680c7dd45840975b38451ef88d451e6d4
代码优化
已添加2个文件
已修改5个文件
119 ■■■■ 文件已修改
.vscode/launch.json 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vscode/settings.json 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderDetailServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/dmmall_web/src/main/java/com/doumee/api/web/AccountApi.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vscode/launch.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
{
    // ä½¿ç”¨ IntelliSense äº†è§£ç›¸å…³å±žæ€§ã€‚
    // æ‚¬åœä»¥æŸ¥çœ‹çŽ°æœ‰å±žæ€§çš„æè¿°ã€‚
    // æ¬²äº†è§£æ›´å¤šä¿¡æ¯ï¼Œè¯·è®¿é—®: 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"
        }
    ]
}
.vscode/settings.json
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
{
    "java.compile.nullAnalysis.mode": "disabled"
}
server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java
@@ -23,7 +23,6 @@
     * @return Integer
     */
    Integer create(Activity activity);
    /**
     * ä¸»é”®åˆ é™¤
     *
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);
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderDetailServiceImpl.java
@@ -2,7 +2,6 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.GoodsorderDetailMapper;
import com.doumee.dao.business.PlanorderDetailMapper;
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -312,22 +312,25 @@
    @Override
    public AccountResponse wxLogin(String code){
        try {
            //获取微信敏感数据
    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失败!请联系管理员");
            }
            Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenId, openId)
                            .eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getStatus,Constants.ZERO)
        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 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);
@@ -336,10 +339,6 @@
                accountResponse.setOpenid(openId);
            }
            return accountResponse;
        } catch (WxErrorException e) {
            e.printStackTrace();
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"微信登录异常!请联系管理员");
    }
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));
    }