From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 82d12ad..e6471a7 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +26,7 @@
 import com.doumee.dao.business.web.response.HomeResponse;
 import com.doumee.dao.business.web.response.UserResponse;
 import com.doumee.service.business.MemberService;
+import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -46,6 +48,7 @@
  * @date 2023/09/27 18:06
  */
 @Service
+@Slf4j
 public class MemberServiceImpl implements MemberService {
 
     @Autowired
@@ -57,6 +60,7 @@
         memberMapper.insert(member);
         return member.getId();
     }
+
 
     @Override
     public String createManageMember(Member member) {
@@ -114,6 +118,16 @@
 
     @Override
     public void update(Member member) {
+
+        QueryWrapper<Member> wrapper = new QueryWrapper<>();
+        wrapper.lambda()
+                .eq(Member::getIsdeleted,Constants.ZERO)
+                .eq(Member::getType,Constants.ONE)
+                .eq(Member::getCardNo,member.getCardNo());
+        Member member1 = memberMapper.selectOne(wrapper);
+        if (Objects.nonNull(member1) && !member1.getId().equals(member.getId())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿瀛樺湪閲嶅");
+        }
         LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         Member update = new Member();
         update.setId(member.getId());
@@ -181,7 +195,7 @@
             queryWrapper.lambda().eq(Member::getInfo, pageWrap.getModel().getInfo());
         }
         if (pageWrap.getModel().getName() != null) {
-            queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
+            queryWrapper.lambda().like(Member::getName, pageWrap.getModel().getName());
         }
         if (pageWrap.getModel().getNickname() != null) {
             queryWrapper.lambda().eq(Member::getNickname, pageWrap.getModel().getNickname());
@@ -219,7 +233,7 @@
             queryWrapper.lambda().eq(Member::getPassword, pageWrap.getModel().getPassword());
         }
         if (pageWrap.getModel().getCardNo() != null) {
-            queryWrapper.lambda().eq(Member::getCardNo, pageWrap.getModel().getCardNo());
+            queryWrapper.lambda().like(Member::getCardNo, pageWrap.getModel().getCardNo());
         }
         if (pageWrap.getModel().getCardSign() != null) {
             queryWrapper.lambda().eq(Member::getCardSign, pageWrap.getModel().getCardSign());
@@ -305,9 +319,11 @@
      */
     @Override
     public AccountResponse wxLogin(String code) {
+        log.error("================================"+code+ JSONObject.toJSONString( WxMiniConfig.wxMaService.getWxMaConfig()));
         try {
             //鑾峰彇寰俊鏁忔劅鏁版嵁
             WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code);
+            log.error("================================"+ JSONObject.toJSONString(session));
             String openId = session.getOpenid();
             String unionId = session.getUnionid();
             if (StringUtils.isBlank(openId)) {
@@ -339,6 +355,7 @@
             accountResponse.setUserResponse(userResponse);
             return accountResponse;
         } catch (WxErrorException e) {
+            log.error(e.getMessage());
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠$悊鍛�");
         }
     }

--
Gitblit v1.9.3