zx 1 ماه پیش
والد
کامیت
8021b94eab

+ 1 - 1
fs-doctor-app/src/main/resources/application.yml

@@ -6,4 +6,4 @@ server:
 spring:
   profiles:
 #    active: dev
-    active: druid-jnmy
+    active: druid-syysy-test

+ 1 - 1
fs-ipad-task/src/main/resources/application.yml

@@ -9,4 +9,4 @@ spring:
 #    active: druid-yzt
 #    active: druid-sxjz
 #    active: druid-sft
-group-no: 1
+group-no: 2

+ 1 - 1
fs-qwhook-sop/src/main/resources/application.yml

@@ -10,4 +10,4 @@ spring:
 #    active: druid-yzt
 #    active: druid-hdt
 #    active: druid-sxjz
-    active: druid-myhk-test
+    active: dev

+ 14 - 0
fs-service/src/main/resources/application-dev.yml

@@ -165,3 +165,17 @@ openIM:
     url: web.im.ysya.top
 #是否为新商户,新商户不走mpOpenId
 isNewWxMerchant: true
+
+cloud_host:
+    company_name: 弘珍医药
+    projectCode: HZYY
+#看课授权时显示的头像
+headerImg:
+    imgUrl: https://hzyy.obs.cn-north-4.myhuaweicloud.com/fs/20250616/1750067609692.png
+ipad:
+    ipadUrl: http://139.159.133.223:8667
+    aiApi: http://1.95.196.10:3000/api
+wx_miniapp_temp:
+    pay_order_temp_id:
+    inquiry_temp_id:
+

+ 26 - 1
fs-user-app/src/main/java/com/fs/app/controller/store/CompanyUserScrmController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import com.fs.app.annotation.Login;
 import com.fs.app.controller.AppBaseController;
+import com.fs.app.param.FsBindCompanyUserParam;
 import com.fs.common.config.FSConfig;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
@@ -14,20 +15,24 @@ import com.fs.common.utils.sign.Md5Utils;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyUserCard;
+import com.fs.company.domain.CompanyUserUser;
 import com.fs.company.param.CompanyUserLoginParam;
 import com.fs.company.service.ICompanyUserCardService;
 import com.fs.company.service.ICompanyUserService;
+import com.fs.company.service.ICompanyUserUserService;
 import com.fs.framework.security.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 
@@ -44,6 +49,10 @@ public class CompanyUserScrmController extends AppBaseController {
     private ICompanyUserService companyUserService;
     @Autowired
     private ICompanyUserCardService companyUserCardService;
+
+    @Autowired
+    private ICompanyUserUserService companyUserUserService;
+
     @PostMapping("/login")
     public R Login(@RequestBody CompanyUserLoginParam param, HttpServletRequest request){
         try {
@@ -66,7 +75,23 @@ public class CompanyUserScrmController extends AppBaseController {
             return R.error("操作异常");
         }
     }
-
+    @Login
+    @ApiOperation("绑定销售")
+    @PostMapping("/bindCompanyUser")
+    public R bindCompanyUser(@Validated @RequestBody FsBindCompanyUserParam param, HttpServletRequest request){
+        CompanyUserUser map=new CompanyUserUser();
+        map.setCompanyUserId(param.getCompanyUserId());
+        map.setUserId(Long.parseLong(getUserId()));
+        List<CompanyUserUser> list= companyUserUserService.selectCompanyUserUserList(map);
+        if(list==null||list.size()==0){
+            CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
+            if(companyUser!=null&&companyUser.getStatus().equals("0")){
+                map.setCompanyId(companyUser.getCompanyId());
+                companyUserUserService.insertCompanyUserUser(map);
+            }
+        }
+        return R.ok();
+    }
     @ApiOperation("获取销售信息")
     @GetMapping("/getUserInfo")
     public R getUserInfo(@RequestParam("token")String token, HttpServletRequest request){