修改注册判断银行卡

src/main/java/com/pangding/web/authority/dao/impl/CompanyMoneyDaoImpl.java

@@ -40,8 +40,9 @@ public class CompanyMoneyDaoImpl extends BaseDaoImpl implements CompanyMoneyDao
 
         table.add(UPDATE_MONEY, "update pd_company_money set in_money = in_money + @inMoney,in_number= in_number + @inNumber," +
                 "refund_number = refund_number + @refundNumber,refund_money = refund_money + @refundMoney," +
+                "divide_number = divide_number + @divideNumber,divideMoney = divideMoney + @divideMoney," +
                 "out_number = out_number + @outNumber,out_money = out_money + @outMoney," +
-                "final_money = init_money + in_money + refund_money + out_money " +
+                "final_money = init_money + in_money + divide_money + refund_money + out_money " +
                 " where company_money_id = @companyMoneyId");
 
         table.add(LAST_INFO, "SELECT * FROM pd_company_money WHERE 1=1 {WHERE} order by daily_date desc")

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

@@ -407,7 +407,6 @@ public class AuthorityServiceImpl implements AuthorityService {
                 throw new CodeException(String.format("存在数据不合理,子节点[%s]父id[%s]不存在", id, pid));
             }
         }
-
         return root;
     }
 

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

