企业服务商账号创建判断是否存在，创建人同步

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwCompanySubcontractorApiController.java

@@ -123,6 +123,7 @@ public class HlwCompanySubcontractorApiController extends JeecgController<HlwCom
         Double serviceRate = jsonObject.getDouble("serviceRate");
         String serviceContract = jsonObject.getString("serviceContract");
         Integer applicationId = jsonObject.getInteger("applicationId");
+        String createBy = jsonObject.getString("createBy");
         //1:服务商 2：开心
         Integer cpType = jsonObject.getInteger("cpType");
         log.info("companyCode========={}", companyCode);
@@ -148,6 +149,7 @@ public class HlwCompanySubcontractorApiController extends JeecgController<HlwCom
             hlwCompanySubcontractor.setServiceRate(serviceRate);
             hlwCompanySubcontractor.setServiceContract(serviceContract);
             hlwCompanySubcontractor.setCpType(cpType);
+            hlwCompanySubcontractor.setCreateBy(createBy);
             //插入数据
             hlwCompanySubcontractorService.saveCompanySubcontractor(applicationId, hlwCompanySubcontractor);
             return Result.ok("新增成功");

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/service/impl/HlwCompanySubcontractorServiceImpl.java

@@ -53,27 +53,37 @@ public class HlwCompanySubcontractorServiceImpl extends ServiceImpl<HlwCompanySu
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveCompanySubcontractor(Integer applicationId, HlwCompanySubcontractor hlwCompanySubcontractor) {
-        HlwCompanyAccount hlwCompanyAccount=new HlwCompanyAccount();
+        //判断该企业服务商账户是否已存在
+        QueryWrapper<HlwCompanyAccount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("application_id", applicationId);
+        queryWrapper.eq("company_id", hlwCompanySubcontractor.getCompanyId());
+        HlwCompanyAccount hlwCompanyAccount = new HlwCompanyAccount();
         //1:服务商 2：开心
         if (hlwCompanySubcontractor.getCpType() == 1) {
             hlwCompanyAccount.setSubcontractorId(hlwCompanySubcontractor.getSubcontractorId());
             save(hlwCompanySubcontractor);
+            queryWrapper.eq("subcontractor_id", hlwCompanySubcontractor.getSubcontractorId());
         } else if (hlwCompanySubcontractor.getCpType() == 2) {
             hlwCompanyAccount.setCpId(hlwCompanySubcontractor.getSubcontractorId());
-            HlwCompanyCp hlwCompanyCp=new HlwCompanyCp();
+            HlwCompanyCp hlwCompanyCp = new HlwCompanyCp();
             hlwCompanyCp.setCompanyId(hlwCompanySubcontractor.getCompanyId());
             hlwCompanyCp.setCpId(hlwCompanySubcontractor.getSubcontractorId());
             hlwCompanyCp.setServiceRate(hlwCompanySubcontractor.getServiceRate());
             hlwCompanyCp.setServiceContract(hlwCompanySubcontractor.getServiceContract());
             hlwCompanyCpService.save(hlwCompanyCp);
+            queryWrapper.eq("cp_id", hlwCompanySubcontractor.getSubcontractorId());
+        }
+        int count = hlwCompanyAccountService.count(queryWrapper);
+        if (count > 0) {
+            hlwCompanyAccount.setApplicationId(applicationId);
+            hlwCompanyAccount.setCompanyId(hlwCompanySubcontractor.getCompanyId());
+            hlwCompanyAccount.setTotalDeposit(0.00);
+            hlwCompanyAccount.setTotalPayment(0.00);
+            hlwCompanyAccount.setTotalServiceFee(0.00);
+            hlwCompanyAccount.setBalance(0.00);
+            hlwCompanyAccount.setCreateBy(hlwCompanySubcontractor.getCreateBy());
+            hlwCompanyAccountService.save(hlwCompanyAccount);
         }
-        hlwCompanyAccount.setApplicationId(applicationId);
-        hlwCompanyAccount.setCompanyId(hlwCompanySubcontractor.getCompanyId());
-        hlwCompanyAccount.setTotalDeposit(0.00);
-        hlwCompanyAccount.setTotalPayment(0.00);
-        hlwCompanyAccount.setTotalServiceFee(0.00);
-        hlwCompanyAccount.setBalance(0.00);
-        hlwCompanyAccountService.save(hlwCompanyAccount);
     }
 
 
