提交 5991eb7b authored 作者: huyufan's avatar huyufan

对公转账信息接口

上级 17fe9a83
package com.clx.performance.controller.pc.owner; package com.clx.performance.controller.pc.owner;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.OwnerTransferInfoDao;
import com.clx.performance.model.OwnerTransferInfo; import com.clx.performance.model.OwnerTransferInfo;
import com.clx.performance.param.pc.*; import com.clx.performance.param.pc.*;
import com.clx.performance.service.OwnerAccountService; import com.clx.performance.service.OwnerAccountService;
...@@ -12,6 +11,9 @@ import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO; ...@@ -12,6 +11,9 @@ import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
import com.clx.performance.vo.pc.OwnerAccountVO; import com.clx.performance.vo.pc.OwnerAccountVO;
import com.clx.performance.vo.pc.OwnerCaseOutVO; import com.clx.performance.vo.pc.OwnerCaseOutVO;
import com.clx.performance.vo.pc.OwnerTopUpVO; import com.clx.performance.vo.pc.OwnerTopUpVO;
import com.clx.user.feign.OwnerInfoFeign;
import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
import com.clx.user.vo.pc.owner.OwnerBindCardVO;
import com.msl.common.base.PageData; import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert; import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result; import com.msl.common.result.Result;
...@@ -19,6 +21,7 @@ import io.swagger.annotations.Api; ...@@ -19,6 +21,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -45,7 +48,7 @@ public class OwnerAccountController { ...@@ -45,7 +48,7 @@ public class OwnerAccountController {
private final OwnerRunningWaterRecordService ownerRunningWaterRecordService; private final OwnerRunningWaterRecordService ownerRunningWaterRecordService;
private final OwnerTransferInfoDao ownerTransferInfoDao; private final OwnerInfoFeign ownerInfoFeign;
@ApiOperation(value = "账户信息", notes = "<br>By:胡宇帆") @ApiOperation(value = "账户信息", notes = "<br>By:胡宇帆")
@GetMapping("/accountInfo") @GetMapping("/accountInfo")
...@@ -115,6 +118,26 @@ public class OwnerAccountController { ...@@ -115,6 +118,26 @@ public class OwnerAccountController {
@ApiOperation(value = "对公转账信息", notes = "<br>By:胡宇帆") @ApiOperation(value = "对公转账信息", notes = "<br>By:胡宇帆")
@GetMapping("/transferPublic") @GetMapping("/transferPublic")
public Result<OwnerTransferInfo> transferPublic() { public Result<OwnerTransferInfo> transferPublic() {
return Result.ok(ownerTransferInfoDao.getEntityByKey(1).orElse(null)); return Result.ok(ownerAccountService.transferPublic());
}
@ApiOperation(value = "获取货主信息绑卡信息", notes = "<br>By:胡宇帆")
@GetMapping("/getOwnerBindCard")
public Result<OwnerBindCardVO> getOwnerBindCard(@RequestParam("userNo") @NotNull(message = "userNo不能为空") Long userNo) {
return Result.ok(ownerAccountService.getOwnerBindCard(userNo));
}
@ApiOperation(value = "绑定货主银行卡")
@PostMapping({"/bindOwnerBindCard"})
Result<Object> bindOwnerBindCard(@RequestBody UpdateOwnerBindCardFeignParam param) {
ownerAccountService.bindOwnerBindCard(param);
return Result.ok();
}
@ApiOperation(value = "解绑货主银行卡")
@PostMapping({"/unBindOwnerBindCard"})
Result<Object> unBindOwnerBindCard(@RequestBody UpdateOwnerBindCardFeignParam param) {
ownerAccountService.unBindOwnerBindCard(param);
return Result.ok();
} }
} }
package com.clx.performance.service; package com.clx.performance.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.model.OwnerTransferInfo;
import com.clx.performance.param.pc.*; import com.clx.performance.param.pc.*;
import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO; import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
import com.clx.performance.vo.pc.OwnerAccountVO; import com.clx.performance.vo.pc.OwnerAccountVO;
import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
import com.clx.user.vo.pc.owner.OwnerBindCardVO;
import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import java.util.List; import java.util.List;
...@@ -51,4 +54,12 @@ public interface OwnerAccountService { ...@@ -51,4 +54,12 @@ public interface OwnerAccountService {
* @return * @return
*/ */
SXSSFWorkbook exportPrepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param); SXSSFWorkbook exportPrepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param);
OwnerTransferInfo transferPublic();
OwnerBindCardVO getOwnerBindCard(Long userNo);
void bindOwnerBindCard(UpdateOwnerBindCardFeignParam param);
void unBindOwnerBindCard(UpdateOwnerBindCardFeignParam param);
} }
...@@ -2,17 +2,11 @@ package com.clx.performance.service.impl; ...@@ -2,17 +2,11 @@ package com.clx.performance.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.component.IdGenerateSnowFlake; import com.clx.performance.component.IdGenerateSnowFlake;
import com.clx.performance.dao.OwnerAccountDao; import com.clx.performance.dao.*;
import com.clx.performance.dao.OwnerCaseOutDao;
import com.clx.performance.dao.OwnerRunningWaterRecordDao;
import com.clx.performance.dao.OwnerTopUpDao;
import com.clx.performance.enums.IdTypeEnum; import com.clx.performance.enums.IdTypeEnum;
import com.clx.performance.enums.OwnerAccountEnum; import com.clx.performance.enums.OwnerAccountEnum;
import com.clx.performance.enums.PerformanceResultEnum; import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.model.OwnerAccount; import com.clx.performance.model.*;
import com.clx.performance.model.OwnerCaseOut;
import com.clx.performance.model.OwnerRunningWaterRecord;
import com.clx.performance.model.OwnerTopUp;
import com.clx.performance.param.pc.*; import com.clx.performance.param.pc.*;
import com.clx.performance.service.OwnerAccountService; import com.clx.performance.service.OwnerAccountService;
import com.clx.performance.utils.excel.ExcelData; import com.clx.performance.utils.excel.ExcelData;
...@@ -22,9 +16,13 @@ import com.clx.performance.utils.excel.ExcelUtil; ...@@ -22,9 +16,13 @@ import com.clx.performance.utils.excel.ExcelUtil;
import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO; import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
import com.clx.performance.vo.pc.OwnerAccountVO; import com.clx.performance.vo.pc.OwnerAccountVO;
import com.clx.user.enums.driver.DriverTruckEnum; import com.clx.user.enums.driver.DriverTruckEnum;
import com.clx.user.feign.OwnerInfoFeign;
import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
import com.clx.user.vo.pc.driver.truck.DriverTruckVo; import com.clx.user.vo.pc.driver.truck.DriverTruckVo;
import com.clx.user.vo.pc.owner.OwnerBindCardVO;
import com.msl.common.base.Optional; import com.msl.common.base.Optional;
import com.msl.common.exception.ServiceSystemException; import com.msl.common.exception.ServiceSystemException;
import com.msl.common.result.Result;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -51,6 +49,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -51,6 +49,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
private final OwnerCaseOutDao ownerCaseOutDao; private final OwnerCaseOutDao ownerCaseOutDao;
private final OwnerTransferInfoDao ownerTransferInfoDao;
private final OwnerInfoFeign ownerInfoFeign;
@Override @Override
public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) { public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {
return ownerAccountDao.pageList(param); return ownerAccountDao.pageList(param);
...@@ -175,6 +177,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -175,6 +177,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
/** /**
* 提现审批 * 提现审批
*
* @param param * @param param
*/ */
@Override @Override
...@@ -251,12 +254,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -251,12 +254,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
// 组装数据 // 组装数据
List<List<ExcelData>> dataList = new ArrayList<>(); List<List<ExcelData>> dataList = new ArrayList<>();
for (int i=0; i<list.size(); i++){ for (int i = 0; i < list.size(); i++) {
OwnerAccountRunningWaterRecordVO dto = list.get(i); OwnerAccountRunningWaterRecordVO dto = list.get(i);
List<ExcelData> rowData = new ArrayList<>(); List<ExcelData> rowData = new ArrayList<>();
rowData.add(new ExcelData(i+1)); rowData.add(new ExcelData(i + 1));
rowData.add(new ExcelData(dto.getOwnerUserNo().toString())); rowData.add(new ExcelData(dto.getOwnerUserNo().toString()));
rowData.add(new ExcelData(dto.getOwnerName())); rowData.add(new ExcelData(dto.getOwnerName()));
rowData.add(new ExcelData(dto.getMobile())); rowData.add(new ExcelData(dto.getMobile()));
...@@ -308,12 +311,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -308,12 +311,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
// 组装数据 // 组装数据
List<List<ExcelData>> dataList = new ArrayList<>(); List<List<ExcelData>> dataList = new ArrayList<>();
for (int i=0; i<list.size(); i++){ for (int i = 0; i < list.size(); i++) {
OwnerAccountRunningWaterRecordVO dto = list.get(i); OwnerAccountRunningWaterRecordVO dto = list.get(i);
List<ExcelData> rowData = new ArrayList<>(); List<ExcelData> rowData = new ArrayList<>();
rowData.add(new ExcelData(i+1)); rowData.add(new ExcelData(i + 1));
rowData.add(new ExcelData(dto.getOwnerUserNo().toString())); rowData.add(new ExcelData(dto.getOwnerUserNo().toString()));
rowData.add(new ExcelData(dto.getOwnerName())); rowData.add(new ExcelData(dto.getOwnerName()));
rowData.add(new ExcelData(dto.getMobile())); rowData.add(new ExcelData(dto.getMobile()));
...@@ -338,4 +341,36 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -338,4 +341,36 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
//创建excel //创建excel
return ExcelUtil.create(excelSheet); return ExcelUtil.create(excelSheet);
} }
@Override
public OwnerTransferInfo transferPublic() {
return ownerTransferInfoDao.getEntityByKey(1).orElse(null);
}
@Override
public OwnerBindCardVO getOwnerBindCard(Long userNo) {
Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(userNo);
if (result.succeed()) {
return result.getData();
} else {
return null;
}
}
@Override
public void bindOwnerBindCard(UpdateOwnerBindCardFeignParam param) {
Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(param.getUserNo());
if (!result.succeed()) {
throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据");
}
if (result.succeed() && StringUtils.isNotBlank(result.getData().getOwnerAccountBank())) {
throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货主存在绑定银行卡,请先解绑银行卡后再进行绑定操作");
}
ownerInfoFeign.bindOwnerBindCard(param);
}
@Override
public void unBindOwnerBindCard(UpdateOwnerBindCardFeignParam param) {
ownerInfoFeign.unBindOwnerBindCard(param);
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论