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

+ 11 - 4
src/main/java/com/dk/oauth/mapper/CompanyMapper.java

@@ -18,9 +18,9 @@ import java.util.List;
  */
 public interface CompanyMapper extends BaseMapper<Company> {
     /**
-     * @desc   : 通过ID查询
+     * @desc : 通过ID查询
      * @author : 洪旭东
-     * @date   : 2024-02-18 15:21
+     * @date : 2024-02-18 15:21
      */
     CompanyResponse getByCpId(@Param("cpId") Integer cpId);
 
@@ -31,10 +31,17 @@ public interface CompanyMapper extends BaseMapper<Company> {
     Long countByCond(Company t);
 
     /**
-     * @desc   : 通过ID查询
+     * @desc : 通过ID查询
      * @author : 洪旭东
-     * @date   : 2024-02-18 15:21
+     * @date : 2024-02-18 15:21
      */
     Company selectById(@Param("cpId") Integer cpId);
 
+    /**
+     * @desc : 获取商户的地址服务
+     * @author : 姜永辉
+     * @date : 2024-02-18 15:21
+     */
+    String selectServiceAllot(@Param("gradeCode") String gradeCode);
+
 }

+ 23 - 3
src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -7,14 +7,17 @@ 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.feign.service.StaffFeign;
 import com.dk.oauth.mapper.CompanyMapper;
 import com.dk.oauth.mapper.UserMapper;
 import com.dk.oauth.service.ICompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +35,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     @Resource
     UserMapper userMapper;
 
+    @Autowired
+    StaffFeign staffFeign;
+
     /**
      * @desc : 通过ID查询
      * @author : admin
@@ -71,18 +77,32 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         c.setCpName(company.getCpName());
         Long aLong = companyMapper.countByCond(c);
         if (aLong > 0) {
-            return ResponseResultUtil.error(ErrorCodeEnum.COMPANY_CODE_EXISTS.getCode(), ErrorCodeEnum.COMPANY_CODE_EXISTS.getMessage());
+            return ResponseResultUtil.error(ErrorCodeEnum.COMPANY_CODE_EXISTS.getCode(),
+                    ErrorCodeEnum.COMPANY_CODE_EXISTS.getMessage());
         }
         company.setCurStaffNum(0);
         company.setMaxStaffNum(0);
+
+        //获取具体服务的地址
+        company.setSvcCode(companyMapper.selectServiceAllot(company.getGradeCode()));
         companyMapper.insert(company);
 
+        // 组织机构 -顶级
+
+
         // 生成员工
         UserLogin userLogin = userMapper.selectById(company.getOwner());
+        Map<String,Object> map = new HashMap<>();
+        map.put("staffName",userLogin.getUserPhone());
+        map.put("staffPhone",userLogin.getUserPhone());
+        map.put("orgId",userLogin.getUserPhone());
+        map.put("staffPhone",userLogin.getUserPhone());
+
+        staffFeign.insertFeignStaff(map);
+
+        // 生成员工权限 角色 仓库 等等。
 
-        // 生成员工权限
 
-        //
 
 
         return ResponseResultUtil.success(company);

+ 5 - 0
src/main/resources/mapper/CompanyMapper.xml

@@ -170,6 +170,11 @@
         </foreach>
     </sql>
 
+    <!-- 获取商户的地址服务 -->
+    <select id="selectServiceAllot" resultType="String">
+        SELECT dkic_a.f_allot_service(#{gradeCode})
+    </select>
+
     <!-- 查询表t_a_company,(条件查询+分页)列表 -->
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT