充值有问题，bug还原

fs-admin/src/main/java/com/fs/company/controller/CompanyDeductController.java

@@ -14,7 +14,6 @@ import com.fs.company.domain.CompanyDeduct;
 import com.fs.company.domain.CompanyMoneyLogs;
 import com.fs.company.service.ICompanyDeductService;
 import com.fs.company.service.ICompanyMoneyLogsService;
-import com.fs.company.service.ICompanyRechargeService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyDeductExportVO;
 import com.fs.company.vo.CompanyDeductVO;
@@ -46,10 +45,6 @@ public class CompanyDeductController extends BaseController
     private ICompanyService companyService;
     @Autowired
     private ICompanyMoneyLogsService moneyLogsService;
-
-    @Autowired
-    private ICompanyRechargeService companyRechargeService;
-
     /**
      * 查询扣款列表
      */
@@ -112,7 +107,7 @@ public class CompanyDeductController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('company:companyDeduct:remove')")
     @Log(title = "扣款", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{deductIds}")
+    @DeleteMapping("/{deductIds}")
     public AjaxResult remove(@PathVariable Long[] deductIds)
     {
         return toAjax(companyDeductService.deleteCompanyDeductByIds(deductIds));
@@ -133,15 +128,7 @@ public class CompanyDeductController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if(deduct.getIsAudit()==1){
             Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
-
-            // 同步redis缓存
-            R r = companyRechargeService.syncUpdateRedisCompanyRecharge(company, deduct.getMoney(), 2);
-            if(!"200".equals(r.get("code").toString())){
-                return r;
-            }
-            // 充值后，需要同步更新余额到数据库，否则余额与缓存中的不一致
-            String newMoney = r.get("newMoney").toString();
-            company.setMoney(new BigDecimal(newMoney));
+            company.setMoney(company.getMoney().subtract(deduct.getMoney()));
             companyService.updateCompany(company);
             CompanyMoneyLogs log=new CompanyMoneyLogs();
             log.setCompanyId(deduct.getCompanyId());

fs-admin/src/main/java/com/fs/company/controller/CompanyRechargeController.java

@@ -24,7 +24,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -99,7 +98,7 @@ public class CompanyRechargeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('company:companyRecharge:remove')")
     @Log(title = "充值", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{rechargeIds}")
+    @DeleteMapping("/{rechargeIds}")
     public AjaxResult remove(@PathVariable Long[] rechargeIds)
     {
         return toAjax(companyRechargeService.deleteCompanyRechargeByIds(rechargeIds));
@@ -122,16 +121,7 @@ public class CompanyRechargeController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if(companyRecharge.getIsAudit()==1){
             Company company=companyService.selectCompanyById(companyRecharge.getCompanyId());
-
-            // 同步redis缓存
-            // 注意：在进行充值审核之前，需要先执行一下定时任务同步缓存数据到数据库，再进行后续操作，否则金额不正确
-            R r = companyRechargeService.syncUpdateRedisCompanyRecharge(company, companyRecharge.getMoney(), 1);
-            if(!"200".equals(r.get("code").toString())){
-                return r;
-            }
-            // 充值后，需要同步更新余额到数据库，否则余额与缓存中的不一致
-            String newMoney = r.get("newMoney").toString();
-            company.setMoney(new BigDecimal(newMoney));
+            company.setMoney(company.getMoney().add(companyRecharge.getMoney()));
             companyService.updateCompany(company);
             CompanyMoneyLogs log=new CompanyMoneyLogs();
             log.setCompanyId(companyRecharge.getCompanyId());