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

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

@@ -5,9 +5,11 @@ import java.util.Date;
 import java.util.List;
 
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.model.LoginUser;
+import com.fs.common.exception.base.BaseException;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
@@ -19,7 +21,12 @@ import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyDeductVO;
 import com.fs.course.config.CourseConfig;
 import com.fs.framework.web.service.TokenService;
+import com.fs.system.domain.SysConfig;
+import com.fs.system.domain.SysDeptConfig;
+import com.fs.system.mapper.SysConfigMapper;
 import com.fs.system.service.ISysConfigService;
+import com.fs.system.service.ISysDeptConfigLogService;
+import com.fs.system.service.ISysDeptConfigService;
 import lombok.Synchronized;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +65,12 @@ public class FsCompanyDeductController extends BaseController
     private ISysConfigService configService;
     @Autowired
     private ICompanyMoneyLogsService moneyLogsService;
+    @Autowired
+    private ISysDeptConfigService sysDeptConfigService;
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+    @Autowired
+    private ISysDeptConfigLogService sysDeptConfigLogService;
 
     /**
      * 查询扣款管理列表
@@ -163,6 +176,19 @@ public class FsCompanyDeductController extends BaseController
             log.setBalance(company.getMoney());
             log.setCreateTime(new Date());
             moneyLogsService.insertCompanyMoneyLogs(log);
+
+            SysConfig courseConfig = sysConfigMapper.selectConfigByConfigKey("course.config");
+            CourseConfig config = JSON.parseObject(courseConfig.getConfigValue(), CourseConfig.class);
+            if(config.getDeptLimit() != null && config.getDeptLimit()){
+                SysDeptConfig deptConfig = sysDeptConfigService.getDeptConfig(company.getDeptId());
+                BigDecimal redPackage = deptConfig.getRedPackage();
+                BigDecimal nowMoney = redPackage.add(deduct.getMoney());
+                deptConfig.setRedPackage(nowMoney);
+                deptConfig.setUpdateBy(loginUser.getUsername());
+                deptConfig.setUpdateTime(new Date());
+                sysDeptConfigLogService.addLog(deptConfig.getDeptId(), 1, 0, deduct.getMoney().toString(), redPackage.toString(), nowMoney.toString(), loginUser.getUsername(), "扣减公司红包");
+                sysDeptConfigService.updateById(deptConfig);
+            }
         }
         deduct.setAuditTime(new Date());
         deduct.setAuditUserId(loginUser.getUser().getUserId());

fs-admin/src/main/java/com/fs/his/controller/FsCompanyRechargeController.java

@@ -179,8 +179,8 @@ public class FsCompanyRechargeController extends BaseController
             companyRecharge.setStatus(1);
             SysConfig courseConfig = sysConfigMapper.selectConfigByConfigKey("course.config");
             CourseConfig config = JSON.parseObject(courseConfig.getConfigValue(), CourseConfig.class);
-            if(config.getDeptLimit() != null && config.getDeptLimit() && !loginUser.isAdmin()){
-                SysDeptConfig deptConfig = sysDeptConfigService.getDeptConfig(loginUser.getDeptId());
+            if(config.getDeptLimit() != null && config.getDeptLimit()){
+                SysDeptConfig deptConfig = sysDeptConfigService.getDeptConfig(company.getDeptId());
                 BigDecimal redPackage = deptConfig.getRedPackage();
                 BigDecimal nowMoney = redPackage.subtract(param.getMoney());
                 if(nowMoney.doubleValue() < 0){