Skip to content

C
clx-performance
提交 359c05dd authored 作者: 艾庆国's avatar 艾庆国
浏览文件
操作

Merge branch 'refs/heads/v24.2_company_owner_20240902'

# Conflicts: # performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
上级 e1c3cc63 76407c98
隐藏空白字符变更
内嵌 并排
正在显示 包含 109 行增加 和 68 行删除
performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
浏览文件 @ 359c05dd
......@@ -6,6 +6,7 @@ import com.clx.performance.param.feign.DistributionTruckParam;
import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
import com.clx.performance.param.pc.OrderCancelFeignParam;
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.ThawAccountParam;
import com.clx.performance.param.pc.owner.UpdateStatusParam;
......@@ -19,6 +20,7 @@ import com.clx.performance.vo.pc.OwnerAccountArrearsVO;
import com.clx.performance.vo.pc.OwnerLoanAccountVO;
import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
import com.msl.common.result.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -170,4 +172,7 @@ public interface PerformanceFeign {
Result<BigDecimal> getAlreadyWeight(@RequestParam("orderNo") String orderNo);
@PostMapping(value = {"clx-performance/feign/owner/createAccount"})
public Result<Object> createAccount(@RequestBody CreteAccountParam param);
}
performance-api/src/main/java/com/clx/performance/vo/pc/OwnerCaseOutVO.java
浏览文件 @ 359c05dd
......@@ -67,6 +67,11 @@ public class OwnerCaseOutVO {
*/
@ApiModelProperty(value = "操作人")
private String createBy;
/**
* 公司名称
*/
@ApiModelProperty(value = "公司名称")
private String companyName;
/**
* 付款时间
*/
......@@ -103,4 +108,4 @@ public class OwnerCaseOutVO {
@ApiModelProperty(value = "修改时间")
private String modifiedTime;
}
\ No newline at end of file
}
performance-api/src/main/java/com/clx/performance/vo/pc/OwnerTopUpVO.java
浏览文件 @ 359c05dd
......@@ -75,6 +75,11 @@ public class OwnerTopUpVO {
*/
@ApiModelProperty(value = "操作人")
private String createBy;
/**
* 公司名称
*/
@ApiModelProperty(value = "公司名称")
private String companyName;
/**
* 审批时间
*/
......@@ -97,4 +102,4 @@ public class OwnerTopUpVO {
@ApiModelProperty(value = "收款人账户账号")
private String accountNumber;
}
\ No newline at end of file
}
performance-web/src/main/java/com/clx/performance/controller/app/owner/AppOwnerOrderChildController.java
浏览文件 @ 359c05dd
......@@ -39,7 +39,11 @@ public class AppOwnerOrderChildController {
@ApiOperation(value = "运单列表", notes = "<br>By:刘海泉")
@PostMapping("/pageOwnerOrderChildList")
public Result<PageData<OwnerOrderChildVO>> pageOwnerOrderChildList(@RequestBody @Validated PageOwnerOrderChildListParam param) {
param.setOwnerUserNo(TokenUtil.getLoginUserInfo().getUserNo());
log.info("TokenUtil.getLoginUserInfo().getUserNo()===={}",TokenUtil.getLoginUserInfo().getUserNo());
log.info("TokenUtil.getLoginUserInfo().getCompanyNo()===={}",TokenUtil.getLoginUserInfo().getCompanyNo());
param.setOwnerUserNo(TokenUtil.getLoginUserInfo().getCompanyNo());
IPage<OwnerOrderChildVO> page = orderChildService.pageOwnerOrderChildList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
......
performance-web/src/main/java/com/clx/performance/controller/feign/OwnerAccountFeignController.java
浏览文件 @ 359c05dd
package com.clx.performance.controller.feign;
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.ThawAccountParam;
import com.clx.performance.service.OwnerAccountService;
......@@ -63,4 +64,11 @@ public class OwnerAccountFeignController {
) {
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
浏览文件 @ 359c05dd
......@@ -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
浏览文件 @ 359c05dd
......@@ -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
浏览文件 @ 359c05dd
......@@ -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
浏览文件 @ 359c05dd
......@@ -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 = "绑定货主银行卡")
......@@ -155,7 +155,7 @@ public class OwnerAccountController {
@UnitCovert(param = false)
public Result<PageData<OwnerBindCardRecordVO>> ownerBindCardPageList(@RequestBody PageOwnerBindCardRecordListParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setOwnerUserNo(loginUserInfo.getUserNo());
param.setOwnerUserNo(loginUserInfo.getCompanyNo());
IPage<OwnerBindCardRecordVO> page = ownerBindCardRecordService.ownerBindCardPageList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
......
performance-web/src/main/java/com/clx/performance/model/OwnerCaseOut.java
浏览文件 @ 359c05dd
......@@ -71,6 +71,11 @@ public class OwnerCaseOut implements HasKey<Integer> {
*/
@TableField("create_by")
private String createBy;
/**
* 公司名称
*/
@TableField("company_name")
private String companyName;
/**
* 付款时间
*/
......@@ -118,4 +123,4 @@ public class OwnerCaseOut implements HasKey<Integer> {
public Integer gainKey() {
return id;
}
}
\ No newline at end of file
}
performance-web/src/main/java/com/clx/performance/model/OwnerTopUp.java
浏览文件 @ 359c05dd
......@@ -79,6 +79,11 @@ public class OwnerTopUp implements HasKey<Integer> {
*/
@TableField("create_by")
private String createBy;
/**
* 公司名称
*/
@TableField("company_name")
private String companyName;
/**
* 审批时间
*/
......@@ -130,4 +135,4 @@ public class OwnerTopUp implements HasKey<Integer> {
public Integer gainKey() {
return id;
}
}
\ No newline at end of file
}
performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
浏览文件 @ 359c05dd
......@@ -135,7 +135,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
@Override
public IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setUserNo(loginUserInfo.getUserNo());
param.setUserNo(loginUserInfo.getCompanyNo());
return ownerRunningWaterRecordDao.prepaidFreightOwnerAccountPageList(param);
}
......@@ -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());
......@@ -185,6 +185,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
entity.setDrawingBankNumber(param.getDrawingBankNumber());
entity.setDrawingProof(param.getDrawingProof());
entity.setCreateBy(loginUserInfo.getUserName());
entity.setCompanyName(loginUserInfo.getCompanyName());
entity.setEnterpriseName(param.getEnterpriseName());
entity.setOpenAccountBank(param.getOpenAccountBank());
entity.setOpenAccountBankNumber(param.getOpenAccountBankNumber());
......@@ -220,7 +221,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 +231,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) {
......@@ -258,6 +259,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
entity.setCaseOutBank(param.getOwnerOpenBank());
entity.setCaseOutBankNumber(param.getOwnerBankAccount());
entity.setCreateBy(loginUserInfo.getUserName());
entity.setCompanyName(loginUserInfo.getCompanyName());
ownerCaseOutDao.saveEntity(entity);
......@@ -514,8 +516,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "序号", "index", 2000));
fieldList.add(new ExcelField(1, "货主编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(1, "公司编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "公司名称", "ownerName", 15000));
fieldList.add(new ExcelField(3, "联系电话", "mobile", 5000));
fieldList.add(new ExcelField(4, "账户类型", "accountType", 15000));
fieldList.add(new ExcelField(5, "流水类型", "runningWaterType", 5000));
......@@ -657,7 +659,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 +669,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 +678,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,8 +687,8 @@ 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());
......@@ -731,13 +733,13 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
@Override
public void unBindOwnerBindCard(OwnerBindCardParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getUserNo());
Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getCompanyNo());
if (!result.succeed()) {
throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据");
}
OwnerBindCardRecord record = new OwnerBindCardRecord();
//record.setOwnerType(param.getOwnerType());
record.setOwnerUserNo(loginUserInfo.getUserNo());
record.setOwnerUserNo(loginUserInfo.getCompanyNo());
record.setCreateItem("解绑银行卡");
record.setOwnerBank(param.getOwnerAccountBank());
record.setOpenAccountBank(param.getOwnerAccountBank());
......@@ -745,7 +747,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
record.setCreateBy(loginUserInfo.getUserName());
ownerBindCardRecordDao.saveEntity(record);
UpdateOwnerBindCardFeignParam feignParam = new UpdateOwnerBindCardFeignParam();
feignParam.setUserNo(loginUserInfo.getUserNo());
feignParam.setUserNo(loginUserInfo.getCompanyNo());
// feignParam.setOwnerAccountBank(param.getOwnerAccountBank());
// feignParam.setOwnerAccountName(param.getOwnerAccountName());
// feignParam.setOwnerBankAccount(param.getOwnerBankAccount());
......@@ -1302,8 +1304,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "货主编码", "index", 5000));
fieldList.add(new ExcelField(1, "货主名称", "ownerUserNo", 5000));
fieldList.add(new ExcelField(0, "公司编码", "index", 5000));
fieldList.add(new ExcelField(1, "公司名称", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "联系电话", "ownerName", 5000));
fieldList.add(new ExcelField(3, "账户类型", "mobile", 5000));
fieldList.add(new ExcelField(4, "账户余额", "accountType", 5000));
......@@ -1329,7 +1331,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
rowData.add(new ExcelData(dto.getCreateTime()));
dataList.add(rowData);
}
ExcelSheet excelSheet = new ExcelSheet("预付运费账户列表", "预付运费账户列表", fieldList, dataList);
String title = "预付运费账户列表";
if(Objects.equals(param.getAccountType(),1)){
title = "保证金账户列表";
}
ExcelSheet excelSheet = new ExcelSheet(title, title, fieldList, dataList);
//创建excel
return ExcelUtil.create(excelSheet);
......
performance-web/src/main/java/com/clx/performance/service/impl/OwnerRunningWaterRecordServiceImpl.java
浏览文件 @ 359c05dd
......@@ -31,20 +31,20 @@ 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<>();
fieldList.add(new ExcelField(0, "序号", "index", 2000));
fieldList.add(new ExcelField(1, "货主编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(1, "公司编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "公司名称", "ownerName", 5000));
fieldList.add(new ExcelField(3, "联系电话", "mobile", 5000));
fieldList.add(new ExcelField(4, "账户类型", "accountType", 15000));
fieldList.add(new ExcelField(5, "流水类型", "runningWaterType", 5000));
......
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java
浏览文件 @ 359c05dd
......@@ -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/breakcontract/BreakContractSettlementOwnerDetailServiceImpl.java
浏览文件 @ 359c05dd
......@@ -54,8 +54,8 @@ public class BreakContractSettlementOwnerDetailServiceImpl implements BreakCont
fieldList.add(new ExcelField(0, "序号", "index", 2000));
fieldList.add(new ExcelField(1, "违约单号", "breakNo", 5000));
fieldList.add(new ExcelField(2, "订单编号", "orderNo", 5000));
fieldList.add(new ExcelField(3, "货主编号", "ownUserNo", 5000));
fieldList.add(new ExcelField(4, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(3, "公司编号", "ownUserNo", 5000));
fieldList.add(new ExcelField(4, "公司名称", "ownerName", 5000));
fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
......
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java
浏览文件 @ 359c05dd
......@@ -115,8 +115,8 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
fieldList.add(new ExcelField(0, "序号", "index", 2000));
fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
fieldList.add(new ExcelField(2, "订单编号", "orderNo", 5000));
fieldList.add(new ExcelField(3, "货主编号", "ownUserNo", 5000));
fieldList.add(new ExcelField(4, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(3, "公司编号", "ownUserNo", 5000));
fieldList.add(new ExcelField(4, "公司名称", "ownerName", 5000));
fieldList.add(new ExcelField(5, "违约方", "breakContractPartyType", 5000));
fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
......
performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerServiceImpl.java
浏览文件 @ 359c05dd
......@@ -89,7 +89,8 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
String host = documentFeign.getHost().getData();
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.Address receiveAddress = data.getReceiveAddress();
......
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanAccountApproveServiceImpl.java
浏览文件 @ 359c05dd
......@@ -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
浏览文件 @ 359c05dd
......@@ -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
浏览文件 @ 359c05dd
......@@ -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
浏览文件 @ 359c05dd
......@@ -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
浏览文件 @ 359c05dd
......@@ -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/SettlementOwnerDetailServiceImpl.java
浏览文件 @ 359c05dd
......@@ -442,8 +442,8 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
fieldList.add(new ExcelField(1, "货主编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(1, "公司编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "公司名称", "ownerName", 5000));
fieldList.add(new ExcelField(3, "结算方式", "settlementWay", 5000));
fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
fieldList.add(new ExcelField(5, "实际净重（吨）", "weight", 5000));
......@@ -520,8 +520,8 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
fieldList.add(new ExcelField(1, "货主编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(1, "公司编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(2, "公司名称", "ownerName", 5000));
fieldList.add(new ExcelField(3, "结算方式", "settlementWay", 5000));
fieldList.add(new ExcelField(4, "货物名称", "goodsName", 5000));
fieldList.add(new ExcelField(5, "实际净重（吨）", "weight", 5000));
......@@ -688,7 +688,7 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "运单编号", "childNo", 5000));
fieldList.add(new ExcelField(1, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(1, "公司名称", "ownerName", 15000));
fieldList.add(new ExcelField(2, "结算方式", "settlementWayMsg", 5000));
fieldList.add(new ExcelField(3, "开票公司", "invoicingCompanyShorterName", 5000));
fieldList.add(new ExcelField(4, "开票标识", "invoiceTypeMsg", 5000));
......
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerExportServiceImpl.java
浏览文件 @ 359c05dd
......@@ -34,7 +34,7 @@ public class SettlementOwnerExportServiceImpl implements SettlementOwnerExportSe
fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
fieldList.add(new ExcelField(2, "订单编号", "orderNo", 5000));
fieldList.add(new ExcelField(3, "开票标识", "invoiceType", 5000));
fieldList.add(new ExcelField(4, "货主编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(4, "公司编码", "ownerUserNo", 5000));
fieldList.add(new ExcelField(5, "结算方式", "settlementWay", 5000));
fieldList.add(new ExcelField(6, "装车净重", "loadNet", 5000));
......
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @ 359c05dd
......@@ -335,7 +335,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
//当前账号
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
OwnerBindCardVO card = ownerAccountService.getOwnerBindCard(loginUserInfo.getUserNo());
OwnerBindCardVO card = ownerAccountService.getOwnerBindCard(loginUserInfo.getCompanyNo());
if(Objects.nonNull(card)){
vo.setPaymentBankCardNo(card.getOwnerBankAccount());
vo.setPaymentBankName(card.getOwnerAccountBank());
......@@ -369,7 +369,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
//当前账号
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
OwnerBindCardVO card = ownerAccountService.getOwnerBindCard(loginUserInfo.getUserNo());
OwnerBindCardVO card = ownerAccountService.getOwnerBindCard(loginUserInfo.getCompanyNo());
if(Objects.nonNull(card)){
vo.setPaymentBankCardNo(card.getOwnerBankAccount());
vo.setPaymentBankName(card.getOwnerAccountBank());
......@@ -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());
......
performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerCaseOutProvider.java
浏览文件 @ 359c05dd
......@@ -12,7 +12,7 @@ public class OwnerCaseOutProvider {
public String ownerCaseOutPageList(@Param("param") PageOwnerCaseOutListParam param) {
String sql = new SQL() {{
SELECT("a.id, a.owner_user_no," +
" a.case_out_no, a.case_out_balance, a.account_type, " +
" a.case_out_no, a.case_out_balance, a.account_type,a.company_name, " +
" a.status,a.case_out_bank,a.case_out_bank_number,date_format(a.payment_time, '%Y-%m-%d %H:%i:%s') as payment_time,a.create_by,a.platform_payment_bank_number,a.platform_payment_bank,a.payment_by,a.payment_proof,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
FROM("owner_case_out a");
if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
......
performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerTopUpProvider.java
浏览文件 @ 359c05dd
......@@ -12,7 +12,7 @@ public class OwnerTopUpProvider {
public String ownerTopUpPageList(@Param("param") PageOwnerTopUpListParam param) {
String sql = new SQL() {{
SELECT("a.id, a.owner_user_no," +
" a.top_up_no, a.top_up_balance, a.account_type, " +
" a.top_up_no, a.top_up_balance, a.account_type,a.company_name, " +
" a.status,a.drawing_bank,a.enterprise_name,a.account_number,a.drawing_bank_number,a.drawing_proof,date_format(a.approval_time, '%Y-%m-%d %H:%i:%s') as approval_time,a.approval_by,a.approval_turn_down,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
FROM("owner_top_up a");
if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论