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

src/main/java/com/dk/oauth/entity/Company.java

@@ -129,6 +129,13 @@ public class Company extends PageInfo<Company> implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    /**
+     * 企业状态（系统字典）
+     */
+    @Excel(name = "企业状态（系统字典）")
+    @ApiModelProperty(value = "企业状态（系统字典）")
+    private String cpStatus;
+
 
     /**
      * 创建时间 (触发器自动处理)

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

@@ -44,6 +44,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * (AuthAccessToken)表服务实现类
@@ -298,8 +299,11 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
                 userMapper.updateCpid(userLogin.getUserId(), userLogin.getCurrentCp(), userWxLogin.getJoinedCps());
             }
             if (joinedCps != null && !joinedCps.contains(userWxLogin.getCurrentCp())) {
-                joinedCps.add(userWxLogin.getCurrentCp());
-                userWxLogin.setJoinedCps(joinedCps);
+                Integer cp = userWxLogin.getCurrentCp();
+                List<Integer> joinedCpsNew = new ArrayList<>();
+                joinedCpsNew.addAll(joinedCps);
+                joinedCpsNew.add(cp);
+                userWxLogin.setJoinedCps(joinedCpsNew);
                 userMapper.updateCpid(userLogin.getUserId(), userLogin.getCurrentCp(), userWxLogin.getJoinedCps());
             }
         }
@@ -320,21 +324,21 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
     @Transactional(rollbackFor = Exception.class)
     public ResponseResultVO<?> updateClearOpenidFeign(Map<String, Object> map) {
         String userId = map.get("userId") + "";
-        Integer cpId = Integer.parseInt(map.get("cpId")+"") ;
+        Integer cpId = Integer.parseInt(map.get("cpId") + "");
         UserLogin userLogin = userMapper.selectById(userId);
         Integer cpIdNew = null;
         if (userLogin != null) {
             List<Integer> joinedCps = new ArrayList<>();
-            joinedCps =  userLogin.getJoinedCps();
+            joinedCps = userLogin.getJoinedCps();
             if (joinedCps != null) {
-                List<Integer> joinedCpsNew = new ArrayList<>();
-                joinedCpsNew.add(cpId);
-                joinedCps.removeAll(joinedCpsNew);
+                joinedCps = joinedCps.stream() // 将List转换为Stream
+                        .filter(n -> n != cpId) // 过滤掉我们不想要的元素
+                        .collect(Collectors.toList()); // 收集结果到新的List
                 if (joinedCps != null && joinedCps.size() > 0) {
                     cpIdNew = joinedCps.get(0);
                 }
             }
-            userMapper.updateClearOpenidFeign(userId, cpIdNew, joinedCps);
+            userMapper.updateClearOpenidFeign(userId, cpIdNew, joinedCps != null && joinedCps.size() == 0 ? null : joinedCps);
         }
 
         return ResponseResultUtil.success();
@@ -396,7 +400,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
      */
     @Transactional(rollbackFor = Exception.class)
     public ResponseResultVO logout(UserWxLogin userWxLogin) {
-         userMapper.updateWxid(userWxLogin.getUserId(),null);
+        userMapper.updateWxid(userWxLogin.getUserId(), null);
         return ResponseResultUtil.success();
     }
 
@@ -628,7 +632,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
         //二维码参数
         Map<String, Object> param = new HashMap<>();
         param.put("page", "pages/welcome/welcome");
-        param.put("scene",   map.get("openid").toString());
+        param.put("scene", map.get("openid").toString());
         param.put("check_path", false);
         log.info("二维码参数=123: {}", param);
         //生成二维码接口地址

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

@@ -117,8 +117,15 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             return ResponseResultUtil.error(ErrorCodeEnum.COMPANY_CODE_EXISTS.getCode(),
                     ErrorCodeEnum.COMPANY_CODE_EXISTS.getMessage());
         }
-        company.setCurStaffNum(1);
-        company.setMaxStaffNum(1);
+        if ("PRO".equals(company.getGradeCode())){
+            company.setCurStaffNum(100);
+            company.setMaxStaffNum(100);
+            company.setCpStatus("公司状态-待审");
+        }else {
+            company.setCurStaffNum(10);
+            company.setMaxStaffNum(10);
+            company.setCpStatus("公司状态-通过");
+        }
 
         //获取具体服务的地址
         company.setSvcCode(companyMapper.selectServiceAllot(company.getGradeCode()));

src/main/resources/mapper/CompanyMapper.xml

@@ -7,7 +7,7 @@
         t.cp_id
         , t.cp_code, t.cp_name, t.svc_code, t.opening_date, t.grade_code, t.end_date, t.max_staff_num, t.cur_staff_num, t.flg_valid,
         t.remarks, t.op_create_time, t.op_create_user_id, t.op_update_time, t.op_update_user_id, t.op_app_code, t.op_timestamp, t.op_db_user,
-        t.owner,t.cp_manager,t.cp_phone,t.cp_size,t.shop_size,t.feedback
+        t.owner,t.cp_manager,t.cp_phone,t.cp_size,t.shop_size,t.feedback,t.cp_status
     </sql>
 
     <resultMap type="com.dk.oauth.entity.CompanyResponse" id="ResultMap">
@@ -52,6 +52,7 @@
         <result column="shop_size" property="shopSize"/>
         <result column="feedback" property="feedback"/>
         <result column="gradeName" property="gradeName"/>
+        <result column="cp_status" property="cpStatus"/>
     </resultMap>
 
     <!--获取企业信息-->
@@ -162,6 +163,7 @@
          cp_phone,
          cp_size,
          shop_size,
+         cp_status,
          feedback)
         values (#{cpName},
                 dkic_a.f_allot_service(#{gradeCode}) ,
@@ -173,6 +175,7 @@
                 #{cpPhone},
                 #{cpSize},
                 #{shopSize},
+                #{cpStatus},
                 #{feedback}
                 )
 

src/main/resources/mapper/UserMapper.xml

@@ -80,8 +80,8 @@
     </select>
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="userId" keyColumn="user_id" parameterType="com.dk.oauth.entity.UserWxLogin">
-        insert into dkic_a.t_wx_user (user_wxid, user_name, user_phone, user_pwd,joined_cps)
-        values (#{userWxid}, #{userName}, #{userPhone}, md5('123'), #{joinedCps,typeHandler=IntListTypeHandler})
+        insert into dkic_a.t_wx_user (user_wxid, user_name, user_phone, user_pwd,current_cp,joined_cps)
+        values (#{userWxid}, #{userName}, #{userPhone}, md5('123'),#{currentCp}, #{joinedCps,typeHandler=IntListTypeHandler})
     </insert>
 
     <update id="cleanPhone">