Skip to content

C
clx-performance
提交 0a479168 authored 作者: huyufan's avatar huyufan
浏览文件
操作

修改分支代码

上级 19bf13f0
隐藏空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 246 行删除
performance-api/src/main/java/com/clx/performance/param/pc/OwnerCaseOutParam.java
浏览文件 @ 0a479168
......@@ -23,7 +23,6 @@ public class OwnerCaseOutParam {
private Long ownerUserNo;
@ApiModelProperty(value = "提现金额（元）", example = "1.23")
@MoneyInConvert
private BigDecimal caseOutBalance;
@ApiModelProperty(value = "账户类型： 1：保证金 2：预付运费", example = "1")
......
performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java
浏览文件 @ 0a479168
......@@ -106,7 +106,7 @@ public class OwnerAccountController {
}
@ApiOperation(value = "货主付款确认", notes = "<br>By:胡宇帆")
@PostMapping("/accountBalanceConfirm")
@GetMapping("/accountBalanceConfirm")
public void accountBalanceConfirm(@RequestParam @NotNull(message = "编号不能为空") Integer id) {
ownerAccountService.accountBalanceConfirm(id);
......@@ -157,6 +157,7 @@ public class OwnerAccountController {
@ApiOperation(value = "货主绑卡记录列表", notes = "<br>By:胡宇帆")
@PostMapping("/ownerBindCardPageList")
@UnitCovert(param = false)
public Result<PageData<OwnerBindCardRecordVO>> ownerBindCardPageList(@RequestBody PageOwnerBindCardRecordListParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
param.setUserNo(loginUserInfo.getUserNo());
......
performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwner.java
浏览文件 @ 0a479168
......@@ -47,7 +47,6 @@ public class SettlementOwner implements HasKey<Integer> {
private String paymentImg; //付款凭证
private String paymentBankName; //付款银行
private String paymentBankCardNo; //付款银行卡卡号
private BigDecimal paymentAmount; //付款金额
private String companyName; //公司名称
private String companyTaxCode; //企业税号
private String companyAddress; //公司地址
......
performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java
浏览文件 @ 0a479168
......@@ -34,10 +34,6 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
private String childNo; //运单编号
private String orderGoodsNo; //货单编号
private String orderNo; //订单编号
private Integer sendAddressId; //发货地址id
private String sendAddress; //发货地址
private Integer receiveAddressId; //收货地址id
private String receiveAddress; //收货地址
private Integer goodsId; //货物id
private String goodsName; //货物名称
private BigDecimal freightPrice; //平台运费单价（分）
......
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @ 0a479168
......@@ -20,8 +20,6 @@ import com.clx.performance.service.OrderChildLogService;
import com.clx.performance.service.OrderChildPoundLogService;
import com.clx.performance.service.OrderChildService;
import com.clx.performance.service.OrderGoodsService;
import com.clx.performance.service.settle.SettlementDriverDetailService;
import com.clx.performance.service.settle.SettlementOwnerDetailService;
import com.clx.performance.struct.*;
import com.clx.performance.utils.spring.ApplicationContextUtils;
import com.clx.performance.vo.app.*;
......@@ -93,9 +91,6 @@ public class OrderChildServiceImpl implements OrderChildService {
private final OrderFeign orderFeign;
private final RedissonClient redissonClient;
private final SettlementDriverDetailService settlementDriverDetailService;
private final SettlementOwnerDetailService settlementOwnerDetailService;
@Override
public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
......@@ -815,9 +810,6 @@ public class OrderChildServiceImpl implements OrderChildService {
// 更新车辆状态
updateDriverOrderStatusDriverConfirm(orderChild.getTruckId());
// 生成计费单
saveSettlementDetail(orderChild);
// 日志
orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode(), OrderChildLogEnum.Type.DRIVER_CONFIRM.getMsg(),
loginUserInfo.getUserNo(), loginUserInfo.getUserName());
......@@ -934,17 +926,6 @@ public class OrderChildServiceImpl implements OrderChildService {
loginUserInfo.getUserNo(), loginUserInfo.getUserName());
}
/**
* 生成计费单
*/
private void saveSettlementDetail(OrderChild orderChild){
settlementDriverDetailService.saveSettlementDetail(orderChild);
settlementOwnerDetailService.saveSettlementDetail(orderChild);
}
@Override
public OrderChildVO getOrderChildInfo(String childNo) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
......
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementDriverDetailServiceImpl.java
浏览文件 @ 0a479168
......@@ -3,7 +3,6 @@ package com.clx.performance.service.impl.settle;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.settle.SettlementDriverDetailDao;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.settle.SettlementDriverDetail;
import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
import com.clx.performance.service.settle.SettlementDriverDetailService;
......@@ -13,8 +12,6 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
/**
......@@ -30,82 +27,6 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai
private final SettlementDriverDetailDao settlementDriverDetailDao;
private final SettlementDriverDetailStruct settlementOwnerDetailStruct;
@Override
public void saveSettlementDetail(OrderChild orderChild) {
SettlementDriverDetail settlementDriverDetail = new SettlementDriverDetail();
settlementDriverDetail.setChildNo(orderChild.getChildNo());
settlementDriverDetail.setOrderGoodsNo(orderChild.getOrderGoodsNo());
settlementDriverDetail.setOrderNo(orderChild.getOrderNo());
settlementDriverDetail.setDriverUserNo(orderChild.getTruckOwnUserNo());
settlementDriverDetail.setDriverName(orderChild.getOwnerName());
settlementDriverDetail.setTruckNo(orderChild.getTruckNo());
settlementDriverDetail.setGoodsId(orderChild.getGoodsId());
settlementDriverDetail.setGoodsName(orderChild.getGoodsName());
// 运费
settlementDriverDetail.setFreightPrice(orderChild.getFreightPrice()); //平台运费
settlementDriverDetail.setWeight(weightCalc(orderChild.getLoadNet(), orderChild.getUnloadNet()));
settlementDriverDetail.setFreight(freightCalc(settlementDriverDetail.getFreightPrice(), settlementDriverDetail.getWeight()));
// 亏吨
settlementDriverDetail.setLossPrice(orderChild.getLossPrice());
settlementDriverDetail.setLossWeight(lossWeightCalc(orderChild.getLoadNet(), orderChild.getUnloadNet()));
settlementDriverDetail.setLossFreight(lossFreightCalc(settlementDriverDetail.getLossPrice(), settlementDriverDetail.getLossWeight()));
// 预付运费
settlementDriverDetail.setPrepayFreight(BigDecimal.ZERO);
// 结算金额
settlementDriverDetail.setSettlementFreight(settlementFreightCalc(settlementDriverDetail.getFreight(), settlementDriverDetail.getLossFreight()));
settlementDriverDetailDao.saveEntity(settlementDriverDetail);
}
private BigDecimal weightCalc(BigDecimal loadNet, BigDecimal unLoadNet){
return unLoadNet.compareTo(loadNet) < 0? unLoadNet : loadNet;
}
/**
* 运费计算
*/
public BigDecimal freightCalc(BigDecimal freightPrice, BigDecimal weight){
return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
}
/**
* 亏吨计算
*/
private BigDecimal lossWeightCalc(BigDecimal loadNet, BigDecimal unLoadNet){
return unLoadNet.compareTo(loadNet) < 0? unLoadNet.subtract(loadNet) : BigDecimal.ZERO;
}
/**
* 亏吨运费
*/
private BigDecimal lossFreightCalc(BigDecimal freightPrice, BigDecimal weight){
return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
}
/**
* 开票金额
*/
private BigDecimal invoiceFreightCalc(BigDecimal freight, BigDecimal lossFreight){
return freight.subtract(lossFreight);
}
/**
* 结算金额
*/
private BigDecimal settlementFreightCalc(BigDecimal freight, BigDecimal lossFreight){
return freight.subtract(lossFreight);
}
@Override
public IPage<CarrierPageSettlementDriverDetailVO> pageSettlementDriverDetail(
......
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementDriverServiceImpl.java
浏览文件 @ 0a479168
......@@ -3,9 +3,7 @@ package com.clx.performance.service.impl.settle;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.settle.SettlementDriverDao;
import com.clx.performance.dao.settle.SettlementDriverDetailDao;
import com.clx.performance.model.settle.SettlementDriver;
import com.clx.performance.model.settle.SettlementDriverDetail;
import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
import com.clx.performance.service.settle.SettlementDriverService;
import com.clx.performance.struct.settle.SettlementDriverStruct;
......@@ -13,7 +11,6 @@ import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
/**
......@@ -30,42 +27,6 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
SettlementDriverStruct settlementDriverStruct;
private final SettlementDriverDetailDao settlementDriverDetailDao;
@Override
public void saveSettlement(SettlementDriverDetail settlementDetail) {
SettlementDriver settlementDriver = new SettlementDriver();
settlementDriver.setSettlementNo("");
settlementDriver.setDriverUserNo(settlementDetail.getDriverUserNo());
settlementDriver.setDriverName(settlementDetail.getDriverName());
settlementDriver.setTruckNo(settlementDetail.getTruckNo());
settlementDriver.setChildNo(settlementDetail.getChildNo());
settlementDriver.setOrderGoodsNo(settlementDetail.getOrderGoodsNo());
settlementDriver.setOrderNo(settlementDetail.getOrderNo());
settlementDriver.setGoodsId(settlementDetail.getGoodsId());
settlementDriver.setGoodsName(settlementDetail.getGoodsName());
settlementDriver.setFreightPrice(settlementDetail.getFreightPrice());
settlementDriver.setWeight(settlementDetail.getWeight());
settlementDriver.setFreight(settlementDetail.getFreight());
settlementDriver.setLossPrice(settlementDetail.getLossPrice());
settlementDriver.setLossWeight(settlementDetail.getLossWeight());
settlementDriver.setLossFreight(settlementDetail.getLossFreight());
settlementDriver.setSettlementFreight(BigDecimal.ZERO);
settlementDriver.setSettlementPlatform("");
settlementDriver.setInvoiceType(settlementDetail.getInvoiceType());
settlementDriverDao.saveEntity(settlementDriver);
}
@Override
public IPage<CarrierPageSettlementDriverVO> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param) {
IPage<SettlementDriver> page = settlementDriverDao.pageCarrierSettlementDriver(param);
......
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java
浏览文件 @ 0a479168
......@@ -3,7 +3,6 @@ package com.clx.performance.service.impl.settle;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.settle.SettlementOwnerDetail;
import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
......@@ -20,8 +19,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
......@@ -38,93 +35,6 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
private final SettlementOwnerDetailDao settlementOwnerDetailDao;
private final SettlementOwnerDetailStruct settlementOwnerDetailStruct;
@Override
public void saveSettlementDetail(OrderChild orderChild) {
SettlementOwnerDetail settlementOwnerDetail = new SettlementOwnerDetail();
settlementOwnerDetail.setChildNo(orderChild.getChildNo());
settlementOwnerDetail.setOrderGoodsNo(orderChild.getOrderGoodsNo());
settlementOwnerDetail.setOrderNo(orderChild.getOrderNo());
settlementOwnerDetail.setOwnerUserNo(orderChild.getOwnerUserNo());
settlementOwnerDetail.setOwnerName(orderChild.getOwnerName());
settlementOwnerDetail.setSendAddressId(orderChild.getSendAddressId());
settlementOwnerDetail.setSendAddress(orderChild.getSendAddress());
settlementOwnerDetail.setReceiveAddressId(orderChild.getReceiveAddressId());
settlementOwnerDetail.setReceiveAddress(orderChild.getReceiveAddress());
settlementOwnerDetail.setGoodsId(orderChild.getGoodsId());
settlementOwnerDetail.setGoodsName(orderChild.getGoodsName());
// 运费
settlementOwnerDetail.setFreightPrice(BigDecimal.ZERO); //平台运费
settlementOwnerDetail.setWeight(weightCalc(orderChild.getLoadNet(), orderChild.getUnloadNet()));
settlementOwnerDetail.setFreight(freightCalc(settlementOwnerDetail.getFreightPrice(), settlementOwnerDetail.getWeight()));
// 亏吨
settlementOwnerDetail.setLossPrice(orderChild.getLossPrice());
settlementOwnerDetail.setLossWeight(lossWeightCalc(orderChild.getLoadNet(), orderChild.getUnloadNet()));
settlementOwnerDetail.setLossFreight(lossFreightCalc(settlementOwnerDetail.getLossPrice(), settlementOwnerDetail.getLossWeight()));
// 预付运费
settlementOwnerDetail.setPrepayFreight(BigDecimal.ZERO);
// 开票金额
settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(settlementOwnerDetail.getFreight(), settlementOwnerDetail.getLossFreight()));
// 结算金额
settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(settlementOwnerDetail.getFreight(), settlementOwnerDetail.getLossFreight()));
settlementOwnerDetailDao.saveEntity(settlementOwnerDetail);
}
/**
* 吨数计算
*/
private BigDecimal weightCalc(BigDecimal loadNet, BigDecimal unLoadNet){
return unLoadNet.compareTo(loadNet) < 0? unLoadNet : loadNet;
}
/**
* 运费计算
*/
public BigDecimal freightCalc(BigDecimal freightPrice, BigDecimal weight){
return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
}
/**
* 亏吨计算
*/
private BigDecimal lossWeightCalc(BigDecimal loadNet, BigDecimal unLoadNet){
return unLoadNet.compareTo(loadNet) < 0? unLoadNet.subtract(loadNet) : BigDecimal.ZERO;
}
/**
* 亏吨运费
*/
private BigDecimal lossFreightCalc(BigDecimal freightPrice, BigDecimal weight){
return freightPrice.multiply(weight).setScale(0, RoundingMode.HALF_UP);
}
/**
* 开票金额
*/
private BigDecimal invoiceFreightCalc(BigDecimal freight, BigDecimal lossFreight){
return freight.subtract(lossFreight);
}
/**
* 结算金额
*/
private BigDecimal settlementFreightCalc(BigDecimal freight, BigDecimal lossFreight){
return freight.subtract(lossFreight);
}
@Override
public IPage<CarrierPageSettlementOwnerDetailVO> pageSettlementOwnerDetail(
PageCarrierSettlementOwnerDetailParam param) {
......
performance-web/src/main/java/com/clx/performance/service/settle/SettlementDriverDetailService.java
浏览文件 @ 0a479168
package com.clx.performance.service.settle;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.model.OrderChild;
import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverDetailParam;
import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetailVO;
......@@ -11,8 +10,5 @@ import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverDetai
* Time 09:43
*/
public interface SettlementDriverDetailService {
void saveSettlementDetail(OrderChild orderChild);
IPage<CarrierPageSettlementDriverDetailVO> pageSettlementDriverDetail(PageCarrierSettlementDriverDetailParam param);
}
performance-web/src/main/java/com/clx/performance/service/settle/SettlementDriverService.java
浏览文件 @ 0a479168
package com.clx.performance.service.settle;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.model.settle.SettlementDriverDetail;
import com.clx.performance.param.pc.driver.PageCarrierSettlementDriverParam;
import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
......@@ -11,8 +10,5 @@ import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
* Time 09:43
*/
public interface SettlementDriverService {
void saveSettlement(SettlementDriverDetail settlementDetail);
IPage<CarrierPageSettlementDriverVO> pageCarrierSettlementDriver(PageCarrierSettlementDriverParam param);
}
performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerDetailService.java
浏览文件 @ 0a479168
......@@ -2,7 +2,6 @@ package com.clx.performance.service.settle;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.model.OrderChild;
import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam;
import com.clx.performance.param.pc.owner.PageOwnerSettlementOwnerDetailParam;
import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
......@@ -18,8 +17,6 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
*/
public interface SettlementOwnerDetailService {
void saveSettlementDetail(OrderChild orderChild);
IPage<PageOwnerSettlementOwnerDetailVO> pageOwnerSettlementOrderDetailList(PageOwnerSettlementOwnerDetailParam param);
IPage<CarrierPageSettlementOwnerDetailVO> pageSettlementOwnerDetail(PageCarrierSettlementOwnerDetailParam param);
......
performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerBindCardRecordSqlProvider.java
浏览文件 @ 0a479168
......@@ -10,7 +10,7 @@ public class OwnerBindCardRecordSqlProvider {
String sql = new SQL() {{
SELECT("a.id, a.owner_user_no," +
" a.owner_user_name, a.owner_type, a.owner_bank, " +
" a.bank_card_number,a.open_account_bank, a.account_bank_name,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.create_item");
" a.bank_card_number,a.open_account_bank, a.account_bank_name,a.create_by,a.create_time,a.create_item");
FROM("owner_bind_card_record a");
ORDER_BY("a.create_time desc");
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论