合并分支

fs-service/src/main/java/com/fs/company/service/ICompanyService.java

@@ -101,7 +101,7 @@ public interface ICompanyService
 
     @Transactional
     void subCompanyMoney(FsStoreOrderScrm order);
-    public void subtractCompanyMoneyHourse(BigDecimal money, Long companyId, LocalTime localTime, LocalTime time);
+//    public void subtractCompanyMoneyHourse(BigDecimal money, Long companyId, LocalTime localTime, LocalTime time);
 
     Company selectCompanyByAppId(String appId);
 

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

@@ -553,27 +553,27 @@ public class CompanyServiceImpl implements ICompanyService
         }
     }
 
-    @Override
-    @Transactional
-    public void subtractCompanyMoneyHourse(BigDecimal money, Long companyId, LocalTime start, LocalTime end) {
-
-        if(companyId!=null&&companyId>0){
-            Company company=companyMapper.selectCompanyByIdForUpdate(companyId);
-            if(company!=null){
-                logger.info("每十分钟扣除红包金额:{}", money);
-                company.setMoney(company.getMoney().subtract(money));
-                companyMapper.updateCompany(company);
-                CompanyMoneyLogs log=new CompanyMoneyLogs();
-                log.setCompanyId(company.getCompanyId());
-                log.setRemark("扣除" + DateUtil.formatLocalTime(start, "HH:mm") + "到" + DateUtil.formatLocalTime(end, "HH:mm") +"红包金额");
-                log.setMoney(money.multiply(new BigDecimal(-1)));
-                log.setLogsType(15);
-                log.setBalance(company.getMoney());
-                log.setCreateTime(new Date());
-                moneyLogsMapper.insertCompanyMoneyLogs(log);
-            }
-        }
-    }
+//    @Override
+//    @Transactional
+//    public void subtractCompanyMoneyHourse(BigDecimal money, Long companyId, LocalTime start, LocalTime end) {
+//
+//        if(companyId!=null&&companyId>0){
+//            Company company=companyMapper.selectCompanyByIdForUpdate(companyId);
+//            if(company!=null){
+//                logger.info("每十分钟扣除红包金额:{}", money);
+//                company.setMoney(company.getMoney().subtract(money));
+//                companyMapper.updateCompany(company);
+//                CompanyMoneyLogs log=new CompanyMoneyLogs();
+//                log.setCompanyId(company.getCompanyId());
+//                log.setRemark("扣除" + DateUtil.formatLocalTime(start, "HH:mm") + "到" + DateUtil.formatLocalTime(end, "HH:mm") +"红包金额");
+//                log.setMoney(money.multiply(new BigDecimal(-1)));
+//                log.setLogsType(15);
+//                log.setBalance(company.getMoney());
+//                log.setCreateTime(new Date());
+//                moneyLogsMapper.insertCompanyMoneyLogs(log);
+//            }
+//        }
+//    }
 
     @Override
     public Company selectCompanyByAppId(String appId) {