Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-admin/src/main/java/com/fs/api/controller/CommonController.java

@@ -0,0 +1,34 @@
+package com.fs.api.controller;
+
+
+import com.fs.common.core.domain.R;
+import com.fs.core.utils.OrderCodeUtils;
+import io.swagger.annotations.Api;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Api("公共接口")
+@RestController
+@RequestMapping(value="/app/common")
+public class CommonController {
+
+
+    @GetMapping("/genOrderCode")
+    public R genOrderCode() {
+
+        String orderCode= OrderCodeUtils.genOrderSn();
+        if(StringUtils.isNotEmpty(orderCode)){
+            return R.ok().put("orderCode",orderCode);
+        }
+        else{
+            return R.error("订单号生成失败");
+        }
+
+    }
+
+
+
+}

fs-common/src/main/java/com/fs/common/config/FSConfig.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 读取项目相关配置
- * 
+ *
 
  */
 @Component
@@ -32,6 +32,8 @@ public class FSConfig
 
     private String url;
 
+    private static String commonApi;
+
     public String getUrl() {
         return url;
     }
@@ -134,4 +136,12 @@ public class FSConfig
     {
         return getProfile() + "/qr";
     }
+
+    public static String getCommonApi() {
+        return commonApi;
+    }
+
+    public static void setCommonApi(String commonApi) {
+        FSConfig.commonApi = commonApi;
+    }
 }

fs-service-system/src/main/java/com/fs/core/utils/OrderCodeUtils.java

@@ -38,6 +38,19 @@ public class OrderCodeUtils {
 
     }
 
+    public static String getOrderSn(){
+        String url= FSConfig.getCommonApi()+ "/app/common/genOrderCode";
+        String json = HttpRequest.get(url)
+                .execute().body();
+        OrderCodeVO vo= JSONUtil.toBean(json, OrderCodeVO.class);
+        if(vo.getCode()==200){
+            return vo.getOrderCode();
+        }
+        else return null;
+        //return genOrderSn();
+
+    }
+
 
 //    public static String genOrderSn() {
 //

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -993,7 +993,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     @Override
     @Transactional
     public ResponseResult<Boolean> isAddCompanyUser(FsUserCourseAddCompanyUserParam param) {
-        logger.info("=======================进入个微-判断是否添加客服===========================，入参：{}",param);
+        logger.info("\n 【进入个微-判断是否添加客服】，入参：{}",param);
         //查询用户
         FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
         if (fsUser == null){

fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -115,3 +115,5 @@ cloud_host:
   company_name: 中康
 headerImg:
   imgUrl: https://zkzh-2025.oss-cn-beijing.aliyuncs.com/fs/20250619/e31b5e051a474a7a9b4ad02575b46196.png
+fs :
+  commonApi: http://172.21.76.167:7011 #admin后台

fs-user-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -133,11 +133,11 @@ public class WxCompanyUserController extends AppBaseController {
                     if (user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())){
                         return R.error(406, "该用户已成为其他销售会员");
                     }
-                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
-                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
-                        userMap.setCompanyId(param.getCompanyId());
-                        userMap.setCompanyUserId(param.getCompanyUserId());
-                    }
+//                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+//                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
+//                        userMap.setCompanyId(param.getCompanyId());
+//                        userMap.setCompanyUserId(param.getCompanyUserId());
+//                    }
                     userService.updateFsUser(userMap);
                 } else {
                     //新增