服务商银行信息接口开发

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/controller/HlgAccountController.java

@@ -1,341 +1,354 @@
-package org.jeecg.modules.hlgaccount.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.PermissionData;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.businessAccountUtils;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.hlgaccount.entity.HlgAccount;
-import org.jeecg.modules.hlgaccount.entity.HlgAccountDetail;
-import org.jeecg.modules.hlgaccount.mapper.HlgAccountMapper;
-import org.jeecg.modules.hlgaccount.service.IHlgAccountService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-
-/**
- * @Description: 账户信息表
- * @Author: jeecg-boot
- * @Date: 2020-02-21
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/hlgaccount/hlgAccount")
-@Slf4j
-public class HlgAccountController {
-    @Autowired
-    private IHlgAccountService hlgAccountService;
-    @Resource
-    private HlgAccountMapper hlgAccountMapper;
-
-    /**
-     * 资金管理列表
-     *
-     * @param hlgAccount
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/list")
-    @PermissionData(pageComponent = "hlgaccount/HlgAccountList")
-    public Result<IPage<HlgAccount>> queryPageList(HlgAccount hlgAccount,
-                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                   HttpServletRequest req) {
-        Result<IPage<HlgAccount>> result = new Result<IPage<HlgAccount>>();
-        QueryWrapper<HlgAccount> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgAccount, req.getParameterMap());
-        Page<HlgAccount> page = new Page<HlgAccount>(pageNo, pageSize);
-        Page<HlgAccount> pageList = hlgAccountService.pageList(page, hlgAccount, queryWrapper);
-        //遍历查询该企业所有服务商总金额
-        for (HlgAccount hlgAccount1 : pageList.getRecords()) {
-            List<HlgAccount> List1 = hlgAccountMapper.findListByCompanyId(hlgAccount1);
-            Double totalDeposit = 0.00;
-            Double totalPayment = 0.00;
-            Double balance = 0.00;
-            Double totalServiceFee = 0.00;
-            for (HlgAccount hlgAccount2 : List1) {
-                totalDeposit = businessAccountUtils.add(totalDeposit, hlgAccount2.getTotalDeposit());
-                totalPayment = businessAccountUtils.add(totalPayment, hlgAccount2.getTotalPayment());
-                balance = businessAccountUtils.add(balance, hlgAccount2.getBalance());
-                totalServiceFee = businessAccountUtils.add(totalServiceFee, hlgAccount2.getTotalServiceFee());
-            }
-            hlgAccount1.setTotalDeposit(totalDeposit);
-            hlgAccount1.setTotalPayment(totalPayment);
-            hlgAccount1.setBalance(balance);
-            hlgAccount1.setTotalServiceFee(totalServiceFee);
-        }
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 企业服务商账户列表
-     *
-     * @param hlgAccount
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/companyList")
-    public Result<IPage<HlgAccount>> querycompanyPageList(HlgAccount hlgAccount,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<HlgAccount>> result = new Result<IPage<HlgAccount>>();
-        QueryWrapper<HlgAccount> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgAccount, req.getParameterMap());
-        Page<HlgAccount> page = new Page<HlgAccount>(pageNo, pageSize);
-        Page<HlgAccount> pageList = hlgAccountService.pageCompanyList(page, hlgAccount, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 企业服务商账户列表(不分页)
-     * 账户管理
-     *
-     * @param hlgAccount
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/myCompanyList")
-    public Result<List<HlgAccount>> querymyCompanyList(HlgAccount hlgAccount, HttpServletRequest req) {
-        Result<List<HlgAccount>> result = new Result<List<HlgAccount>>();
-        List<HlgAccount> list = hlgAccountService.myCompanyList(hlgAccount);
-        result.setSuccess(true);
-        result.setResult(list);
-        return result;
-    }
-
-    /**
-     * 账目余额
-     *
-     * @param hlgAccount
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/balance")
-    public Result<Double> balance(HlgAccount hlgAccount, HttpServletRequest req) {
-        Result<Double> result = new Result<Double>();
-        //账目余额
-        QueryWrapper<HlgAccount> queryWrapper0 = new QueryWrapper<>();
-        queryWrapper0.eq("subcontractor_id", hlgAccount.getSubcontractorId());
-        List<HlgAccount> accountList = hlgAccountService.list(queryWrapper0);
-        Double balanceMoney = 0.00;
-        for (HlgAccount hlgAccount1 : accountList) {
-            balanceMoney = businessAccountUtils.add(balanceMoney, hlgAccount1.getBalance());
-        }
-        result.setSuccess(true);
-        result.setResult(balanceMoney);
-        return result;
-    }
-
-    /**
-     * 编辑服务费
-     *
-     * @param hlgAccount
-     * @return
-     */
-    @PostMapping(value = "/editFate")
-    public Result<HlgCompanySubcontractor> editServiceFate(@RequestBody HlgAccount hlgAccount) {
-        Result<HlgCompanySubcontractor> result = new Result<HlgCompanySubcontractor>();
-        try {
-            result = hlgAccountService.editServiceFate(hlgAccount);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param hlgAccount
-     * @return
-     */
-    @PostMapping(value = "/add")
-    public Result<HlgAccount> add(@RequestBody HlgAccount hlgAccount) {
-        Result<HlgAccount> result = new Result<HlgAccount>();
-        try {
-            hlgAccountService.save(hlgAccount);
-            result.success("添加成功！");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param hlgAccount
-     * @return
-     */
-    @PutMapping(value = "/edit")
-    public Result<HlgAccount> edit(@RequestBody HlgAccount hlgAccount) {
-        Result<HlgAccount> result = new Result<HlgAccount>();
-        HlgAccount hlgAccountEntity = hlgAccountService.getById(hlgAccount.getId());
-        if (hlgAccountEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = hlgAccountService.updateById(hlgAccount);
-            //TODO 返回false说明什么？
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            hlgAccountService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<HlgAccount> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<HlgAccount> result = new Result<HlgAccount>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别！");
-        } else {
-            this.hlgAccountService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/queryById")
-    public Result<HlgAccount> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<HlgAccount> result = new Result<HlgAccount>();
-        HlgAccount hlgAccount = hlgAccountService.getById(id);
-        if (hlgAccount == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(hlgAccount);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HlgAccount hlgAccount) {
-        // Step.1 组装查询条件查询数据
-        QueryWrapper<HlgAccount> queryWrapper = QueryGenerator.initQueryWrapper(hlgAccount, request.getParameterMap());
-        List<HlgAccount> pageList = hlgAccountService.list(queryWrapper);
-        // Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        // 过滤选中数据
-        String selections = request.getParameter("selections");
-        if (oConvertUtils.isEmpty(selections)) {
-            mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        } else {
-            List<String> selectionList = Arrays.asList(selections.split(","));
-            List<HlgAccount> exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
-            mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
-        }
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "账户信息表列表");
-        mv.addObject(NormalExcelConstants.CLASS, HlgAccount.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("账户信息表列表数据", "导出人:Jeecg", "导出信息"));
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();// 获取上传文件对象
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<HlgAccount> listHlgAccounts = ExcelImportUtil.importExcel(file.getInputStream(), HlgAccount.class, params);
-                hlgAccountService.saveBatch(listHlgAccounts);
-                return Result.ok("文件导入成功！数据行数:" + listHlgAccounts.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败！");
-    }
-
-}
+package org.jeecg.modules.hlgaccount.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.businessAccountUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hlgaccount.entity.HlgAccount;
+import org.jeecg.modules.hlgaccount.entity.HlgAccountDetail;
+import org.jeecg.modules.hlgaccount.mapper.HlgAccountMapper;
+import org.jeecg.modules.hlgaccount.service.IHlgAccountService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+/**
+ * @Description: 账户信息表
+ * @Author: jeecg-boot
+ * @Date: 2020-02-21
+ * @Version: V1.0
+ */
+@RestController
+@RequestMapping("/hlgaccount/hlgAccount")
+@Slf4j
+public class HlgAccountController {
+    @Autowired
+    private IHlgAccountService hlgAccountService;
+    @Resource
+    private HlgAccountMapper hlgAccountMapper;
+
+    /**
+     * 资金管理列表
+     *
+     * @param hlgAccount
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/list")
+    @PermissionData(pageComponent = "hlgaccount/HlgAccountList")
+    public Result<IPage<HlgAccount>> queryPageList(HlgAccount hlgAccount,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   HttpServletRequest req) {
+        Result<IPage<HlgAccount>> result = new Result<IPage<HlgAccount>>();
+        QueryWrapper<HlgAccount> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgAccount, req.getParameterMap());
+        Page<HlgAccount> page = new Page<HlgAccount>(pageNo, pageSize);
+        Page<HlgAccount> pageList = hlgAccountService.pageList(page, hlgAccount, queryWrapper);
+        //遍历查询该企业所有服务商总金额
+        for (HlgAccount hlgAccount1 : pageList.getRecords()) {
+            List<HlgAccount> List1 = hlgAccountMapper.findListByCompanyId(hlgAccount1);
+            Double totalDeposit = 0.00;
+            Double totalPayment = 0.00;
+            Double balance = 0.00;
+            Double totalServiceFee = 0.00;
+            for (HlgAccount hlgAccount2 : List1) {
+                totalDeposit = businessAccountUtils.add(totalDeposit, hlgAccount2.getTotalDeposit());
+                totalPayment = businessAccountUtils.add(totalPayment, hlgAccount2.getTotalPayment());
+                balance = businessAccountUtils.add(balance, hlgAccount2.getBalance());
+                totalServiceFee = businessAccountUtils.add(totalServiceFee, hlgAccount2.getTotalServiceFee());
+            }
+            hlgAccount1.setTotalDeposit(totalDeposit);
+            hlgAccount1.setTotalPayment(totalPayment);
+            hlgAccount1.setBalance(balance);
+            hlgAccount1.setTotalServiceFee(totalServiceFee);
+        }
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 企业服务商账户列表
+     *
+     * @param hlgAccount
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/companyList")
+    public Result<IPage<HlgAccount>> querycompanyPageList(HlgAccount hlgAccount,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<HlgAccount>> result = new Result<IPage<HlgAccount>>();
+        QueryWrapper<HlgAccount> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlgAccount, req.getParameterMap());
+        Page<HlgAccount> page = new Page<HlgAccount>(pageNo, pageSize);
+        Page<HlgAccount> pageList = hlgAccountService.pageCompanyList(page, hlgAccount, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 企业服务商账户列表(不分页)
+     * 账户管理
+     *
+     * @param hlgAccount
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/myCompanyList")
+    public Result<List<HlgAccount>> querymyCompanyList(HlgAccount hlgAccount, HttpServletRequest req) {
+        Result<List<HlgAccount>> result = new Result<List<HlgAccount>>();
+        List<HlgAccount> list = hlgAccountService.myCompanyList(hlgAccount);
+        result.setSuccess(true);
+        result.setResult(list);
+        return result;
+    }
+
+    /**
+     * 服务商银行卡信息
+     *
+     * @param subcontractorId
+     * @param cpType
+     * @return
+     */
+    @GetMapping(value = "/getSubcontractorBankInformation")
+    public Result<?> getSubcontractorBankInformation(@RequestParam(name = "subcontractorId", required = true) Integer subcontractorId, @RequestParam(name = "cpType", required = true) Integer cpType) {
+        Result<?> result = hlgAccountService.getSubcontractorBankInformation(subcontractorId, cpType);
+        return result;
+    }
+
+    /**
+     * 账目余额
+     *
+     * @param hlgAccount
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/balance")
+    public Result<Double> balance(HlgAccount hlgAccount, HttpServletRequest req) {
+        Result<Double> result = new Result<Double>();
+        //账目余额
+        QueryWrapper<HlgAccount> queryWrapper0 = new QueryWrapper<>();
+        queryWrapper0.eq("subcontractor_id", hlgAccount.getSubcontractorId());
+        List<HlgAccount> accountList = hlgAccountService.list(queryWrapper0);
+        Double balanceMoney = 0.00;
+        for (HlgAccount hlgAccount1 : accountList) {
+            balanceMoney = businessAccountUtils.add(balanceMoney, hlgAccount1.getBalance());
+        }
+        result.setSuccess(true);
+        result.setResult(balanceMoney);
+        return result;
+    }
+
+    /**
+     * 编辑服务费
+     *
+     * @param hlgAccount
+     * @return
+     */
+    @PostMapping(value = "/editFate")
+    public Result<HlgCompanySubcontractor> editServiceFate(@RequestBody HlgAccount hlgAccount) {
+        Result<HlgCompanySubcontractor> result = new Result<HlgCompanySubcontractor>();
+        try {
+            result = hlgAccountService.editServiceFate(hlgAccount);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param hlgAccount
+     * @return
+     */
+    @PostMapping(value = "/add")
+    public Result<HlgAccount> add(@RequestBody HlgAccount hlgAccount) {
+        Result<HlgAccount> result = new Result<HlgAccount>();
+        try {
+            hlgAccountService.save(hlgAccount);
+            result.success("添加成功！");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param hlgAccount
+     * @return
+     */
+    @PutMapping(value = "/edit")
+    public Result<HlgAccount> edit(@RequestBody HlgAccount hlgAccount) {
+        Result<HlgAccount> result = new Result<HlgAccount>();
+        HlgAccount hlgAccountEntity = hlgAccountService.getById(hlgAccount.getId());
+        if (hlgAccountEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = hlgAccountService.updateById(hlgAccount);
+            //TODO 返回false说明什么？
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            hlgAccountService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<HlgAccount> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<HlgAccount> result = new Result<HlgAccount>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别！");
+        } else {
+            this.hlgAccountService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/queryById")
+    public Result<HlgAccount> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<HlgAccount> result = new Result<HlgAccount>();
+        HlgAccount hlgAccount = hlgAccountService.getById(id);
+        if (hlgAccount == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(hlgAccount);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HlgAccount hlgAccount) {
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<HlgAccount> queryWrapper = QueryGenerator.initQueryWrapper(hlgAccount, request.getParameterMap());
+        List<HlgAccount> pageList = hlgAccountService.list(queryWrapper);
+        // Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        // 过滤选中数据
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isEmpty(selections)) {
+            mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        } else {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            List<HlgAccount> exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+            mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        }
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "账户信息表列表");
+        mv.addObject(NormalExcelConstants.CLASS, HlgAccount.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("账户信息表列表数据", "导出人:Jeecg", "导出信息"));
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();// 获取上传文件对象
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<HlgAccount> listHlgAccounts = ExcelImportUtil.importExcel(file.getInputStream(), HlgAccount.class, params);
+                hlgAccountService.saveBatch(listHlgAccounts);
+                return Result.ok("文件导入成功！数据行数:" + listHlgAccounts.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败！");
+    }
+
+}

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/service/IHlgAccountService.java

@@ -1,29 +1,31 @@
-package org.jeecg.modules.hlgaccount.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.hlgaccount.entity.HlgAccount;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.hlgaccount.entity.HlgAccountDetail;
-import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
-
-import java.util.List;
-
-/**
- * @Description: 账户信息表
- * @Author: jeecg-boot
- * @Date:   2020-02-21
- * @Version: V1.0
- */
-public interface IHlgAccountService extends IService<HlgAccount> {
-
-    Page<HlgAccount> pageList(Page<HlgAccount> page, HlgAccount hlgAccount, QueryWrapper<HlgAccount> queryWrapper);
-
-    Page<HlgAccount> pageCompanyList(Page<HlgAccount> page, HlgAccount hlgAccount, QueryWrapper<HlgAccount> queryWrapper);
-
-    Result<HlgCompanySubcontractor> editServiceFate(HlgAccount hlgAccount);
-
-    List<HlgAccount> myCompanyList(HlgAccount hlgAccount);
-}
+package org.jeecg.modules.hlgaccount.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.hlgaccount.entity.HlgAccount;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.hlgaccount.entity.HlgAccountDetail;
+import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
+
+import java.util.List;
+
+/**
+ * @Description: 账户信息表
+ * @Author: jeecg-boot
+ * @Date:   2020-02-21
+ * @Version: V1.0
+ */
+public interface IHlgAccountService extends IService<HlgAccount> {
+
+    Page<HlgAccount> pageList(Page<HlgAccount> page, HlgAccount hlgAccount, QueryWrapper<HlgAccount> queryWrapper);
+
+    Page<HlgAccount> pageCompanyList(Page<HlgAccount> page, HlgAccount hlgAccount, QueryWrapper<HlgAccount> queryWrapper);
+
+    Result<HlgCompanySubcontractor> editServiceFate(HlgAccount hlgAccount);
+
+    List<HlgAccount> myCompanyList(HlgAccount hlgAccount);
+
+    Result<?> getSubcontractorBankInformation(Integer subcontractorId, Integer cpType);
+}

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgaccount/service/impl/HlgAccountServiceImpl.java

@@ -133,4 +133,37 @@ public class HlgAccountServiceImpl extends ServiceImpl<HlgAccountMapper, HlgAcco
         }
         return list;
     }
+
+    /**
+     * 服务商银行信息
+     *
+     * @param subcontractorId
+     * @param cpType
+     * @return
+     */
+    @Override
+    public Result<?> getSubcontractorBankInformation(Integer subcontractorId, Integer cpType) {
+        List list = new ArrayList();
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = OauthApi.SUBCONTRACTOR_BANK_INFO;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("subcontractorId", subcontractorId);
+        parameters.put("cpType", cpType);
+        //数据加密
+        String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
+        JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
+        log.info("服务商银行卡信息===={}", jsonObject);
+        if (jsonObject != null) {
+            if (jsonObject.getBoolean(HttpsContants.SUCCESS_FLAG)) {
+                log.info("服务商银行卡信息===={}", jsonObject);
+                list = (List) jsonObject.get("result");
+                log.info("服务商银行卡信息==={}", list);
+            } else {
+                throw new JeecgBootException("查询数据异常");
+            }
+        } else {
+            throw new JeecgBootException("查询数据异常");
+        }
+        return Result.ok(list);
+    }
 }

happy-boot-module-settlement/src/main/java/org/jeecg/common/utils/OauthApi.java

@@ -75,6 +75,9 @@ public interface OauthApi {
     //我的账户-导出
     public static final String companyAccountDetailExport = "/oauth/hlwCompanyAccount/detailExport";
 
+    //我的账户-服务商银行信息
+    public static final String SUBCONTRACTOR_BANK_INFO = "/oauth/hlwCompanyAccount/getSubcontractorBankInfo";
+
     //用户-新增
     public static final String userAdd = "/oauth/hlwUser/add";
 
@@ -97,9 +100,9 @@ public interface OauthApi {
     public static final String statisticData = "/oauth/autoMonitor/statisticData";
 
     //用户列表
-    public static final String userList="/oauth/hlwUser/list";
+    public static final String userList = "/oauth/hlwUser/list";
 
     //用户服务商列表
-    public static final String subcontractorList="/oauth/hlwUser/subcontractorList";
+    public static final String subcontractorList = "/oauth/hlwUser/subcontractorList";
 
 }