修改商户余额资金流水

src/main/java/com/pangding/web/authority/mq/CompanyConsumer.java

@@ -15,6 +15,7 @@ import com.pangding.web.vo.order.tl.CashWithdrawalReqVo;
 import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.rabbitmq.client.Channel;
 import com.yanzuoguang.mq.service.MqService;
+import com.yanzuoguang.mq.vo.MessageVo;
 import com.yanzuoguang.util.helper.DateHelper;
 import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
@@ -70,8 +71,8 @@ public class CompanyConsumer {
             financeService.updateCompanyMoney(capitalFlowReqVo);
         } catch (Exception e) {
             Log.error(CompanyConsumer.class, e);
-//            mqService.message(new MessageVo(MqConstant.COMPANY_MONEY_UPDATE, MqConstant.COMPANY_MONEY_UPDATE,
-//                    content, 2000));
+            mqService.message(new MessageVo(MqConstant.COMPANY_MONEY_UPDATE, MqConstant.COMPANY_MONEY_UPDATE,
+                    content, 2000));
         } finally {
             mqService.basicAck(message, channel);
         }

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

@@ -940,17 +940,20 @@ public class CompanyServiceImpl implements CompanyService {
                     getCompanyReqVo = new GetCompanyReqVo();
                     getCompanyReqVo.setCompanyId(companyDivideResVo.getInvitationCompanyId());
                     GetCompanyDivideResVo companyDivideResVo1 = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
+                    if (!StringHelper.isEmpty(companyDivideResVo1) ) {
                         companyDivideResVo1.setCompanyChannelType(CompanyConstant.COMPANY_TYPE_BONUS);
                         companyDivideResVoList.add(companyDivideResVo1);
-                    if (!StringHelper.isEmpty(companyDivideResVo1) && !StringHelper.isEmpty(companyDivideResVo1.getPid())) {
+                        if (!StringHelper.isEmpty(companyDivideResVo1.getPid())) {
                             getCompanyReqVo = new GetCompanyReqVo();
                             getCompanyReqVo.setCompanyId(companyDivideResVo1.getPid());
                             GetCompanyDivideResVo companyDivideResVo2 = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
-                        companyDivideResVo1.setCompanyChannelType(CompanyConstant.COMPANY_TYPE_SUPER);
+                            if (!StringHelper.isEmpty(companyDivideResVo2) ) {
+                                companyDivideResVo2.setCompanyChannelType(CompanyConstant.COMPANY_TYPE_SUPER);
                                 companyDivideResVoList.add(companyDivideResVo2);
                             }
                         }
-
+                    }
+                }
             }
         }
         return companyDivideResVoList;
@@ -1187,9 +1190,4 @@ public class CompanyServiceImpl implements CompanyService {
         return companyResVo;
     }
 
-
-
-
-
-
 }

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

@@ -247,7 +247,7 @@ public class FinanceServiceImpl implements FinanceService {
         if (CompanyConstant.MONEY_CATEGORY_TYPE_DRAW == capitalFlowVo.getCategory()) {
             // 提现
             outNumber = 1;
-            outMoney = capitalFlowVo.getOrderMoney();
+            outMoney = -capitalFlowVo.getOrderMoney();
         }
         CompanyMoneyVo companyMoneyReqVo = new CompanyMoneyVo();
         companyMoneyReqVo.setDailyDate(DateHelper.getToday());
@@ -263,7 +263,8 @@ public class FinanceServiceImpl implements FinanceService {
             companyMoneyVo.setInMoney(inMoney);
             companyMoneyVo.setOutMoney(outMoney);
             companyMoneyVo.setRefundMoney(refundMoney);
-            companyMoneyVo.setFinalMoney(companyMoneyVo.getInitMoney() + companyMoneyVo.getInMoney() - companyMoneyVo.getOutMoney());
+            companyMoneyVo.setFinalMoney(companyMoneyVo.getInitMoney() + companyMoneyVo.getInMoney() + companyMoneyVo.getOutMoney()
+                    + companyMoneyVo.getRefundMoney());
             companyMoneyVo.setInNumber(inNumber);
             companyMoneyVo.setOutNumber(outNumber);
             companyMoneyVo.setRefundNumber(refundNumber);