@@ -1475,10 +1475,6 @@ public class CompanyServiceImpl implements CompanyService {
         for (int i = 0; i < companyInvitationRuleVoList.size(); i++) {
             CompanyInvitationRuleVo companyInvitationRuleVo = companyInvitationRuleVoList.get(i);
             if (!StringHelper.isEmpty(companyInvitationRuleVo.getEndDate()) && !StringHelper.isEmpty(companyInvitationRuleVo.getStartDate())) {
-                System.out.println(DateHelper.compare(DateHelper.getDateTime(DateHelper.getToday(DateHelper.getCurDate())),
-                        DateHelper.getDateTime(companyInvitationRuleVo.getStartDate().substring(0, 10))));
-                System.out.println(DateHelper.compare(DateHelper.getDateTime(DateHelper.getToday(DateHelper.getCurDate())),
-                        DateHelper.getDateTime(companyInvitationRuleVo.getEndDate().substring(0, 10))));
                 if (DateHelper.compare(DateHelper.getDateTime(DateHelper.getToday(DateHelper.getCurDate())),
                         DateHelper.getDateTime(companyInvitationRuleVo.getStartDate().substring(0, 10))) <= 0 &&
                         DateHelper.compare(DateHelper.getDateTime(DateHelper.getToday(DateHelper.getCurDate())),

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

@@ -441,7 +441,7 @@ public class FinanceServiceImpl implements FinanceService {
 
                 CompanyResVo companyResVo = companyDao.load(capitalFlowVo.getCompanyId(), CompanyResVo.class);
                 if (!StringHelper.isEmpty(companyResVo)) {
-                    double oldMoney = companyResVo.getWithdrawTotalCash() + capitalFlowVo.getActualMoney();
+                    double oldMoney = companyResVo.getWithdrawTotalCash() - capitalFlowVo.getActualMoney();
                     double newMoney = oldMoney + capitalFlowVo.getActualMoney();
                     capitalFlowVo.setInitMoney(oldMoney);
                     capitalFlowVo.setFinalMoney(newMoney);
@@ -510,14 +510,19 @@ public class FinanceServiceImpl implements FinanceService {
     public void saveCompanyMoney(CapitalFlowVo capitalFlowVo, CompanyResVo companyVo, double initMoney) {
         //修改公司余额
         double oldMoney = initMoney;
-        double inMoney = 0d, outMoney = 0d, refundMoney = 0d;
-        int inNumber = 0, outNumber = 0, refundNumber = 0;
+        double inMoney = 0d, outMoney = 0d, refundMoney = 0d, divideMoney = 0d;
+        int inNumber = 0, outNumber = 0, refundNumber = 0, divideNumber = 0;
         if (CompanyConstant.CATEGORY_ENTRY == capitalFlowVo.getCategory()
                 || CompanyConstant.CATEGORY_RECHARGE == capitalFlowVo.getCategory()) {
             // 交易订单金额 充值 分润
             inNumber = 1;
             inMoney = capitalFlowVo.getActualMoney();
         }
+        if (capitalFlowVo.getCategory() >= 4 && capitalFlowVo.getCategory() <= 10) {
+            // 分润
+            divideNumber = 1;
+            divideMoney = capitalFlowVo.getActualMoney();
+        }
         if (CompanyConstant.CATEGORY_REFUND == capitalFlowVo.getCategory()) {
             // 退款
             refundNumber = 1;
@@ -539,22 +544,26 @@ public class FinanceServiceImpl implements FinanceService {
             companyMoneyVo.setDailyDate(DateHelper.getToday());
             companyMoneyVo.setCompanyName(companyVo.getCompanyName());
             companyMoneyVo.setInitMoney(oldMoney);
-            companyMoneyVo.setInMoney(inMoney);
-            companyMoneyVo.setOutMoney(outMoney);
-            companyMoneyVo.setRefundMoney(refundMoney);
-            companyMoneyVo.setFinalMoney(companyMoneyVo.getInitMoney() + companyMoneyVo.getInMoney() + companyMoneyVo.getOutMoney()
-                    + companyMoneyVo.getRefundMoney());
             companyMoneyVo.setInNumber(inNumber);
+            companyMoneyVo.setInMoney(inMoney);
             companyMoneyVo.setOutNumber(outNumber);
+            companyMoneyVo.setOutMoney(outMoney);
             companyMoneyVo.setRefundNumber(refundNumber);
+            companyMoneyVo.setRefundMoney(refundMoney);
+            companyMoneyVo.setDivideNumber(divideNumber);
+            companyMoneyVo.setDivideMoney(divideMoney);
+            companyMoneyVo.setFinalMoney(companyMoneyVo.getInitMoney() + companyMoneyVo.getInMoney() + companyMoneyVo.getDivideMoney()
+                    + companyMoneyVo.getOutMoney() + companyMoneyVo.getRefundMoney());
             companyMoneyDao.create(companyMoneyVo);
         } else {
-            companyMoneyVo.setInMoney(inMoney);
-            companyMoneyVo.setOutMoney(outMoney);
-            companyMoneyVo.setRefundMoney(refundMoney);
             companyMoneyVo.setInNumber(inNumber);
+            companyMoneyVo.setInMoney(inMoney);
+            companyMoneyVo.setDivideNumber(divideNumber);
+            companyMoneyVo.setDivideMoney(divideMoney);
             companyMoneyVo.setOutNumber(outNumber);
+            companyMoneyVo.setOutMoney(outMoney);
             companyMoneyVo.setRefundNumber(refundNumber);
+            companyMoneyVo.setRefundMoney(refundMoney);
             companyMoneyDao.updateCompanyMoney(companyMoneyVo);
         }
         if (0 == companyVo.getActivationStatus() && 1 == companyVo.getExamineStatus()) {
@@ -566,8 +575,6 @@ public class FinanceServiceImpl implements FinanceService {
             companyVo.setRewardType(CompanyConstant.CATEGORY_ACTIVATION_SALE_BONUS);
             companyConsumer.companyReward(companyVo);
         }
-
     }
 
-
 }

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

@@ -463,12 +463,6 @@ public class RegisterServiceImpl implements RegisterService {
             resVo.setMerchant(null);
         }
 
-        /*获取用户权限列表*/
-        RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
-        roleAuthorityGetReqVo.setUserId(userVo.getId());
-        List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDao.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
-        resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
-
         // 判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面
         if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON == (companyVo.getCompanyType())) {
             resVo.setCode("01");
@@ -499,12 +493,19 @@ public class RegisterServiceImpl implements RegisterService {
             return resVo;
         }*/
 
-        if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()) {
-            /*该公司没有银行卡，需要跳转添加银行卡*/
-            resVo.setCode("03");
-            resVo.setMsg("还未添加银行卡，跳转添加银行卡页面");
-            return resVo;
-        }
+//        if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()) {
+//            /*该公司没有银行卡，需要跳转添加银行卡*/
+//            resVo.setCode("03");
+//            resVo.setMsg("还未添加银行卡，跳转添加银行卡页面");
+//            return resVo;
+//        }
+        /*获取用户权限列表*/
+        RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
+        roleAuthorityGetReqVo.setUserId(userVo.getId());
+        List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDao.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
+        resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
+
+
         loginCompanyResVo.setBankCardVoList(companyBankCardVoList);
         resVo.setCompanyResVo(loginCompanyResVo);