Skip to content

C
clx-performance
提交 15f5796d authored 作者: 姜文业's avatar 姜文业
浏览文件
操作

个人货主变更为企业货主

上级 59fe0d55
显示空白字符变更
内嵌 并排
正在显示 包含 36 行增加 和 36 行删除
performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java
浏览文件 @ 15f5796d
......@@ -50,7 +50,7 @@ public class OwnerBreakContractSettlementOwnerController {
@UnitCovert(param = false)
public Result<PageData<PageCarrierBreakContractSettlementOwnerVO>> pageOwnerBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<PageCarrierBreakContractSettlementOwnerVO> page = breakContractSettlementOwnerService.pageCarrierBreakContractSettlementOwnerList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
......@@ -59,7 +59,7 @@ public class OwnerBreakContractSettlementOwnerController {
@PostMapping("/exportOwnerBreakContractSettlementOwnerList")
public Result exportOwnerBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param, HttpServletResponse response) throws Exception {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
SXSSFWorkbook workbook = breakContractSettlementOwnerService.exportCarrierBreakContractSettlementOwnerList(param);
response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
workbook.write(response.getOutputStream());
......
performance-web/src/main/java/com/clx/performance/controller/pc/loan/owner/OwnerLoanRecordController.java
浏览文件 @ 15f5796d
......@@ -34,7 +34,7 @@ public class OwnerLoanRecordController {
@UnitCovert(param = false)
public Result<PageData<OwnerLoanRecordVO>> pageOwnerLoanRecordOfOwner(@RequestBody @Validated PageOwnerLoanRecordOfOwner param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<OwnerLoanRecordVO> page = ownerLoanRecordService.pageOwnerLoanRecordOfOwner(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
......
performance-web/src/main/java/com/clx/performance/controller/pc/loan/owner/OwnerRepaymentController.java
浏览文件 @ 15f5796d
......@@ -40,7 +40,7 @@ public class OwnerRepaymentController {
@UnitCovert(param = false)
public Result<PageData<OwnerRepaymentVO>> pageOwnerRepayment(@RequestBody @Validated PageOwnerRepaymentOfOwner param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(String.valueOf(loginUserInfo.getUserNo()));
param.setOwnerUserNo(String.valueOf(loginUserInfo.getCompanyNo()));
IPage<OwnerRepaymentVO> page = ownerRepaymentService.pageOwnerRepaymentOfOwner(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
......
performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java
浏览文件 @ 15f5796d
......@@ -58,7 +58,7 @@ public class OwnerAccountController {
@UnitCovert(param = false)
public Result<OwnerAccountAllVO> accountInfo() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
OwnerAccountAllVO result = ownerAccountService.accountInfo(loginUserInfo.getUserNo());
OwnerAccountAllVO result = ownerAccountService.accountInfo(loginUserInfo.getCompanyNo());
return Result.ok(result);
}
......@@ -67,7 +67,7 @@ public class OwnerAccountController {
@UnitCovert(param = false)
public Result<PageData<OwnerTopUpVO>> ownerTopUpPageList(@RequestBody PageOwnerTopUpListParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<OwnerTopUpVO> page = ownerTopUpService.ownerTopUpPageList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
......@@ -77,7 +77,7 @@ public class OwnerAccountController {
@UnitCovert(param = false)
public Result<PageData<OwnerCaseOutVO>> ownerCaseOutPageList(@RequestBody PageOwnerCaseOutListParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setUserNo(loginUserInfo.getUserNo());
param.setUserNo(loginUserInfo.getCompanyNo());
IPage<OwnerCaseOutVO> page = ownerCaseOutService.ownerCaseOutPageList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
......@@ -133,7 +133,7 @@ public class OwnerAccountController {
@GetMapping("/getOwnerBindCard")
public Result<OwnerBindCardVO> getOwnerBindCard() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
return Result.ok(ownerAccountService.getOwnerBindCard(loginUserInfo.getUserNo()));
return Result.ok(ownerAccountService.getOwnerBindCard(loginUserInfo.getCompanyNo()));
}
@ApiOperation(value = "绑定货主银行卡")
......
performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
浏览文件 @ 15f5796d
......@@ -163,7 +163,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
public Long accountTopUp(OwnerTopUpParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo());
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getCompanyNo());
try {
boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
if (!b) {
......@@ -174,7 +174,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
}
}
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
OwnerTopUp entity = new OwnerTopUp();
entity.setAccountType(param.getAccountType());
......@@ -184,7 +184,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
entity.setDrawingBank(param.getDrawingBank());
entity.setDrawingBankNumber(param.getDrawingBankNumber());
entity.setDrawingProof(param.getDrawingProof());
entity.setCreateBy(loginUserInfo.getUserName());
entity.setCreateBy(loginUserInfo.getCompanyName());
entity.setEnterpriseName(param.getEnterpriseName());
entity.setOpenAccountBank(param.getOpenAccountBank());
entity.setOpenAccountBankNumber(param.getOpenAccountBankNumber());
......@@ -220,7 +220,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
BigDecimal caseOutBalance = param.getCaseOutBalance();
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo());
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getCompanyNo());
try {
boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
if (!b) {
......@@ -230,7 +230,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
}
}
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
LocalDateTime now = LocalDateTime.now();
while (true) {
......@@ -257,7 +257,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
entity.setStatus(OwnerAccountEnum.CaseOutStatus.PENDING_PAYMENT.getCode());
entity.setCaseOutBank(param.getOwnerOpenBank());
entity.setCaseOutBankNumber(param.getOwnerBankAccount());
entity.setCreateBy(loginUserInfo.getUserName());
entity.setCreateBy(loginUserInfo.getCompanyName());
ownerCaseOutDao.saveEntity(entity);
......@@ -265,7 +265,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
runningWaterRecord.setOwnerUserName(account.getOwnerUserName());
runningWaterRecord.setMobile(account.getMobile());
runningWaterRecord.setCreateBy(loginUserInfo.getUserName());
runningWaterRecord.setCreateBy(loginUserInfo.getCompanyName());
runningWaterRecord.setRelationId(entity.getCaseOutNo());
//变动金额
runningWaterRecord.setAlterationBalance(caseOutBalance);
......@@ -657,7 +657,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
public void bindOwnerBindCard(OwnerBindCardParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo());
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getCompanyNo());
try {
boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
if (!b) {
......@@ -667,7 +667,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
}
}
Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getUserNo());
Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getCompanyNo());
if (!result.succeed()) {
throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据");
}
......@@ -676,7 +676,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
}
UpdateOwnerBindCardFeignParam feignParam = new UpdateOwnerBindCardFeignParam();
feignParam.setUserNo(loginUserInfo.getUserNo());
feignParam.setUserNo(loginUserInfo.getCompanyNo());
feignParam.setOwnerAccountBank(param.getOwnerAccountBank());
feignParam.setOwnerAccountName(param.getOwnerAccountName());
feignParam.setOwnerBankAccount(param.getOwnerBankAccount());
......@@ -685,15 +685,15 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
ownerInfoFeign.bindOwnerBindCard(feignParam);
OwnerBindCardRecord record = new OwnerBindCardRecord();
record.setOwnerUserNo(loginUserInfo.getUserNo());
record.setOwnerUserName(loginUserInfo.getUserName());
record.setOwnerUserNo(loginUserInfo.getCompanyNo());
record.setOwnerUserName(loginUserInfo.getCompanyName());
record.setCreateItem("绑定银行卡");
record.setOwnerBank(param.getOwnerAccountBank());
record.setOpenAccountBank(param.getOwnerOpenBank());
record.setOpenAccountBankNumber(param.getOwnerOpenBankNumber());
record.setAccountBankName(param.getOwnerAccountName());
record.setBankCardNumber(param.getOwnerBankAccount());
record.setCreateBy(loginUserInfo.getUserName());
record.setCreateBy(loginUserInfo.getCompanyName());
ownerBindCardRecordDao.saveEntity(record);
}
......
performance-web/src/main/java/com/clx/performance/service/impl/OwnerRunningWaterRecordServiceImpl.java
浏览文件 @ 15f5796d
......@@ -31,14 +31,14 @@ public class OwnerRunningWaterRecordServiceImpl implements OwnerRunningWaterReco
@Override
public IPage<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
return ownerRunningWaterRecordDao.ownerAccountRunningWaterPageList(param);
}
@Override
public SXSSFWorkbook exportOwnerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
List<OwnerAccountRunningWaterRecordVO> list = ownerRunningWaterRecordDao.ownerAccountRunningWaterList(param);
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
......
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java
浏览文件 @ 15f5796d
......@@ -144,7 +144,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR
@Override
public IPage<PageOwnerBreakContractOwnerRecordVO> pageOwnerRecord(PageOwnerBreakContractOwnerRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<BreakContractOwnerRecord> ownerRecord = breakContractOwnerRecordDao.pageOwnerBreakContractOwnerRecordList(param);
List<PageOwnerBreakContractOwnerRecordVO> ownerRecordVO = breakContractOwnerRecordStruct.covertToOwnerList(ownerRecord.getRecords());
for(PageOwnerBreakContractOwnerRecordVO recordVO:ownerRecordVO){
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountApproveServiceImpl.java
浏览文件 @ 15f5796d
......@@ -56,7 +56,7 @@ public class OwnerLoanAccountApproveServiceImpl implements OwnerLoanAccountAppr
public List<OwnerLoanAccountApproveVO> getOwnerLoanAccountApproveList() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
List<OwnerLoanAccountApprove> list = ownerLoanAccountApproveDao.getOwnerLoanAccountApproveList(loginUserInfo.getUserNo());
List<OwnerLoanAccountApprove> list = ownerLoanAccountApproveDao.getOwnerLoanAccountApproveList(loginUserInfo.getCompanyNo());
return ownerLoanAccountApproveStruct.convertList(list);
}
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountRunningWaterRecordServiceImpl.java
浏览文件 @ 15f5796d
......@@ -42,7 +42,7 @@ public class OwnerLoanAccountRunningWaterRecordServiceImpl implements OwnerLoan
@Override
public IPage<OwnerLoanRunWaterRecordVO> pageOwnerLoanRunWaterRecord(PageOwnerLoanRunWaterRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
IPage<OwnerLoanAccountRunningWaterRecord> page = ownerLoanAccountRunningWaterRecordDao.pageOwnerLoanRunWaterRecord(loginUserInfo.getUserNo(),param);
IPage<OwnerLoanAccountRunningWaterRecord> page = ownerLoanAccountRunningWaterRecordDao.pageOwnerLoanRunWaterRecord(loginUserInfo.getCompanyNo(),param);
List<OwnerLoanRunWaterRecordVO> records = ownerLoanAccountRunningWaterRecordStruct.convertList(page.getRecords());
IPage<OwnerLoanRunWaterRecordVO> returnPage = new Page<>();
returnPage.setPages(page.getPages());
......@@ -54,7 +54,7 @@ public class OwnerLoanAccountRunningWaterRecordServiceImpl implements OwnerLoan
@Override
public List<OwnerLoanAccountRunWaterRecordDTO> exportOwnerLoanRunWaterRecord(PageOwnerLoanRunWaterRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
List<OwnerLoanAccountRunningWaterRecord> list = ownerLoanAccountRunningWaterRecordDao.listOwnerLoanRunWaterRecord(loginUserInfo.getUserNo(),param);
List<OwnerLoanAccountRunningWaterRecord> list = ownerLoanAccountRunningWaterRecordDao.listOwnerLoanRunWaterRecord(loginUserInfo.getCompanyNo(),param);
return ownerLoanAccountRunningWaterRecordStruct.convertDTOList(list);
}
}
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountServiceImpl.java
浏览文件 @ 15f5796d
......@@ -96,7 +96,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
public OwnerAccountVO getOwnerLoanAccount() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
Optional<OwnerLoanAccount> optional = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
loginUserInfo.getUserNo());
loginUserInfo.getCompanyNo());
if (!optional.isPresent()) {
return OwnerAccountVO.builder().openAccount(0).build();
}
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanRecordServiceImpl.java
浏览文件 @ 15f5796d
......@@ -146,7 +146,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
public void ownerLoanRecordSubmit(OwnerLoanRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
OwnerBindCardRecord ownerBindCardRecord = ownerBindCardRecordDao.getOwnerBindCardByUserNo(loginUserInfo.getUserNo());
OwnerBindCardRecord ownerBindCardRecord = ownerBindCardRecordDao.getOwnerBindCardByUserNo(loginUserInfo.getCompanyNo());
if(Objects.isNull(ownerBindCardRecord)){
throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"货主未绑定银行卡");
}
......@@ -155,9 +155,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
LocalDateTime createTime = LocalDateTime.now();
entity.setLoanNo(idGenerateSnowFlake.nextId(1L));
entity.setCreateTime(createTime);
entity.setOwnerUserNo(loginUserInfo.getUserNo());
entity.setOwnerUserName(loginUserInfo.getUserName());
entity.setMobile(loginUserInfo.getUserMobile());
entity.setOwnerUserNo(loginUserInfo.getCompanyNo());
entity.setOwnerUserName(loginUserInfo.getCompanyName());
//entity.setMobile(loginUserInfo.getUserMobile());
entity.setLoanBalance(param.getLoanBalance());
entity.setGoodsName("运费");
entity.setBorrowerId(param.getBorrowerId());
......@@ -172,7 +172,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
entity.setPayeeBankCode(payeeMap.getBankNo());
entity.setCreateBy(loginUserInfo.getUserName());
entity.setCreateBy(loginUserInfo.getCompanyName());
entity.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
ownerLoanRecordDao.saveEntity(entity);
}
......@@ -385,7 +385,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
//企业信息
OwnerInfoFeignVO ownerInfoFeignVO = Optional.ofNullable(ownerFeign.getUserCompany(loginUserInfo.getUserNo())).filter(
OwnerInfoFeignVO ownerInfoFeignVO = Optional.ofNullable(ownerFeign.getUserCompany(loginUserInfo.getCompanyNo())).filter(
Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL);
detail.setCompanyName(ownerInfoFeignVO.getCompanyName());
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerRepaymentServiceImpl.java
浏览文件 @ 15f5796d
......@@ -102,7 +102,7 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
public IPage<OwnerRepaymentVO> ownerRepaymentOverdueList() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
PageCarrierOwnerRepaymentParam param = new PageCarrierOwnerRepaymentParam();
param.setOwnerUserNo(String.valueOf(loginUserInfo.getUserNo()));
param.setOwnerUserNo(String.valueOf(loginUserInfo.getCompanyNo()));
List<Integer> inStatusList = new ArrayList<>();
inStatusList.add(OwnerRePaymentEnum.Status.PAYING.getCode());
inStatusList.add(OwnerRePaymentEnum.Status.PAY_WAIT.getCode());
......
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @ 15f5796d
......@@ -517,7 +517,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
@Override
public IPage<OwnerPageSettlementOwnerVO> pageSettlementOwner(PageOwnerSettlementParam param) {
Long userNo = TokenUtil.getLoginUserInfo().getUserNo();
Long userNo = TokenUtil.getLoginUserInfo().getCompanyNo();
IPage<SettlementOwner> page = settlementOwnerDao.pageSettlementOwner(userNo,param);
List<OwnerPageSettlementOwnerVO> list = settlementOwnerStruct.convertOwnerList(page.getRecords());
return new Page<OwnerPageSettlementOwnerVO>().setRecords(list).setTotal(page.getTotal()).setPages(page.getPages());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论