Преглед изворни кода

审核接口实现 但是红包的有问题

xgb пре 2 месеци
родитељ
комит
721d8bd8e3

+ 32 - 32
fs-admin-saas/src/main/java/com/fs/his/controller/FsCompanyDeductController.java

@@ -1,4 +1,5 @@
 package com.fs.his.controller;
+import com.fs.common.core.domain.model.LoginUser;
 import com.fs.framework.web.service.TokenService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -132,38 +133,37 @@ public class FsCompanyDeductController extends BaseController
     @RepeatSubmit
     public R audit(@RequestBody CompanyDeduct param)
     {
-//        CompanyDeduct deduct=companyDeductService.selectCompanyDeductById(param.getDeductId());
-//        if(deduct.getIsAudit()!=0){
-//            return R.error("非法操作");
-//        }
-//        deduct.setIsAudit(param.getIsAudit());
-//        deduct.setRemark(param.getRemark());
-//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-//        if(deduct.getIsAudit()==1){
-//            if(1==param.getBusinessType()){// 红包充值
-//                // 更新红包充值余额redis字段
-//                companyService.redPacketTopUpCompany(deduct.getCompanyId(),deduct.getMoney(),"2");
-//            }else {
-//                Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
-//                company.setMoney(company.getMoney().subtract(deduct.getMoney()));
-//                deduct.setBalance(company.getMoney());
-//                companyService.updateCompany(company);
-//                //生成流水
-//                CompanyMoneyLogs log=new CompanyMoneyLogs();
-//                log.setCompanyId(deduct.getCompanyId());
-//                log.setMoney(deduct.getMoney().multiply(new BigDecimal(-1)));
-//                log.setRemark(deduct.getRemark());
-//                log.setLogsType(2);
-//                log.setBalance(company.getMoney());
-//                log.setCreateTime(new Date());
-//                moneyLogsService.insertCompanyMoneyLogs(log);
-//            }
-//        }
-//        deduct.setAuditTime(new Date());
-//        deduct.setAuditUserId(loginUser.getCompanyUser().getUserId());
-//        companyDeductService.updateCompanyDeduct(deduct);
-//        return R.ok("操作成功");
-        throw new RuntimeException("未实现");
+        CompanyDeduct deduct=companyDeductService.selectCompanyDeductById(param.getDeductId());
+        if(deduct.getIsAudit()!=0){
+            return R.error("非法操作");
+        }
+        deduct.setIsAudit(param.getIsAudit());
+        deduct.setRemark(param.getRemark());
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if(deduct.getIsAudit()==1){
+            if(1==param.getBusinessType()){// 红包充值
+                // 更新红包充值余额redis字段
+                companyService.redPacketTopUpCompany(deduct.getCompanyId(),deduct.getMoney(),"2");
+            }else {
+                Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
+                company.setMoney(company.getMoney().subtract(deduct.getMoney()));
+                deduct.setBalance(company.getMoney());
+                companyService.updateCompany(company);
+                //生成流水
+                CompanyMoneyLogs log=new CompanyMoneyLogs();
+                log.setCompanyId(deduct.getCompanyId());
+                log.setMoney(deduct.getMoney().multiply(new BigDecimal(-1)));
+                log.setRemark(deduct.getRemark());
+                log.setLogsType(2);
+                log.setBalance(company.getMoney());
+                log.setCreateTime(new Date());
+                moneyLogsService.insertCompanyMoneyLogs(log);
+            }
+        }
+        deduct.setAuditTime(new Date());
+        deduct.setAuditUserId(loginUser.getUserId());
+        companyDeductService.updateCompanyDeduct(deduct);
+        return R.ok("操作成功");
 
     }