修改余额为0的处理，

添加银行卡空指针问题

src/main/java/com/pangding/web/authority/controller/company/CompanyController.java

@@ -98,7 +98,7 @@ public class CompanyController {
     @RequestMapping(value = "findCompanyById")
     @ApiOperation(value = "找到公司信息", notes = "找到公司信息")
     public ResponseResult<CompanyResVo> findCompanyById(@RequestBody CompanyReqVo req){
-        CheckerHelper.newInstance().notBlankCheck("", req.getId()).checkException();
+        CheckerHelper.newInstance().notBlankCheck("id", req.getId()).checkException();
         return ResponseResult.result(companyService.findCompanyById(req));
     }
 

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -1186,7 +1186,7 @@ public class CompanyServiceImpl implements CompanyService {
             saveCompanyRule(reqVo.getCompanyRuleVoList(), companyVo);
         }
 
-        if(1 == reqVo.getInvitationStatus()){
+        if (1 == reqVo.getInvitationStatus()) {
             // 更新或新增邀请规则表
             saveCompanyInvitationRule(reqVo.getCompanyInvitationActivatRuleVoList(), companyVo, 0);
 
@@ -1470,16 +1470,27 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     public CompanyResVo findCompanyById(CompanyReqVo req) {
         CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class);
-        if(!StringHelper.isEmpty(req.getTollPoint())){ // 1 == req.getQuerySource()
+        // 来源于扫码牌
+//        if(1 == req.getQuerySource()){
+        if (StringHelper.isEmpty(req.getTollPoint()) && companyResVo.getScanCodePayStatus() == 1) {
+            // 无消费点 关闭主二维码支付
+            throw new CodeException("100", "该功能已经关闭，如需开通请联系管理员。");
+        }
+        if (!StringHelper.isEmpty(req.getTollPoint())) { //
             CompanyTollPointReqVo companyTollPointReqVo = new CompanyTollPointReqVo();
             companyTollPointReqVo.setCompanyId(req.getId());
             companyTollPointReqVo.setTollPoints(req.getTollPoint());
             List<CompanyTollPointVo> companyTollPointVos = companyTollPointDao.loadList(companyTollPointReqVo, CompanyTollPointVo.class);
-            if(StringHelper.isEmpty(companyTollPointVos) || companyTollPointVos.size() == 0){
+            if (StringHelper.isEmpty(companyTollPointVos) || companyTollPointVos.size() == 0) {
                 throw new CodeException("99", "未获取到收费点，请联系客服人员查询二维码是否正确。");
             }
             companyResVo.setCompanyTollPointVoList(companyTollPointVos);
+//            if(!StringHelper.isEmpty(companyTollPointVos.get(0).getTollPointByname())){
+//                companyResVo.setCompanyName(companyTollPointVos.get(0).getTollPointByname());
+//            }
         }
+//        }
+
         CompanyVo companyVo = new CompanyVo();
         ObjectHelper.writeWithFromClass(companyVo, companyResVo);