修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerCompInfoServiceImpl.java

@@ -49,19 +49,20 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
 
     /**
      * 添加所属公司
+     *
      * @param hyCargoOwnerCompInfo
      * @return
      */
     @Override
-    public String addCargoOwnerComp(HyCargoOwnerCompInfo hyCargoOwnerCompInfo){
+    public String addCargoOwnerComp(HyCargoOwnerCompInfo hyCargoOwnerCompInfo) {
         //新增主键id
         hyCargoOwnerCompInfo.setId(IdGenerator.generateUUID());
         hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
         hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
         //判断是否已经认证
         HyCargoOwnerCompInfo hyCargoOwnerCompInfo1 = this.selectOne(new EntityWrapper<HyCargoOwnerCompInfo>()
-                .eq("common_id",hyCargoOwnerCompInfo.getCommonId())
-                .eq("company",hyCargoOwnerCompInfo.getCompany())
+                .eq("common_id", hyCargoOwnerCompInfo.getCommonId())
+                .eq("company", hyCargoOwnerCompInfo.getCompany())
                 .eq("delete_flag", NumberConstant.CONSTANT0));
         if (hyCargoOwnerCompInfo1 != null) {
             throw new YException(YExceptionEnum.COMPANY_AUTHENTICATION);
@@ -71,10 +72,10 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         HyCompanyInfo hyCompanyInfo = companyInfoService.selectOne(new EntityWrapper<HyCompanyInfo>()
                 .eq("company_name", hyCargoOwnerCompInfo.getCompany())
                 .eq("legal_person_name", hyCargoOwnerCompInfo.getLegalPersonName())
-                .eq("delete_flag","0"));
+                .eq("delete_flag", "0"));
         //根据用户id查询货主个人信息
         HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
-            .eq("common_id", hyCargoOwnerCompInfo.getCommonId()).eq("delete_flag","0"));
+                .eq("common_id", hyCargoOwnerCompInfo.getCommonId()).eq("delete_flag", "0"));
         //新增代理货主信息
         HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo = new HyAgentCargoOwnerInfo();
         hyAgentCargoOwnerInfo.setId(IdGenerator.generateUUID());
@@ -87,9 +88,9 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         hyAgentCargoOwnerInfo.setStatus(StatusEnum.TO_BE_REVIEWED.getName());
         hyAgentCargoOwnerInfo.setStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
         boolean two = agentCargoOwnerInfoService.insert(hyAgentCargoOwnerInfo);
-        if (one && two){
+        if (one && two) {
             return "OK";
-        }else {
+        } else {
             return "NG";
         }
     }
@@ -99,12 +100,25 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
      */
     @Override
     public String editCargoOwnerComp(HyCargoOwnerCompInfo hyCargoOwnerCompInfo) {
-            //信息编辑
-            hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
-            hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
-            this.updateById(hyCargoOwnerCompInfo);
-
-        return "OK";
+        //信息编辑
+        hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+        hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
+        boolean one = this.updateById(hyCargoOwnerCompInfo);
+        //查询代理货主信息
+        HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo = agentCargoOwnerInfoService.selectOne(new EntityWrapper<HyAgentCargoOwnerInfo>()
+                .eq("agent_common_id", hyCargoOwnerCompInfo.getCommonId()).eq("company", hyCargoOwnerCompInfo.getCompany())
+                .eq("delete_flag", "0"));
+        if (hyCargoOwnerCompInfo.getCertificateAddressUrl() != null) {
+            hyAgentCargoOwnerInfo.setCertificateAddressUrl(hyCargoOwnerCompInfo.getCertificateAddressUrl());
+        }
+        hyAgentCargoOwnerInfo.setStatus(StatusEnum.TO_BE_REVIEWED.getName());
+        hyAgentCargoOwnerInfo.setStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+        boolean two = agentCargoOwnerInfoService.updateById(hyAgentCargoOwnerInfo);
+        if (one && two) {
+            return "OK";
+        } else {
+            return "NG";
+        }
     }
 
     /**
@@ -121,8 +135,8 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
         }
         //删除代理货主信息
         HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo = agentCargoOwnerInfoService.selectOne(new EntityWrapper<HyAgentCargoOwnerInfo>()
-        .eq("agent_common_id",hyCargoOwnerCompInfo.getCommonId()).eq("delete_flag","0"));
-        if (hyAgentCargoOwnerInfo != null){
+                .eq("agent_common_id", hyCargoOwnerCompInfo.getCommonId()).eq("delete_flag", "0"));
+        if (hyAgentCargoOwnerInfo != null) {
             agentCargoOwnerInfoService.deleteById(hyAgentCargoOwnerInfo.getId());
         }
     }
@@ -186,7 +200,7 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
 //                webSocket.sendOneMessage(messageDO);
             }
 //            驳回
-            else if("2".equals(hyCargoOwnerCompInfo.getFlag())){
+            else if ("2".equals(hyCargoOwnerCompInfo.getFlag())) {
                 hyCargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_REJECTED.getFlag());
                 hyCargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_REJECTED.getName());
                 this.updateById(hyCargoOwnerCompInfo);
@@ -213,24 +227,25 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
 
     /**
      * 发布任务货主列表
+     *
      * @param commonId
      * @return
      */
     @Override
-    public GoodsSourceView cargoOwnerList (String commonId){
-    //查询货主所属公司
-    List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfos = this.selectList(new EntityWrapper<HyCargoOwnerCompInfo>()
-    .eq("common_id",commonId).eq("status_key","9").eq("delete_flag","0"));
-    //查询认证企业
-    List<HyCompanyInfo> hyCompanyInfos = companyInfoService.selectList(new EntityWrapper<HyCompanyInfo>().eq("common_id",commonId)
-    .eq("status_key","5").eq("delete_flag","0"));
-    GoodsSourceView goodsSourceView1 = new GoodsSourceView();
-    if (!CollectionUtils.isEmpty(hyCargoOwnerCompInfos)){
-        goodsSourceView1.setHyCargoOwnerCompInfoList(hyCargoOwnerCompInfos);
-    }
-    if (!CollectionUtils.isEmpty(hyCompanyInfos)){
-        goodsSourceView1.setHyCompanyInfoList(hyCompanyInfos);
-    }
-    return goodsSourceView1;
+    public GoodsSourceView cargoOwnerList(String commonId) {
+        //查询货主所属公司
+        List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfos = this.selectList(new EntityWrapper<HyCargoOwnerCompInfo>()
+                .eq("common_id", commonId).eq("status_key", "9").eq("delete_flag", "0"));
+        //查询认证企业
+        List<HyCompanyInfo> hyCompanyInfos = companyInfoService.selectList(new EntityWrapper<HyCompanyInfo>().eq("common_id", commonId)
+                .eq("status_key", "5").eq("delete_flag", "0"));
+        GoodsSourceView goodsSourceView1 = new GoodsSourceView();
+        if (!CollectionUtils.isEmpty(hyCargoOwnerCompInfos)) {
+            goodsSourceView1.setHyCargoOwnerCompInfoList(hyCargoOwnerCompInfos);
+        }
+        if (!CollectionUtils.isEmpty(hyCompanyInfos)) {
+            goodsSourceView1.setHyCompanyInfoList(hyCompanyInfos);
+        }
+        return goodsSourceView1;
     }
 }