Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -636,48 +636,48 @@ public class CompanyServiceImpl implements ICompanyService
     @Override
     @Transactional
     public void addCompanyPaymentMoney(FsStorePayment storePayment) {
-        Company company=companyMapper.selectCompanyByIdForUpdate(storePayment.getCompanyId());
-        if(company!=null){
-            company.setMoney(company.getMoney().add(storePayment.getPayMoney()));
-            company.setTuiMoney(company.getTuiMoney().add(storePayment.getPayMoney()));
-            companyMapper.updateCompany(company);
-            //写入日志
-            CompanyMoneyLogs log=new CompanyMoneyLogs();
-            log.setCompanyId(storePayment.getCompanyId());
-            log.setRemark("收款佣金入帐");
-            log.setMoney(storePayment.getPayMoney());
-            log.setLogsType(8);
-            log.setBalance(company.getMoney());
-            log.setCreateTime(new Date());
-            log.setBusinessId(storePayment.getPaymentId().toString());
-            moneyLogsMapper.insertCompanyMoneyLogs(log);
-
-
-        }
+//        Company company=companyMapper.selectCompanyByIdForUpdate(storePayment.getCompanyId());
+//        if(company!=null){
+//            company.setMoney(company.getMoney().add(storePayment.getPayMoney()));
+//            company.setTuiMoney(company.getTuiMoney().add(storePayment.getPayMoney()));
+//            companyMapper.updateCompany(company);
+//            //写入日志
+//            CompanyMoneyLogs log=new CompanyMoneyLogs();
+//            log.setCompanyId(storePayment.getCompanyId());
+//            log.setRemark("收款佣金入帐");
+//            log.setMoney(storePayment.getPayMoney());
+//            log.setLogsType(8);
+//            log.setBalance(company.getMoney());
+//            log.setCreateTime(new Date());
+//            log.setBusinessId(storePayment.getPaymentId().toString());
+//            moneyLogsMapper.insertCompanyMoneyLogs(log);
+//
+//
+//        }
 
     }
 
     @Override
     @Transactional
     public void addCompanyPaymentMoney(FsStorePaymentScrm storePayment) {
-        Company company=companyMapper.selectCompanyByIdForUpdate(storePayment.getCompanyId());
-        if(company!=null){
-            company.setMoney(company.getMoney().add(storePayment.getPayMoney()));
-            company.setTuiMoney(company.getTuiMoney().add(storePayment.getPayMoney()));
-            companyMapper.updateCompany(company);
-            //写入日志
-            CompanyMoneyLogs log=new CompanyMoneyLogs();
-            log.setCompanyId(storePayment.getCompanyId());
-            log.setRemark("收款佣金入帐");
-            log.setMoney(storePayment.getPayMoney());
-            log.setLogsType(8);
-            log.setBalance(company.getMoney());
-            log.setCreateTime(new Date());
-            log.setBusinessId(storePayment.getPaymentId().toString());
-            moneyLogsMapper.insertCompanyMoneyLogs(log);
-
-
-        }
+//        Company company=companyMapper.selectCompanyByIdForUpdate(storePayment.getCompanyId());
+//        if(company!=null){
+//            company.setMoney(company.getMoney().add(storePayment.getPayMoney()));
+//            company.setTuiMoney(company.getTuiMoney().add(storePayment.getPayMoney()));
+//            companyMapper.updateCompany(company);
+//            //写入日志
+//            CompanyMoneyLogs log=new CompanyMoneyLogs();
+//            log.setCompanyId(storePayment.getCompanyId());
+//            log.setRemark("收款佣金入帐");
+//            log.setMoney(storePayment.getPayMoney());
+//            log.setLogsType(8);
+//            log.setBalance(company.getMoney());
+//            log.setCreateTime(new Date());
+//            log.setBusinessId(storePayment.getPaymentId().toString());
+//            moneyLogsMapper.insertCompanyMoneyLogs(log);
+//
+//
+//        }
 
     }