Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/controller/oauth/AccessTokenController.java

@@ -66,7 +66,6 @@ public class AccessTokenController {
     @Resource
     private StringRedisTemplate stringRedisTemplate;
 
-
     /**
      * @desc   : 登录微信获取 session_key openid
      * @author : 姜永辉
@@ -195,4 +194,14 @@ public class AccessTokenController {
         return authAccessTokenService.changeCp(userLogin);
     }
 
+    /**
+     * @desc : 退出登录
+     * @author : 周兴
+     * @date : 2023/1/5 10:09
+     */
+    @PostMapping("/oauth/wx/logout")
+    public ResponseResultVO logout(@RequestBody UserWxLogin userLogin) {
+        return authAccessTokenService.logout(userLogin);
+    }
+
 }

src/main/java/com/dk/oauth/service/IAuthAccessTokenService.java

@@ -43,4 +43,6 @@ public interface IAuthAccessTokenService extends IService<AuthAccessToken> {
     ResponseResultVO<?> getQrCode(String uuid);
 
     ResponseResultVO<?> getWxQrCode(Map<String,Object> map);
+
+    ResponseResultVO logout(UserWxLogin userWxLogin);
 }

src/main/java/com/dk/oauth/service/impl/AuthAccessTokenServiceImpl.java

@@ -243,7 +243,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
         // 默认取体验公司的dktest账号
         Map<String, Object> collectQuery = new HashMap<>();
         collectQuery.put("cpId", userLogin.getCurrentCp());
-        collectQuery.put("staffCode", "东科智云-标准版-体验");
+        collectQuery.put("staffCode", "东科智云-体验");
         ResponseResultVO<StaffResponse> feignExperience = staffFeign.getFeignExperience(collectQuery);
         StaffResponse s = new StaffResponse();
         log.info("---->>>getFeignExperience = " + feignExperience.toString());
@@ -282,21 +282,25 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
             //注册
             List<Integer> joinedCps = new ArrayList<>();
             joinedCps.add(userWxLogin.getCurrentCp());
+            userWxLogin.setCurrentCp(userWxLogin.getCurrentCp());
             userWxLogin.setJoinedCps(joinedCps);
             userMapper.insert(userWxLogin);
         } else {
             List<Integer> joinedCps = userLogin.getJoinedCps();
             userWxLogin.setUserId(userLogin.getUserId());
+            if (userLogin.getCurrentCp() == null) {
+                userLogin.setCurrentCp(userWxLogin.getCurrentCp());
+            }
             if (joinedCps == null) {
                 joinedCps = new ArrayList<>();
                 joinedCps.add(userWxLogin.getCurrentCp());
                 userWxLogin.setJoinedCps(joinedCps);
-                userMapper.updateCpid(userLogin.getUserId(), null, userWxLogin.getJoinedCps());
+                userMapper.updateCpid(userLogin.getUserId(), userLogin.getCurrentCp(), userWxLogin.getJoinedCps());
             }
             if (joinedCps != null && !joinedCps.contains(userWxLogin.getCurrentCp())) {
                 joinedCps.add(userWxLogin.getCurrentCp());
                 userWxLogin.setJoinedCps(joinedCps);
-                userMapper.updateCpid(userLogin.getUserId(), null, userWxLogin.getJoinedCps());
+                userMapper.updateCpid(userLogin.getUserId(), userLogin.getCurrentCp(), userWxLogin.getJoinedCps());
             }
         }
 
@@ -359,6 +363,17 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
     }
 
     /**
+     * @desc : 退出登录
+     * @author : 洪旭东
+     * @date : 2024-02-20 13:55
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseResultVO logout(UserWxLogin userWxLogin) {
+         userMapper.updateWxid(userWxLogin.getUserId(),null);
+        return ResponseResultUtil.success();
+    }
+
+    /**
      * @desc : 验证当前扫码登录是否匹配到openid
      * @author : 洪旭东
      * @date : 2024-02-20 14:04

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -117,8 +117,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             return ResponseResultUtil.error(ErrorCodeEnum.COMPANY_CODE_EXISTS.getCode(),
                     ErrorCodeEnum.COMPANY_CODE_EXISTS.getMessage());
         }
-        company.setCurStaffNum(0);
-        company.setMaxStaffNum(0);
+        company.setCurStaffNum(1);
+        company.setMaxStaffNum(1);
 
         //获取具体服务的地址
         company.setSvcCode(companyMapper.selectServiceAllot(company.getGradeCode()));
@@ -150,6 +150,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         // 生成员工
         UserLogin userLogin = userMapper.selectById(company.getOwner());
         StaffVO staffVO = new StaffVO();
+        staffVO.setWxUserId(userLogin.getUserId());
         staffVO.setCpId(company.getCpId());
         staffVO.setStaffName(userLogin.getUserPhone());
         staffVO.setStaffPhone(userLogin.getUserPhone());
@@ -167,7 +168,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             staffResponse = staffResponseResponseResultVO.getData();
         }
 
-        // 更新 创建商户的公司id
+        // 更新 创建商户用户的公司id
         Integer cpId = company.getCpId();
         List<Integer> cpIds = new ArrayList<>();
         cpIds.add(cpId);

src/main/java/com/dk/oauth/service/wxapi/basic/WechatPayService.java

@@ -119,7 +119,7 @@ public class WechatPayService {
         log.info("微信用户----------" + byWxid);
         // 插入 待支付的 数据
         BigDecimal payFee = new BigDecimal(info.getTotalFee()).divide(new BigDecimal(100), 2, RoundingMode.HALF_EVEN);
-        Integer cpid = 1;
+        Integer cpid = byWxid.getCurrentCp();
         // 交易记录
         Trade trade = new Trade();
         trade.setTradeCode(info.getTransactionId()); // 微信交易单号

src/main/resources/test/bootstrap.yml

@@ -14,7 +14,7 @@ spring:
   datasource:
     driver-class-name: org.postgresql.Driver
     url: jdbc:postgresql://s.dev01.dkiboss.com:15000/dkic_dev_a0
-    username: dkic_a
+    username: dkic_sp
     password: dk
     type: com.alibaba.druid.pool.DruidDataSource
     druid: