修改注册判断银行卡

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -1213,6 +1213,14 @@ public class CompanyServiceImpl implements CompanyService {
             companyResVo.setRewardType(CompanyConstant.CATEGORY_ACTIVATION_BONUS);
             companyConsumer.companyReward(companyResVo);
         }
+
+        if ( 1 == reqVo.getExamineStatus()) {
+            // 公司审核通过 同步给大数据平台
+            CompanyResVo companyResVo = new CompanyResVo();
+            ObjectHelper.writeWithFromClass(companyResVo, companyVo);
+            ObjectHelper.writeWithFromClass(companyResVo, companyExtendVo);
+            companyConsumer.synCompany(companyResVo);
+        }
     }
 
     public void saveCompanyRule(List<CompanyRuleVo> companyRuleVoList, CompanyVo companyVo) {

src/main/java/com/pangding/web/authority/service/impl/FinanceServiceImpl.java

@@ -214,6 +214,7 @@ public class FinanceServiceImpl implements FinanceService {
         capitalFlowVo.setOrderId(StringHelper.getNewID());
         capitalFlowVo.setCategory(1);
         capitalFlowVo.setOrderFee(withdrawFee + lateFee);
+        capitalFlowVo.setServiceCharge(lateFee);
         capitalFlowVo.setActualMoney(req.getOrderMoney() - capitalFlowVo.getOrderFee());
         capitalFlowVo.setTime(DateHelper.getNow());
         capitalFlowVo.setStatus(0);
@@ -379,6 +380,8 @@ public class FinanceServiceImpl implements FinanceService {
                 UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
                 updateCompanyMoneyReqVo.setCompanyId(req.getCompanyId());
                 updateCompanyMoneyReqVo.setFrozenMoney(-capitalFlowVo.getOrderMoney());
+                updateCompanyMoneyReqVo.setNewWithdrawTotalCash(0d);
+                updateCompanyMoneyReqVo.setLateFee(-capitalFlowVo.getServiceCharge());
                 companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
 
                 CompanyResVo companyResVo = companyDao.load(capitalFlowVo.getCompanyId(), CompanyResVo.class);
@@ -390,11 +393,12 @@ public class FinanceServiceImpl implements FinanceService {
                     saveCompanyMoney(capitalFlowVo, companyResVo, oldMoney);
                 }
             }else{
-                // 修改公司金额
+                // 修改公司金额 提现失败 余额冲正
                 UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
                 updateCompanyMoneyReqVo.setCompanyId(req.getCompanyId());
                 updateCompanyMoneyReqVo.setNewWithdrawTotalCash(capitalFlowVo.getOrderMoney());
                 updateCompanyMoneyReqVo.setFrozenMoney(-capitalFlowVo.getOrderMoney());
+//                updateCompanyMoneyReqVo.setLateFee(capitalFlowVo.getOrderFee());
                 companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
             }
             capitalFlowDao.update(capitalFlowVo);

src/main/java/com/pangding/web/authority/util/UserTask.java

@@ -76,7 +76,7 @@ public class UserTask {
     /**
      * 服务费
      */
-    @Scheduled(cron = "0 5 0 * * ?")
+    @Scheduled(cron = "0 10 0 * * ?")
     public void serviceCharge() {
         CompanyReqVo companyReqVo = new CompanyReqVo();
         companyReqVo.setServiceChargeStatus(1);
@@ -86,11 +86,12 @@ public class UserTask {
         for (int i = 0; i < companyResVoList.size(); i++) {
             CompanyResVo companyResVo = companyResVoList.get(i);
             double serviceCharge = financeService.getServiceCharge(companyResVo);
+            System.out.println(companyResVo.getCompanyName() + "服务费" + serviceCharge );
             if(serviceCharge > 0 ){
                 UpdateCompanyMoneyReqVo updateCompanyMoneyReqVo = new UpdateCompanyMoneyReqVo();
                 updateCompanyMoneyReqVo.setCompanyId(companyResVo.getId());
                 updateCompanyMoneyReqVo.setNewWithdrawTotalCash(0d);
-                updateCompanyMoneyReqVo.setLateFee(-serviceCharge);
+                updateCompanyMoneyReqVo.setLateFee(serviceCharge);
                 companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
             }
         }