@@ -82,19 +92,19 @@ public class HlwCompanySubcontractorServiceImpl extends ServiceImpl<HlwCompanySu
     public String updateCompanySubcontractor(HlwCompanySubcontractor hlwCompanySubcontractor) {
         //1:服务商 2：开心
         if (hlwCompanySubcontractor.getCpType() == 1) {
-            List<HlwCompanySubcontractor> hlwCompanySubcontractorList=findBycompanyIdAndSubcontractorId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-            if(hlwCompanySubcontractorList.size()>0){
+            List<HlwCompanySubcontractor> hlwCompanySubcontractorList = findBycompanyIdAndSubcontractorId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+            if (hlwCompanySubcontractorList.size() > 0) {
                 //更新服务商
-                HlwCompanySubcontractor hlwCompanySubcontractor1=hlwCompanySubcontractorList.get(0);
+                HlwCompanySubcontractor hlwCompanySubcontractor1 = hlwCompanySubcontractorList.get(0);
                 hlwCompanySubcontractor1.setServiceContract(hlwCompanySubcontractor.getServiceContract());
                 hlwCompanySubcontractor1.setServiceRate(hlwCompanySubcontractor.getServiceRate());
                 updateById(hlwCompanySubcontractor1);
             }
         } else if (hlwCompanySubcontractor.getCpType() == 2) {
             //cpType=1时subcontractorId为服务商subcontractorId，cpType=2时subcontractorId为开心平台cpid
-            List<HlwCompanyCp> hlwCompanyCpList=hlwCompanyCpService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-            if(hlwCompanyCpList.size()>0){
-                HlwCompanyCp hlwCompanyCp=hlwCompanyCpList.get(0);
+            List<HlwCompanyCp> hlwCompanyCpList = hlwCompanyCpService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+            if (hlwCompanyCpList.size() > 0) {
+                HlwCompanyCp hlwCompanyCp = hlwCompanyCpList.get(0);
                 hlwCompanyCp.setServiceContract(hlwCompanySubcontractor.getServiceContract());
                 hlwCompanyCp.setServiceRate(hlwCompanySubcontractor.getServiceRate());
                 hlwCompanyCpService.updateById(hlwCompanyCp);
@@ -109,18 +119,18 @@ public class HlwCompanySubcontractorServiceImpl extends ServiceImpl<HlwCompanySu
     public String updateIsOn(HlwCompanySubcontractor hlwCompanySubcontractor) {
         //1:服务商 2：开心
         if (hlwCompanySubcontractor.getCpType() == 1) {
-            List<HlwCompanySubcontractor> hlwCompanySubcontractorList=findBycompanyIdAndSubcontractorId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-            if(hlwCompanySubcontractorList.size()>0){
+            List<HlwCompanySubcontractor> hlwCompanySubcontractorList = findBycompanyIdAndSubcontractorId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+            if (hlwCompanySubcontractorList.size() > 0) {
                 //更新服务商
-                HlwCompanySubcontractor hlwCompanySubcontractor1=hlwCompanySubcontractorList.get(0);
+                HlwCompanySubcontractor hlwCompanySubcontractor1 = hlwCompanySubcontractorList.get(0);
                 hlwCompanySubcontractor1.setIsOn(hlwCompanySubcontractor.getIsOn());
                 updateById(hlwCompanySubcontractor1);
             }
         } else if (hlwCompanySubcontractor.getCpType() == 2) {
             //cpType=1时subcontractorId为服务商subcontractorId，cpType=2时subcontractorId为开心平台cpid
-            List<HlwCompanyCp> hlwCompanyCpList=hlwCompanyCpService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-            if(hlwCompanyCpList.size()>0){
-                HlwCompanyCp hlwCompanyCp=hlwCompanyCpList.get(0);
+            List<HlwCompanyCp> hlwCompanyCpList = hlwCompanyCpService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+            if (hlwCompanyCpList.size() > 0) {
+                HlwCompanyCp hlwCompanyCp = hlwCompanyCpList.get(0);
                 hlwCompanyCp.setIsOn(hlwCompanySubcontractor.getIsOn());
                 hlwCompanyCpService.updateById(hlwCompanyCp);
             }
@@ -134,32 +144,32 @@ public class HlwCompanySubcontractorServiceImpl extends ServiceImpl<HlwCompanySu
     public String deleteCompanySubcontractor(HlwCompanySubcontractor hlwCompanySubcontractor) {
         //1:服务商 2：开心
         if (hlwCompanySubcontractor.getCpType() == 1) {
-            List<HlwCompanySubcontractor> hlwCompanySubcontractorList=findBycompanyIdAndSubcontractorId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-            if(hlwCompanySubcontractorList.size()>0){
+            List<HlwCompanySubcontractor> hlwCompanySubcontractorList = findBycompanyIdAndSubcontractorId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+            if (hlwCompanySubcontractorList.size() > 0) {
                 //查询是否存在业务数据（充值付款信息）
-                List<HlwPayment> hlwPaymentList=hlwPaymentService.findListByCompanyIdAndSunId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-                List<HlwCompanyAccount>  hlwCompanyAccountList=hlwCompanyAccountService.findListByCompanyIdAndSubId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-                if(hlwPaymentList.size()>0 || hlwCompanyAccountList.size()>0){
+                List<HlwPayment> hlwPaymentList = hlwPaymentService.findListByCompanyIdAndSunId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+                List<HlwCompanyAccount> hlwCompanyAccountList = hlwCompanyAccountService.findListByCompanyIdAndSubId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+                if (hlwPaymentList.size() > 0 || hlwCompanyAccountList.size() > 0) {
                     return "已存在业务数据，无法删除";
-                }else{
-                    hlwCompanyAccountService.deleteByCompanyIdAndSubId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
+                } else {
+                    hlwCompanyAccountService.deleteByCompanyIdAndSubId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
                     //删除服务商
-                    HlwCompanySubcontractor hlwCompanySubcontractor1=hlwCompanySubcontractorList.get(0);
+                    HlwCompanySubcontractor hlwCompanySubcontractor1 = hlwCompanySubcontractorList.get(0);
                     removeById(hlwCompanySubcontractor1);
                 }
             }
         } else if (hlwCompanySubcontractor.getCpType() == 2) {
             //cpType=1时subcontractorId为服务商subcontractorId，cpType=2时subcontractorId为开心平台cpid
-            List<HlwCompanyCp> hlwCompanyCpList=hlwCompanyCpService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-            if(hlwCompanyCpList.size()>0){
+            List<HlwCompanyCp> hlwCompanyCpList = hlwCompanyCpService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+            if (hlwCompanyCpList.size() > 0) {
                 //查询是否存在业务数据（充值付款信息）
-                List<HlwPayment> hlwPaymentList=hlwPaymentService.findListByCompanyId(hlwCompanySubcontractor.getCompanyId());
-                List<HlwCompanyAccount>  hlwCompanyAccountList=hlwCompanyAccountService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-                if(hlwPaymentList.size()>0 || hlwCompanyAccountList.size()>0){
+                List<HlwPayment> hlwPaymentList = hlwPaymentService.findListByCompanyId(hlwCompanySubcontractor.getCompanyId());
+                List<HlwCompanyAccount> hlwCompanyAccountList = hlwCompanyAccountService.findListByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+                if (hlwPaymentList.size() > 0 || hlwCompanyAccountList.size() > 0) {
                     return "已存在业务数据，无法删除";
-                }else{
-                    hlwCompanyAccountService.deleteByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(),hlwCompanySubcontractor.getSubcontractorId());
-                    HlwCompanyCp hlwCompanyCp=hlwCompanyCpList.get(0);
+                } else {
+                    hlwCompanyAccountService.deleteByCompanyIdAndCpId(hlwCompanySubcontractor.getCompanyId(), hlwCompanySubcontractor.getSubcontractorId());
+                    HlwCompanyCp hlwCompanyCp = hlwCompanyCpList.get(0);
                     hlwCompanyCpService.removeById(hlwCompanyCp);
                 }
             }
@@ -169,6 +179,6 @@ public class HlwCompanySubcontractorServiceImpl extends ServiceImpl<HlwCompanySu
 
     @Override
     public HlwCompanySubcontractor getByCompanyIdAndSubId(Integer companyId, Integer subcontractorId) {
-        return baseMapper.getByCompanyIdAndSubId(companyId,subcontractorId);
+        return baseMapper.getByCompanyIdAndSubId(companyId, subcontractorId);
     }
 }