Skip to content

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

Merge branch 'v24.2_company_owner_20240902' of…

Merge branch 'v24.2_company_owner_20240902' of https://t.clxkj.cn/clx-java/clx-performance into test Conflicts: performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java Former-commit-id: fbc46d05
上级 415ea0d9 cfacbcee
显示空白字符变更
内嵌 并排
正在显示 包含 51 行增加 和 37 行删除
performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
浏览文件 @ d286791b
...@@ -6,6 +6,7 @@ import com.clx.performance.param.feign.DistributionTruckParam; ...@@ -6,6 +6,7 @@ import com.clx.performance.param.feign.DistributionTruckParam;
import com.clx.performance.param.feign.OrderAdjustTonnageDownParam; import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
import com.clx.performance.param.pc.OrderCancelFeignParam; import com.clx.performance.param.pc.OrderCancelFeignParam;
import com.clx.performance.param.pc.OrderChildReportParam; import com.clx.performance.param.pc.OrderChildReportParam;
import com.clx.performance.param.pc.owner.CreteAccountParam;
import com.clx.performance.param.pc.owner.FrozenAccountParam; import com.clx.performance.param.pc.owner.FrozenAccountParam;
import com.clx.performance.param.pc.owner.ThawAccountParam; import com.clx.performance.param.pc.owner.ThawAccountParam;
import com.clx.performance.param.pc.owner.UpdateStatusParam; import com.clx.performance.param.pc.owner.UpdateStatusParam;
...@@ -19,6 +20,7 @@ import com.clx.performance.vo.pc.OwnerAccountArrearsVO; ...@@ -19,6 +20,7 @@ import com.clx.performance.vo.pc.OwnerAccountArrearsVO;
import com.clx.performance.vo.pc.OwnerLoanAccountVO; import com.clx.performance.vo.pc.OwnerLoanAccountVO;
import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO; import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
import com.msl.common.result.Result; import com.msl.common.result.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -171,4 +173,7 @@ public interface PerformanceFeign { ...@@ -171,4 +173,7 @@ public interface PerformanceFeign {
Result<BigDecimal> getAlreadyWeight(@RequestParam("orderNo") String orderNo); Result<BigDecimal> getAlreadyWeight(@RequestParam("orderNo") String orderNo);
@PostMapping(value = {"clx-performance/feign/owner/createAccount"})
public Result<Object> createAccount(@RequestBody CreteAccountParam param);
} }
performance-web/src/main/java/com/clx/performance/controller/feign/OwnerAccountFeignController.java
浏览文件 @ d286791b
package com.clx.performance.controller.feign; package com.clx.performance.controller.feign;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.clx.performance.param.pc.owner.CreteAccountParam;
import com.clx.performance.param.pc.owner.FrozenAccountParam; import com.clx.performance.param.pc.owner.FrozenAccountParam;
import com.clx.performance.param.pc.owner.ThawAccountParam; import com.clx.performance.param.pc.owner.ThawAccountParam;
import com.clx.performance.service.OwnerAccountService; import com.clx.performance.service.OwnerAccountService;
...@@ -63,4 +64,11 @@ public class OwnerAccountFeignController { ...@@ -63,4 +64,11 @@ public class OwnerAccountFeignController {
) { ) {
return Result.ok(ownerAccountService.accountArrearsInfo(userNo, prepaidArrearsOrder, marginArrearsOrder)); return Result.ok(ownerAccountService.accountArrearsInfo(userNo, prepaidArrearsOrder, marginArrearsOrder));
} }
@ApiOperation(value = "创建账户", notes = "<br>By:姜文业")
@PostMapping("/createAccount")
public Result<Object> createAccount(@RequestBody CreteAccountParam param) {
ownerAccountService.createAccount(param);
return Result.ok();
}
} }
performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java
浏览文件 @ d286791b
...@@ -50,7 +50,7 @@ public class OwnerBreakContractSettlementOwnerController { ...@@ -50,7 +50,7 @@ public class OwnerBreakContractSettlementOwnerController {
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<PageData<PageCarrierBreakContractSettlementOwnerVO>> pageOwnerBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param) { public Result<PageData<PageCarrierBreakContractSettlementOwnerVO>> pageOwnerBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<PageCarrierBreakContractSettlementOwnerVO> page = breakContractSettlementOwnerService.pageCarrierBreakContractSettlementOwnerList(param); IPage<PageCarrierBreakContractSettlementOwnerVO> page = breakContractSettlementOwnerService.pageCarrierBreakContractSettlementOwnerList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
} }
...@@ -59,7 +59,7 @@ public class OwnerBreakContractSettlementOwnerController { ...@@ -59,7 +59,7 @@ public class OwnerBreakContractSettlementOwnerController {
@PostMapping("/exportOwnerBreakContractSettlementOwnerList") @PostMapping("/exportOwnerBreakContractSettlementOwnerList")
public Result exportOwnerBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param, HttpServletResponse response) throws Exception { public Result exportOwnerBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param, HttpServletResponse response) throws Exception {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
SXSSFWorkbook workbook = breakContractSettlementOwnerService.exportCarrierBreakContractSettlementOwnerList(param); SXSSFWorkbook workbook = breakContractSettlementOwnerService.exportCarrierBreakContractSettlementOwnerList(param);
response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
workbook.write(response.getOutputStream()); workbook.write(response.getOutputStream());
......
performance-web/src/main/java/com/clx/performance/controller/pc/loan/owner/OwnerLoanRecordController.java
浏览文件 @ d286791b
...@@ -34,7 +34,7 @@ public class OwnerLoanRecordController { ...@@ -34,7 +34,7 @@ public class OwnerLoanRecordController {
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<PageData<OwnerLoanRecordVO>> pageOwnerLoanRecordOfOwner(@RequestBody @Validated PageOwnerLoanRecordOfOwner param) { public Result<PageData<OwnerLoanRecordVO>> pageOwnerLoanRecordOfOwner(@RequestBody @Validated PageOwnerLoanRecordOfOwner param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<OwnerLoanRecordVO> page = ownerLoanRecordService.pageOwnerLoanRecordOfOwner(param); IPage<OwnerLoanRecordVO> page = ownerLoanRecordService.pageOwnerLoanRecordOfOwner(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
} }
......
performance-web/src/main/java/com/clx/performance/controller/pc/loan/owner/OwnerRepaymentController.java
浏览文件 @ d286791b
...@@ -40,7 +40,7 @@ public class OwnerRepaymentController { ...@@ -40,7 +40,7 @@ public class OwnerRepaymentController {
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<PageData<OwnerRepaymentVO>> pageOwnerRepayment(@RequestBody @Validated PageOwnerRepaymentOfOwner param) { public Result<PageData<OwnerRepaymentVO>> pageOwnerRepayment(@RequestBody @Validated PageOwnerRepaymentOfOwner param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(String.valueOf(loginUserInfo.getUserNo())); param.setOwnerUserNo(String.valueOf(loginUserInfo.getCompanyNo()));
IPage<OwnerRepaymentVO> page = ownerRepaymentService.pageOwnerRepaymentOfOwner(param); IPage<OwnerRepaymentVO> page = ownerRepaymentService.pageOwnerRepaymentOfOwner(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
} }
......
performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java
浏览文件 @ d286791b
...@@ -58,7 +58,7 @@ public class OwnerAccountController { ...@@ -58,7 +58,7 @@ public class OwnerAccountController {
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<OwnerAccountAllVO> accountInfo() { public Result<OwnerAccountAllVO> accountInfo() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
OwnerAccountAllVO result = ownerAccountService.accountInfo(loginUserInfo.getUserNo()); OwnerAccountAllVO result = ownerAccountService.accountInfo(loginUserInfo.getCompanyNo());
return Result.ok(result); return Result.ok(result);
} }
...@@ -67,7 +67,7 @@ public class OwnerAccountController { ...@@ -67,7 +67,7 @@ public class OwnerAccountController {
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<PageData<OwnerTopUpVO>> ownerTopUpPageList(@RequestBody PageOwnerTopUpListParam param) { public Result<PageData<OwnerTopUpVO>> ownerTopUpPageList(@RequestBody PageOwnerTopUpListParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<OwnerTopUpVO> page = ownerTopUpService.ownerTopUpPageList(param); IPage<OwnerTopUpVO> page = ownerTopUpService.ownerTopUpPageList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
} }
...@@ -77,7 +77,7 @@ public class OwnerAccountController { ...@@ -77,7 +77,7 @@ public class OwnerAccountController {
@UnitCovert(param = false) @UnitCovert(param = false)
public Result<PageData<OwnerCaseOutVO>> ownerCaseOutPageList(@RequestBody PageOwnerCaseOutListParam param) { public Result<PageData<OwnerCaseOutVO>> ownerCaseOutPageList(@RequestBody PageOwnerCaseOutListParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setUserNo(loginUserInfo.getUserNo()); param.setUserNo(loginUserInfo.getCompanyNo());
IPage<OwnerCaseOutVO> page = ownerCaseOutService.ownerCaseOutPageList(param); IPage<OwnerCaseOutVO> page = ownerCaseOutService.ownerCaseOutPageList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
} }
...@@ -133,7 +133,7 @@ public class OwnerAccountController { ...@@ -133,7 +133,7 @@ public class OwnerAccountController {
@GetMapping("/getOwnerBindCard") @GetMapping("/getOwnerBindCard")
public Result<OwnerBindCardVO> getOwnerBindCard() { public Result<OwnerBindCardVO> getOwnerBindCard() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
return Result.ok(ownerAccountService.getOwnerBindCard(loginUserInfo.getUserNo())); return Result.ok(ownerAccountService.getOwnerBindCard(loginUserInfo.getCompanyNo()));
} }
@ApiOperation(value = "绑定货主银行卡") @ApiOperation(value = "绑定货主银行卡")
......
performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
浏览文件 @ d286791b
...@@ -164,7 +164,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -164,7 +164,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
public Long accountTopUp(OwnerTopUpParam param) { public Long accountTopUp(OwnerTopUpParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) { if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo()); OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getCompanyNo());
try { try {
boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword()); boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
if (!b) { if (!b) {
...@@ -175,7 +175,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -175,7 +175,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
} }
} }
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
OwnerTopUp entity = new OwnerTopUp(); OwnerTopUp entity = new OwnerTopUp();
entity.setAccountType(param.getAccountType()); entity.setAccountType(param.getAccountType());
...@@ -185,7 +185,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -185,7 +185,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
entity.setDrawingBank(param.getDrawingBank()); entity.setDrawingBank(param.getDrawingBank());
entity.setDrawingBankNumber(param.getDrawingBankNumber()); entity.setDrawingBankNumber(param.getDrawingBankNumber());
entity.setDrawingProof(param.getDrawingProof()); entity.setDrawingProof(param.getDrawingProof());
entity.setCreateBy(loginUserInfo.getUserName()); entity.setCreateBy(loginUserInfo.getCompanyName());
entity.setEnterpriseName(param.getEnterpriseName()); entity.setEnterpriseName(param.getEnterpriseName());
entity.setOpenAccountBank(param.getOpenAccountBank()); entity.setOpenAccountBank(param.getOpenAccountBank());
entity.setOpenAccountBankNumber(param.getOpenAccountBankNumber()); entity.setOpenAccountBankNumber(param.getOpenAccountBankNumber());
...@@ -221,7 +221,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -221,7 +221,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
BigDecimal caseOutBalance = param.getCaseOutBalance(); BigDecimal caseOutBalance = param.getCaseOutBalance();
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) { if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo()); OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getCompanyNo());
try { try {
boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword()); boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
if (!b) { if (!b) {
...@@ -231,7 +231,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -231,7 +231,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL); throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
} }
} }
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
while (true) { while (true) {
...@@ -258,7 +258,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -258,7 +258,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
entity.setStatus(OwnerAccountEnum.CaseOutStatus.PENDING_PAYMENT.getCode()); entity.setStatus(OwnerAccountEnum.CaseOutStatus.PENDING_PAYMENT.getCode());
entity.setCaseOutBank(param.getOwnerOpenBank()); entity.setCaseOutBank(param.getOwnerOpenBank());
entity.setCaseOutBankNumber(param.getOwnerBankAccount()); entity.setCaseOutBankNumber(param.getOwnerBankAccount());
entity.setCreateBy(loginUserInfo.getUserName()); entity.setCreateBy(loginUserInfo.getCompanyName());
ownerCaseOutDao.saveEntity(entity); ownerCaseOutDao.saveEntity(entity);
...@@ -266,7 +266,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -266,7 +266,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord(); OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
runningWaterRecord.setOwnerUserName(account.getOwnerUserName()); runningWaterRecord.setOwnerUserName(account.getOwnerUserName());
runningWaterRecord.setMobile(account.getMobile()); runningWaterRecord.setMobile(account.getMobile());
runningWaterRecord.setCreateBy(loginUserInfo.getUserName()); runningWaterRecord.setCreateBy(loginUserInfo.getCompanyName());
runningWaterRecord.setRelationId(entity.getCaseOutNo()); runningWaterRecord.setRelationId(entity.getCaseOutNo());
//变动金额 //变动金额
runningWaterRecord.setAlterationBalance(caseOutBalance); runningWaterRecord.setAlterationBalance(caseOutBalance);
...@@ -658,7 +658,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -658,7 +658,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
public void bindOwnerBindCard(OwnerBindCardParam param) { public void bindOwnerBindCard(OwnerBindCardParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) { if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo()); OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getCompanyNo());
try { try {
boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword()); boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
if (!b) { if (!b) {
...@@ -668,7 +668,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -668,7 +668,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL); throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
} }
} }
Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getUserNo()); Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getCompanyNo());
if (!result.succeed()) { if (!result.succeed()) {
throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据"); throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据");
} }
...@@ -677,7 +677,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -677,7 +677,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
} }
UpdateOwnerBindCardFeignParam feignParam = new UpdateOwnerBindCardFeignParam(); UpdateOwnerBindCardFeignParam feignParam = new UpdateOwnerBindCardFeignParam();
feignParam.setUserNo(loginUserInfo.getUserNo()); feignParam.setUserNo(loginUserInfo.getCompanyNo());
feignParam.setOwnerAccountBank(param.getOwnerAccountBank()); feignParam.setOwnerAccountBank(param.getOwnerAccountBank());
feignParam.setOwnerAccountName(param.getOwnerAccountName()); feignParam.setOwnerAccountName(param.getOwnerAccountName());
feignParam.setOwnerBankAccount(param.getOwnerBankAccount()); feignParam.setOwnerBankAccount(param.getOwnerBankAccount());
...@@ -686,15 +686,15 @@ public class OwnerAccountServiceImpl implements OwnerAccountService { ...@@ -686,15 +686,15 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
ownerInfoFeign.bindOwnerBindCard(feignParam); ownerInfoFeign.bindOwnerBindCard(feignParam);
OwnerBindCardRecord record = new OwnerBindCardRecord(); OwnerBindCardRecord record = new OwnerBindCardRecord();
record.setOwnerUserNo(loginUserInfo.getUserNo()); record.setOwnerUserNo(loginUserInfo.getCompanyNo());
record.setOwnerUserName(loginUserInfo.getUserName()); record.setOwnerUserName(loginUserInfo.getCompanyName());
record.setCreateItem("绑定银行卡"); record.setCreateItem("绑定银行卡");
record.setOwnerBank(param.getOwnerAccountBank()); record.setOwnerBank(param.getOwnerAccountBank());
record.setOpenAccountBank(param.getOwnerOpenBank()); record.setOpenAccountBank(param.getOwnerOpenBank());
record.setOpenAccountBankNumber(param.getOwnerOpenBankNumber()); record.setOpenAccountBankNumber(param.getOwnerOpenBankNumber());
record.setAccountBankName(param.getOwnerAccountName()); record.setAccountBankName(param.getOwnerAccountName());
record.setBankCardNumber(param.getOwnerBankAccount()); record.setBankCardNumber(param.getOwnerBankAccount());
record.setCreateBy(loginUserInfo.getUserName()); record.setCreateBy(loginUserInfo.getCompanyName());
ownerBindCardRecordDao.saveEntity(record); ownerBindCardRecordDao.saveEntity(record);
} }
......
performance-web/src/main/java/com/clx/performance/service/impl/OwnerRunningWaterRecordServiceImpl.java
浏览文件 @ d286791b
...@@ -31,14 +31,14 @@ public class OwnerRunningWaterRecordServiceImpl implements OwnerRunningWaterReco ...@@ -31,14 +31,14 @@ public class OwnerRunningWaterRecordServiceImpl implements OwnerRunningWaterReco
@Override @Override
public IPage<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) { public IPage<OwnerAccountRunningWaterRecordVO> ownerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
return ownerRunningWaterRecordDao.ownerAccountRunningWaterPageList(param); return ownerRunningWaterRecordDao.ownerAccountRunningWaterPageList(param);
} }
@Override @Override
public SXSSFWorkbook exportOwnerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) { public SXSSFWorkbook exportOwnerAccountRunningWaterPageList(PageOwnerAccountRunningWaterParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
List<OwnerAccountRunningWaterRecordVO> list = ownerRunningWaterRecordDao.ownerAccountRunningWaterList(param); List<OwnerAccountRunningWaterRecordVO> list = ownerRunningWaterRecordDao.ownerAccountRunningWaterList(param);
// 组装表头 // 组装表头
List<ExcelField> fieldList = new ArrayList<>(); List<ExcelField> fieldList = new ArrayList<>();
......
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java
浏览文件 @ d286791b
...@@ -144,7 +144,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR ...@@ -144,7 +144,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR
@Override @Override
public IPage<PageOwnerBreakContractOwnerRecordVO> pageOwnerRecord(PageOwnerBreakContractOwnerRecordParam param) { public IPage<PageOwnerBreakContractOwnerRecordVO> pageOwnerRecord(PageOwnerBreakContractOwnerRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo()); param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<BreakContractOwnerRecord> ownerRecord = breakContractOwnerRecordDao.pageOwnerBreakContractOwnerRecordList(param); IPage<BreakContractOwnerRecord> ownerRecord = breakContractOwnerRecordDao.pageOwnerBreakContractOwnerRecordList(param);
List<PageOwnerBreakContractOwnerRecordVO> ownerRecordVO = breakContractOwnerRecordStruct.covertToOwnerList(ownerRecord.getRecords()); List<PageOwnerBreakContractOwnerRecordVO> ownerRecordVO = breakContractOwnerRecordStruct.covertToOwnerList(ownerRecord.getRecords());
for(PageOwnerBreakContractOwnerRecordVO recordVO:ownerRecordVO){ for(PageOwnerBreakContractOwnerRecordVO recordVO:ownerRecordVO){
......
performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerServiceImpl.java
浏览文件 @ d286791b
...@@ -89,7 +89,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService { ...@@ -89,7 +89,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
String host = documentFeign.getHost().getData(); String host = documentFeign.getHost().getData();
FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo()); FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
String ownerMobile = ownerFeign.getOwnerInfo(orderInfoFeign.getOwnerUserNo()).getData().getMobile(); //String ownerMobile = ownerFeign.getOwnerInfo(orderInfoFeign.getOwnerUserNo()).getData().getMobile();
String ownerMobile = String.valueOf(orderInfoFeign.getOwnerUserNo());
FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData(); FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
FeignAddressVO.Address receiveAddress = data.getReceiveAddress(); FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountApproveServiceImpl.java
浏览文件 @ d286791b
...@@ -56,7 +56,7 @@ public class OwnerLoanAccountApproveServiceImpl implements OwnerLoanAccountAppr ...@@ -56,7 +56,7 @@ public class OwnerLoanAccountApproveServiceImpl implements OwnerLoanAccountAppr
public List<OwnerLoanAccountApproveVO> getOwnerLoanAccountApproveList() { public List<OwnerLoanAccountApproveVO> getOwnerLoanAccountApproveList() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
List<OwnerLoanAccountApprove> list = ownerLoanAccountApproveDao.getOwnerLoanAccountApproveList(loginUserInfo.getUserNo()); List<OwnerLoanAccountApprove> list = ownerLoanAccountApproveDao.getOwnerLoanAccountApproveList(loginUserInfo.getCompanyNo());
return ownerLoanAccountApproveStruct.convertList(list); return ownerLoanAccountApproveStruct.convertList(list);
} }
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountRunningWaterRecordServiceImpl.java
浏览文件 @ d286791b
...@@ -42,7 +42,7 @@ public class OwnerLoanAccountRunningWaterRecordServiceImpl implements OwnerLoan ...@@ -42,7 +42,7 @@ public class OwnerLoanAccountRunningWaterRecordServiceImpl implements OwnerLoan
@Override @Override
public IPage<OwnerLoanRunWaterRecordVO> pageOwnerLoanRunWaterRecord(PageOwnerLoanRunWaterRecordParam param) { public IPage<OwnerLoanRunWaterRecordVO> pageOwnerLoanRunWaterRecord(PageOwnerLoanRunWaterRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); 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()); List<OwnerLoanRunWaterRecordVO> records = ownerLoanAccountRunningWaterRecordStruct.convertList(page.getRecords());
IPage<OwnerLoanRunWaterRecordVO> returnPage = new Page<>(); IPage<OwnerLoanRunWaterRecordVO> returnPage = new Page<>();
returnPage.setPages(page.getPages()); returnPage.setPages(page.getPages());
...@@ -54,7 +54,7 @@ public class OwnerLoanAccountRunningWaterRecordServiceImpl implements OwnerLoan ...@@ -54,7 +54,7 @@ public class OwnerLoanAccountRunningWaterRecordServiceImpl implements OwnerLoan
@Override @Override
public List<OwnerLoanAccountRunWaterRecordDTO> exportOwnerLoanRunWaterRecord(PageOwnerLoanRunWaterRecordParam param) { public List<OwnerLoanAccountRunWaterRecordDTO> exportOwnerLoanRunWaterRecord(PageOwnerLoanRunWaterRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
List<OwnerLoanAccountRunningWaterRecord> list = ownerLoanAccountRunningWaterRecordDao.listOwnerLoanRunWaterRecord(loginUserInfo.getUserNo(),param); List<OwnerLoanAccountRunningWaterRecord> list = ownerLoanAccountRunningWaterRecordDao.listOwnerLoanRunWaterRecord(loginUserInfo.getCompanyNo(),param);
return ownerLoanAccountRunningWaterRecordStruct.convertDTOList(list); return ownerLoanAccountRunningWaterRecordStruct.convertDTOList(list);
} }
} }
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountServiceImpl.java
浏览文件 @ d286791b
...@@ -96,7 +96,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService { ...@@ -96,7 +96,7 @@ public class OwnerLoanAccountServiceImpl implements OwnerLoanAccountService {
public OwnerAccountVO getOwnerLoanAccount() { public OwnerAccountVO getOwnerLoanAccount() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
Optional<OwnerLoanAccount> optional = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo, Optional<OwnerLoanAccount> optional = ownerLoanAccountDao.getOneByField(OwnerLoanAccount::getOwnerUserNo,
loginUserInfo.getUserNo()); loginUserInfo.getCompanyNo());
if (!optional.isPresent()) { if (!optional.isPresent()) {
return OwnerAccountVO.builder().openAccount(0).build(); return OwnerAccountVO.builder().openAccount(0).build();
} }
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanRecordServiceImpl.java
浏览文件 @ d286791b
...@@ -146,7 +146,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -146,7 +146,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
public void ownerLoanRecordSubmit(OwnerLoanRecordParam param) { public void ownerLoanRecordSubmit(OwnerLoanRecordParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
OwnerBindCardRecord ownerBindCardRecord = ownerBindCardRecordDao.getOwnerBindCardByUserNo(loginUserInfo.getUserNo()); OwnerBindCardRecord ownerBindCardRecord = ownerBindCardRecordDao.getOwnerBindCardByUserNo(loginUserInfo.getCompanyNo());
if(Objects.isNull(ownerBindCardRecord)){ if(Objects.isNull(ownerBindCardRecord)){
throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"货主未绑定银行卡"); throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"货主未绑定银行卡");
} }
...@@ -155,9 +155,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -155,9 +155,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
LocalDateTime createTime = LocalDateTime.now(); LocalDateTime createTime = LocalDateTime.now();
entity.setLoanNo(idGenerateSnowFlake.nextId(1L)); entity.setLoanNo(idGenerateSnowFlake.nextId(1L));
entity.setCreateTime(createTime); entity.setCreateTime(createTime);
entity.setOwnerUserNo(loginUserInfo.getUserNo()); entity.setOwnerUserNo(loginUserInfo.getCompanyNo());
entity.setOwnerUserName(loginUserInfo.getUserName()); entity.setOwnerUserName(loginUserInfo.getCompanyName());
entity.setMobile(loginUserInfo.getUserMobile()); //entity.setMobile(loginUserInfo.getUserMobile());
entity.setLoanBalance(param.getLoanBalance()); entity.setLoanBalance(param.getLoanBalance());
entity.setGoodsName("运费"); entity.setGoodsName("运费");
entity.setBorrowerId(param.getBorrowerId()); entity.setBorrowerId(param.getBorrowerId());
...@@ -172,7 +172,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -172,7 +172,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
entity.setPayeeBankCode(payeeMap.getBankNo()); entity.setPayeeBankCode(payeeMap.getBankNo());
entity.setCreateBy(loginUserInfo.getUserName()); entity.setCreateBy(loginUserInfo.getCompanyName());
entity.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode()); entity.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
ownerLoanRecordDao.saveEntity(entity); ownerLoanRecordDao.saveEntity(entity);
} }
...@@ -385,7 +385,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService { ...@@ -385,7 +385,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); 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); Result::succeed).map(Result::getData).orElseThrow(ResultCodeEnum.FAIL);
detail.setCompanyName(ownerInfoFeignVO.getCompanyName()); detail.setCompanyName(ownerInfoFeignVO.getCompanyName());
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerRepaymentServiceImpl.java
浏览文件 @ d286791b
...@@ -102,7 +102,7 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService { ...@@ -102,7 +102,7 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
public IPage<OwnerRepaymentVO> ownerRepaymentOverdueList() { public IPage<OwnerRepaymentVO> ownerRepaymentOverdueList() {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
PageCarrierOwnerRepaymentParam param = new PageCarrierOwnerRepaymentParam(); PageCarrierOwnerRepaymentParam param = new PageCarrierOwnerRepaymentParam();
param.setOwnerUserNo(String.valueOf(loginUserInfo.getUserNo())); param.setOwnerUserNo(String.valueOf(loginUserInfo.getCompanyNo()));
List<Integer> inStatusList = new ArrayList<>(); List<Integer> inStatusList = new ArrayList<>();
inStatusList.add(OwnerRePaymentEnum.Status.PAYING.getCode()); inStatusList.add(OwnerRePaymentEnum.Status.PAYING.getCode());
inStatusList.add(OwnerRePaymentEnum.Status.PAY_WAIT.getCode()); inStatusList.add(OwnerRePaymentEnum.Status.PAY_WAIT.getCode());
......
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @ d286791b
...@@ -516,7 +516,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService { ...@@ -516,7 +516,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
@Override @Override
public IPage<OwnerPageSettlementOwnerVO> pageSettlementOwner(PageOwnerSettlementParam param) { public IPage<OwnerPageSettlementOwnerVO> pageSettlementOwner(PageOwnerSettlementParam param) {
Long userNo = TokenUtil.getLoginUserInfo().getUserNo(); Long userNo = TokenUtil.getLoginUserInfo().getCompanyNo();
IPage<SettlementOwner> page = settlementOwnerDao.pageSettlementOwner(userNo,param); IPage<SettlementOwner> page = settlementOwnerDao.pageSettlementOwner(userNo,param);
List<OwnerPageSettlementOwnerVO> list = settlementOwnerStruct.convertOwnerList(page.getRecords()); List<OwnerPageSettlementOwnerVO> list = settlementOwnerStruct.convertOwnerList(page.getRecords());
return new Page<OwnerPageSettlementOwnerVO>().setRecords(list).setTotal(page.getTotal()).setPages(page.getPages()); return new Page<OwnerPageSettlementOwnerVO>().setRecords(list).setTotal(page.getTotal()).setPages(page.getPages());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论