修改余额为0的处理，

添加银行卡空指针问题

src/main/java/com/pangding/web/authority/feign/PayFeign.java

@@ -5,6 +5,7 @@ import com.pangding.web.vo.system.req.DeviceReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.SaveCompanyReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -81,4 +82,9 @@ public interface PayFeign {
     @RequestMapping(value = "/uploadPic", method = RequestMethod.POST)
     ResponseResult<Boolean> idcardCollect(@RequestBody SaveCompanyReqVo req);
 
+    @ResponseBody
+    @RequestMapping(value = "/vspTermidInfoManage")
+    @ApiOperation(value = "支付终端信息管理", notes = "支付终端信息管理")
+    public ResponseResult<String> vspTermidInfoManage(@RequestBody DeviceReqVo req);
+
 }

src/main/java/com/pangding/web/authority/service/CompanyService.java

@@ -208,9 +208,9 @@ public interface CompanyService{
      * @param req
      * @return
      */
-    FindCompanyBalanceResVo findCompanyBalance(com.pangding.web.vo.system.req.company.CompanyReqVo req);
+    FindCompanyBalanceResVo findCompanyBalance(CompanyReqVo req);
 
-    com.pangding.web.vo.system.res.company.CompanyResVo findCompanyById(com.pangding.web.vo.system.req.company.CompanyReqVo req);
+    CompanyResVo findCompanyById(CompanyReqVo req);
 
     /**
      * 同步公司信息

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

@@ -4,6 +4,7 @@ import com.pangding.web.authority.dao.*;
 import com.pangding.web.authority.dao.company.CompanyBankCardDao;
 import com.pangding.web.authority.dao.company.CompanyDao;
 import com.pangding.web.authority.dao.company.CompanyExtendDao;
+import com.pangding.web.authority.dao.company.CompanyTollPointDao;
 import com.pangding.web.authority.feign.PayFeign;
 import com.pangding.web.authority.feign.StoreFeign;
 import com.pangding.web.authority.feign.WxFeign;
@@ -45,6 +46,7 @@ import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -95,6 +97,8 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private CapitalFlowDao capitalFlowDao;
     @Autowired
+    private CompanyTollPointDao companyTollPointDao;
+    @Autowired
     private PayFeign payFeign;
     @Autowired
     private StoreFeign storeFeign;
@@ -1464,8 +1468,20 @@ public class CompanyServiceImpl implements CompanyService {
     }
 
     @Override
-    public com.pangding.web.vo.system.res.company.CompanyResVo findCompanyById(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
-        com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(req.getId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
+    public CompanyResVo findCompanyById(CompanyReqVo req) {
+        CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class);
+        if(!StringHelper.isEmpty(req.getTollPoint())){ // 1 == req.getQuerySource()
+            CompanyTollPointReqVo companyTollPointReqVo = new CompanyTollPointReqVo();
+            companyTollPointReqVo.setCompanyId(req.getCompanyId());
+            companyTollPointReqVo.setTollPoints(req.getTollPoint());
+            List<CompanyTollPointVo> companyTollPointVos = companyTollPointDao.loadList(companyTollPointReqVo, CompanyTollPointVo.class);
+            companyResVo.setCompanyTollPointVoList(companyTollPointVos);
+        }
+        CompanyVo companyVo = new CompanyVo();
+        ObjectHelper.writeWithFromClass(companyVo, companyResVo);
+
+        // 获取支付成功后跳转链接
+        companyResVo.setPaydJumpUrl(getJumpUrl(companyVo));
         return companyResVo;
     }