姜永辉 2 лет назад
Родитель
Сommit
bc87dcbef2

+ 4 - 3
src/main/java/com/dk/oauth/controller/CompanyController.java

@@ -3,6 +3,7 @@ package com.dk.oauth.controller;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.oauth.entity.Company;
 import com.dk.oauth.service.ICompanyService;
+import io.lettuce.core.dynamic.annotation.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -52,8 +53,8 @@ public class CompanyController {
      * @date   : 2024/2/1 14:55
      */
     @ApiOperation( value = "注册商户", notes = "注册商户" )
-    @PostMapping({"register_company"})
-    public ResponseResultVO<?> registerCompany(@RequestBody Company company) {
-        return companyService.registerCompany(company);
+    @PostMapping({"register_company/{openid}"})
+    public ResponseResultVO<?> registerCompany(@RequestBody Company company, @PathVariable String openid) {
+        return companyService.registerCompany(company,openid);
     }
 }

+ 9 - 1
src/main/java/com/dk/oauth/feign/service/StaffFeign.java

@@ -14,7 +14,7 @@ import java.util.Map;
  * @desc : MdmServerFeign
  * @date : 2024-038-10 10:56
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1", path = Constant.MST_STAFF,contextId = "staff")
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1-jyh", path = Constant.MST_STAFF,contextId = "staff")
 public interface StaffFeign {
     /**
      * @desc   : 体验产品
@@ -23,4 +23,12 @@ public interface StaffFeign {
      */
     @PostMapping({"/feign_get_experience"})
     ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody Map<String, Object> collectQuery) ;
+
+    /**
+     * @desc   : 注册商户时候插入员工
+     * @author : 姜永辉
+     * @date   : 2023-11-02 16:27
+     */
+    @PostMapping({"/feign_insert_staff"})
+    ResponseResultVO<StaffResponse> insertFeignStaff(@RequestBody Map<String, Object> collectQuery) ;
 }

+ 3 - 1
src/main/java/com/dk/oauth/mapper/UserMapper.java

@@ -1,5 +1,7 @@
 package com.dk.oauth.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dk.oauth.entity.Company;
 import com.dk.oauth.entity.UserLogin;
 import com.dk.oauth.entity.UserWxLogin;
 import org.apache.ibatis.annotations.Param;
@@ -12,7 +14,7 @@ import java.util.Map;
  * @desc : UserMapper
  * @date : 2024-02-18 13:24
  */
-public interface UserMapper {
+public interface UserMapper  extends BaseMapper<UserLogin> {
     /**
      * @desc : 通过手机号查询
      * @author : 洪旭东

+ 1 - 1
src/main/java/com/dk/oauth/service/ICompanyService.java

@@ -15,7 +15,7 @@ import java.util.Map;
  */
 public interface ICompanyService  extends IService<Company> {
 
-    ResponseResultVO registerCompany(Company company);
+    ResponseResultVO registerCompany(Company company,String openid);
 
     ResponseResultVO selectById(Integer id);
 

+ 8 - 4
src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -5,6 +5,8 @@ import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.oauth.entity.Company;
+import com.dk.oauth.entity.UserLogin;
+import com.dk.oauth.entity.UserWxLogin;
 import com.dk.oauth.mapper.CompanyMapper;
 import com.dk.oauth.mapper.UserMapper;
 import com.dk.oauth.service.ICompanyService;
@@ -63,7 +65,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseResultVO registerCompany(Company company) {
+    public ResponseResultVO registerCompany(Company company,String openid) {
         Company c = new Company();
         c.setFlgValid(true);
         c.setCpName(company.getCpName());
@@ -71,14 +73,16 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         if (aLong > 0) {
             return ResponseResultUtil.error(ErrorCodeEnum.COMPANY_CODE_EXISTS.getCode(), ErrorCodeEnum.COMPANY_CODE_EXISTS.getMessage());
         }
-
         company.setCurStaffNum(0);
         company.setMaxStaffNum(0);
         companyMapper.insert(company);
 
-        // 注册用户
+        // 生成员工
+        UserLogin userLogin = userMapper.selectById(company.getOwner());
+
+        // 生成员工权限
 
-        // 注册权限
+        //
 
 
         return ResponseResultUtil.success(company);