企业删除调用慧盈接口+删除部分多余代码

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/saasmanager/controller/HwPlatformCompanyController.java

@@ -137,24 +137,6 @@ public class HwPlatformCompanyController {
 
 
     /**
-     * 编辑企业信息
-     *
-     * @param hwPlatformCompany
-     * @return
-     */
-    @PutMapping(value = "/editInfo")
-    public Result<?> editInfo(@RequestBody HwPlatformCompany hwPlatformCompany) {
-        Result<HwPlatformCompany> result = new Result<HwPlatformCompany>();
-        try {
-            result = hwPlatformCompanyService.editInfo(hwPlatformCompany);
-        } catch (Exception e) {
-            log.error("设置失败", e.getMessage());
-            return Result.error("设置失败!");
-        }
-        return result;
-    }
-
-    /**
      * 认证企业
      *
      * @param hwPlatformCompany
@@ -209,13 +191,15 @@ public class HwPlatformCompanyController {
     @PutMapping(value = "/delete")
     public Result<?> delete(@RequestBody HwPlatformCompany hwPlatformCompany) {
         Result<HwPlatformCompany> result = new Result<HwPlatformCompany>();
-        try {
-            result = hwPlatformCompanyService.deleteByLogic(hwPlatformCompany);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return result.error500("删除失败!");
+        HwPlatformCompany hwPlatformCompany1=hwPlatformCompanyService.getById(hwPlatformCompany.getId());
+        //从慧盈获取是否存在业务数据（即是否存在企业服务商）
+        Boolean isExistenceDate=hwPlatformCompanyService.getIsExistenceDateByCompanyCode(hwPlatformCompany1.getCompanyCode(),1,10);
+        if(isExistenceDate){
+            result.error500("该企业已存在业务数据，不能删除");
+        }else {
+            hwPlatformCompanyService.deleteByLogic(hwPlatformCompany1);
+            result.success("删除成功!");
         }
-
         return result;
     }
 

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/saasmanager/mapper/HwPlatformCompanyMapper.java

@@ -20,8 +20,6 @@ public interface HwPlatformCompanyMapper extends BaseMapper<HwPlatformCompany> {
 
     void deleteByLogic(@Param("id") String id);
 
-    Integer findPlatformCompanyIdByUserCode(@Param("code") String id);
-
     int getCountOfRequire(@Param("id") Integer id);
 
     Integer findPlatformCompanyIdByDepartId(@Param("companyId") String companyId);
@@ -30,6 +28,5 @@ public interface HwPlatformCompanyMapper extends BaseMapper<HwPlatformCompany> {
 
     HwPlatformCompany getByOrgCode(@Param("orgCode") String orgCode);
 
-    void updateByIdHwPlatformCompany(@Param("hwPlatformCompany") HwPlatformCompany hwPlatformCompany1);
 
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/saasmanager/mapper/xml/HwPlatformCompanyMapper.xml

@@ -39,13 +39,6 @@
 
 
 
-    <select id="findPlatformCompanyIdByUserCode" resultType="int" >
-        SELECT
-         a.id
-        FROM hw_platform_company a
-        WHERE a.sys_org_code = #{code}
-    </select>
-
     <!--查询该企业需求单-->
     <select id="getCountOfRequire" resultType="int">
         select count(a.id) from hw_requirement a

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/saasmanager/service/IHwPlatformCompanyService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IHwPlatformCompanyService extends IService<HwPlatformCompany> {
 
-    Result<HwPlatformCompany> deleteByLogic(HwPlatformCompany hwPlatformCompany);
+    void deleteByLogic(HwPlatformCompany hwPlatformCompany);
 
     void lockCompany(HwPlatformCompany hwPlatformCompany);
 
@@ -31,7 +31,5 @@ public interface IHwPlatformCompanyService extends IService<HwPlatformCompany> {
 
     HwPlatformCompany getByOrgCode(String orgCode);
 
-    Result<HwPlatformCompany> editInfo(HwPlatformCompany hwPlatformCompany);
-
-
+    Boolean getIsExistenceDateByCompanyCode(String companyCode,Integer pageNo,Integer pageSize);
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/saasmanager/service/impl/HwPlatformCompanyServiceImpl.java

@@ -89,16 +89,8 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
      */
     @Override
     @Transactional
-    public Result<HwPlatformCompany> deleteByLogic(HwPlatformCompany hwPlatformCompany) {
+    public void deleteByLogic(HwPlatformCompany hwPlatformCompany) {
         Result<HwPlatformCompany> result = new Result<HwPlatformCompany>();
-        //查询该企业是否有需求单业务
-        int count = baseMapper.getCountOfRequire(hwPlatformCompany.getId());
-        if (count > 0) {
-            result.error500("该企业存在业务关系，无法删除！");
-            return result;
-        }
-        baseMapper.deleteByLogic(String.valueOf(hwPlatformCompany.getId()));
-        hwPlatformCompany = this.getById(hwPlatformCompany.getId());
         //获取当前企业的机构code
         String sysOrgCode = hwPlatformCompany.getSysOrgCode();
         //获取当前企业
@@ -118,10 +110,64 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
             sysUser1.setUpdateBy(sysUser.getUsername());
             sysUserService.deleteByCompany(sysUser1);
         }
-        result.success("删除成功!");
-        return result;
+        removeById(hwPlatformCompany);
+        //同步删除慧盈
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = WisdomUrlUtil.companyDelete;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("companyCode", hwPlatformCompany.getCompanyCode());
+        log.info("param============{}", JSONObject.toJSONString(parameters));
+        //数据加密
+        String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
+        JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
+        log.info("企业-删除===={}", jsonObject);
+        if (jsonObject != null) {
+            if (jsonObject.getBoolean("success")) {
+                log.info("企业-删除成功===={}", jsonObject);
+            } else {
+                //抛出异常，事务回滚
+                throw new JeecgBootException("删除失败");
+            }
+        } else {
+            throw new JeecgBootException("删除失败");
+        }
+    }
+
+
+    /**
+     * 从慧盈获取是否存在业务数据（即是否存在企业服务商）
+     * @param companyCode
+     * @return
+     */
+    @Override
+    public Boolean getIsExistenceDateByCompanyCode(String companyCode,Integer pageNo,Integer pageSize) {
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = WisdomUrlUtil.companySubcontractorList;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("companyCode", companyCode);
+        parameters.put("pageNo", pageNo);
+        parameters.put("pageSize", pageSize);
+        log.info("param============{}", JSONObject.toJSONString(parameters));
+        //数据加密
+        String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
+        JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
+        log.info("companyCode===={}", jsonObject);
+        if (jsonObject != null) {
+            if (jsonObject.getBoolean("success")) {
+                log.info("企业-获取服务商列表===={}", jsonObject);
+                JSONObject jsonObject1=jsonObject.getJSONObject("result");
+                List<Object>  list= (List<Object>) jsonObject1.get("records");
+                return list.size()>0;
+            } else {
+                //抛出异常
+                throw new JeecgBootException("未查询到该companyCode的企业数据");
+            }
+        } else {
+            throw new JeecgBootException("查询失败");
+        }
     }
 
+
     /**
      * 锁定/解锁企业
      *
@@ -376,19 +422,4 @@ public class HwPlatformCompanyServiceImpl extends ServiceImpl<HwPlatformCompanyM
     }
 
 
-
-    /**
-     * 编辑企业信息
-     *
-     * @param hwPlatformCompany
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Result<HwPlatformCompany> editInfo(HwPlatformCompany hwPlatformCompany) {
-        Result<HwPlatformCompany> result = new Result<HwPlatformCompany>();
-        result.success("编辑成功");
-        return result;
-    }
-
-
 }