Skip to content

C
clx-performance
提交 9c921dee authored 作者: 刘海泉's avatar 刘海泉
浏览文件
操作

Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into dev

# Conflicts: # performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java # performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java # performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java # performance-web/src/main/java/com/clx/performance/service/OrderChildService.java # performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
上级 f9d66f5f f53c6847
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 900 行增加 和 34 行删除
performance-api/src/main/java/com/clx/performance/enums/OrderEnum.java
浏览文件 @ 9c921dee
......@@ -96,6 +96,14 @@ public enum OrderEnum {
}
return null;
}
public static String getNameByCode(Integer code) {
for(OverWeight type: OverWeight.values()){
if(Objects.equals(type.code,code)){
return type.getName();
}
}
return null;
}
}
......
performance-api/src/main/java/com/clx/performance/vo/pc/DriverFreightPriceChartVO.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.math.BigDecimal;
@Getter
@Setter
@NoArgsConstructor
public class DriverFreightPriceChartVO {
@ApiModelProperty("挂单运费")
@MoneyOutConvert
private BigDecimal pendingOrderFreight;
@ApiModelProperty("运费生效时间")
@MoneyOutConvert
private String creatTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/DriverFreightPriceVO.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.math.BigDecimal;
@Getter
@Setter
@NoArgsConstructor
public class DriverFreightPriceVO {
@ApiModelProperty("货单编号")
private String orderGoodsNo;
@ApiModelProperty("挂单运费")
@MoneyOutConvert
private BigDecimal pendingOrderFreight;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/HistoryLineTranVolumeChartVO.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.vo.pc;
import com.msl.common.convertor.type.MoneyOutConvert;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class HistoryLineTranVolumeChartVO {
@ApiModelProperty("挂单运费")
@MoneyOutConvert
private BigDecimal pendingOrderFreight;
@ApiModelProperty("拉运单数")
@MoneyOutConvert
private Integer number;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsPendingVO.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.vo.pc;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class OrderGoodsPendingVO {
@ApiModelProperty("货单编号")
private String orderGoodsNo;
@ApiModelProperty("挂单时间")
private String pendingOrderTime;
}
\ No newline at end of file
performance-api/src/main/java/com/clx/performance/vo/pc/PerformanceProgressVO.java
浏览文件 @ 9c921dee
package com.clx.performance.vo.pc;
import com.clx.performance.enums.OrderEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @author kavin
......@@ -73,6 +73,12 @@ public class PerformanceProgressVO{
@ApiModelProperty("是否C类煤源 0 否 1 是")
private Integer sendOverStandard;
@ApiModelProperty("是否C类煤源 0 否 1 是")
private String sendOverStandardMsg;
public String getSendOverStandardMsg(){
return OrderEnum.OverWeight.getNameByCode(sendOverStandard);
}
@ApiModelProperty("司机运费")
private BigDecimal driverFreightPrice;
......@@ -82,8 +88,6 @@ public class PerformanceProgressVO{
private BigDecimal taskWeight;
@ApiModelProperty("任务吨数")
private BigDecimal transportWeight;
@ApiModelProperty("挂单吨数")
......@@ -155,14 +159,14 @@ public class PerformanceProgressVO{
@ApiModelProperty("挂单时间")
private LocalDateTime pendingTime;
private String pendingTime;
@ApiModelProperty("交易要求到站时间")
private String tradeRequireArriveStationTime;
@ApiModelProperty("交易要求到站时间")
@ApiModelProperty("物流要求到站时间")
private String transportExpectArriveStationTime;
......
performance-web/src/main/java/com/clx/performance/config/RabbitBeanConfig.java
浏览文件 @ 9c921dee
......@@ -222,4 +222,83 @@ public class RabbitBeanConfig {
return BindingBuilder.bind(ownerLoanThawQueue()).to(ownerLoanExchange()).with(RabbitKeyConstants.OWNER_LOAN_THAW_ROUTE_KEY);
}
/**
* 监听货单同步履约进度表
*/
@Bean
public Queue syncPerformanceProgress4OrderGoodsQueue() {
return new Queue(RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_INFO_QUEUE,
true, false, false);
}
/**
* 监听货单同步履约进度表
**/
@Bean
public DirectExchange syncPerformanceProgress4OrderGoodsExchange() {
return new DirectExchange(RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_EXCHANGE);
}
/**
* 监听货单同步履约进度表
*/
@Bean
public Binding syncPerformanceProgress4OrderGoodsBind() {
return BindingBuilder.bind(syncPerformanceProgress4OrderGoodsQueue()).to(syncPerformanceProgress4OrderGoodsExchange())
.with(RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_ROUTING_KEY);
}
/**
* 监听运单同步履约进度表
*/
@Bean
public Queue syncPerformanceProgress4OrderChildQueue() {
return new Queue(RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_QUEUE,
true, false, false);
}
/**
* 监听运单同步履约进度表
**/
@Bean
public DirectExchange syncPerformanceProgress4OrderChildExchange() {
return new DirectExchange(RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_EXCHANGE);
}
/**
* 监听运单同步履约进度表
*/
@Bean
public Binding syncPerformanceProgress4OrderChildBind() {
return BindingBuilder.bind(syncPerformanceProgress4OrderChildQueue()).to(syncPerformanceProgress4OrderChildExchange())
.with(RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_ROUTING_KEY);
}
/**
* 保存货单调价表
*/
@Bean
public Queue saveOrderGoodsAdjustmentPriceQueue() {
return new Queue(RabbitKeyConstants.SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_QUEUE,
true, false, false);
}
/**
* 保存货单调价表
**/
@Bean
public DirectExchange saveOrderGoodsAdjustmentPriceExchange() {
return new DirectExchange(RabbitKeyConstants.SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_EXCHANGE);
}
/**
*保存货单调价表
*/
@Bean
public Binding saveOrderGoodsAdjustmentPriceBind() {
return BindingBuilder.bind(saveOrderGoodsAdjustmentPriceQueue()).to(saveOrderGoodsAdjustmentPriceExchange())
.with(RabbitKeyConstants.SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_ROUTING_KEY);
}
}
performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java
浏览文件 @ 9c921dee
......@@ -110,4 +110,43 @@ public class RabbitKeyConstants {
//货主结算单数据同步货主客户端 需要手动创建对列交换机
public static final String CLX_PERFORMANCE_SETTLEMENT_OWNER_QUEUE = "clx_performance.settlement_owner_queue";
//同步履约进度表消息----订单部分
public static final String SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_INFO_QUEUE = "clx_order.sync.performance.progress.for.order.info.queue";
//货单同步履约进度表queue
public static final String SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_QUEUE = "clx_order.sync.performance.progress.for.order.goods.queue";
//货单同步履约进度表exchange
public static final String SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_EXCHANGE = "clx_order.sync.performance.progress.for.order.goods.exchange";
//货单同步履约进度表routing_key
public static final String SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_ROUTING_KEY = "clx_order.sync.performance.progress.for.order.goods.routing.key";
//运单同步履约进度表queue
public static final String SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_QUEUE = "clx_order.sync.performance.progress.for.order.child.queue";
//运单同步履约进度表exchange
public static final String SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_EXCHANGE = "clx_order.sync.performance.progress.for.order.child.exchange";
//运单同步履约进度表routing_key
public static final String SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_ROUTING_KEY = "clx_order.sync.performance.progress.for.order.child.routing.key";
//保存货单调价记录queue
public static final String SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_QUEUE = "clx_order.sync.performance.progress.for.order.child.queue";
//保存货单调价记录exchange
public static final String SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_EXCHANGE = "clx_order.sync.performance.progress.for.order.child.exchange";
//保存货单调价记录routing_key
public static final String SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_ROUTING_KEY = "clx_order.sync.performance.progress.for.order.child.routing.key";
}
performance-web/src/main/java/com/clx/performance/controller/pc/CarrierOrderChildController.java
浏览文件 @ 9c921dee
......@@ -2,10 +2,9 @@ package com.clx.performance.controller.pc;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.enums.OrderChildEnum;
import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
import com.clx.performance.param.pc.OrderChildCarrierCancelParam;
import com.clx.performance.param.pc.PageCarrierOrderChildParam;
import com.clx.performance.service.OrderChildPoundAuditService;
import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
import com.clx.performance.service.OrderChildService;
import com.clx.performance.vo.pc.*;
import com.msl.common.base.PageData;
......@@ -104,4 +103,12 @@ public class CarrierOrderChildController {
}
@ApiOperation(value = "履约进度表-历史线路拉运量", notes = "<br>By:l刘海泉")
@GetMapping("/getHistoryLineTransportVolume")
public Result<List<HistoryLineTranVolumeChartVO>> getHistoryLineTransportVolume(@NotBlank(message = "订单编号不能为空") String orderNo) {
return Result.ok(orderChildService.getHistoryLineTransportVolume(orderNo));
}
}
performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
浏览文件 @ 9c921dee
......@@ -2,31 +2,23 @@ package com.clx.performance.controller.pc;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.order.feign.OrderFeign;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.param.pc.OrderGoodsCancelParam;
import com.clx.performance.param.pc.UpdateEditOrderGoodsParam;
import com.clx.performance.param.pc.OrderGoodsParams;
import com.clx.performance.param.pc.PageOrderGoodsListParam;
import com.clx.order.vo.feign.FeignOrderVO;
import com.clx.performance.component.GoodsOrderStrategyContext;
import com.clx.performance.constant.RedisConstants;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.param.pc.UpdateOrderGoodsPriceParam;
import com.clx.performance.param.pc.*;
import com.clx.performance.service.OrderChildService;
import com.clx.performance.service.OrderGoodsAdjustmentPriceService;
import com.clx.performance.service.OrderGoodsService;
import com.clx.performance.service.OrderGoodsTruckBindService;
import com.clx.performance.vo.pc.OrderChildPCVO;
import com.clx.performance.vo.pc.OrderGoodsEditVO;
import com.clx.performance.vo.pc.OrderGoodsVO;
import com.clx.performance.vo.pc.*;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.exception.ServiceSystemException;
import com.msl.common.result.Result;
import com.msl.common.utils.DateUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
......@@ -34,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
......@@ -75,6 +68,9 @@ public class GoodsOrderController {
@Autowired
private OrderGoodsTruckBindService orderGoodsTruckBindService;
@Autowired
private OrderGoodsAdjustmentPriceService orderGoodsAdjustmentPriceService;
@ApiOperation(value = "提交货单", notes = "<br>By:胡宇帆")
@PostMapping("/saveGoodsOrder")
@UnitCovert(result = false)
......@@ -197,4 +193,35 @@ public class GoodsOrderController {
}
@ApiOperation(value = "司机运费列表", notes = "<br>By:刘海泉")
@GetMapping("/getDriverFreightPriceList")
@UnitCovert(param = false)
public Result<List<DriverFreightPriceVO>> getDriverFreightPriceList(@RequestParam(value = "orderNo")
@NotBlank(message = "订单编号不能为空") String orderNo) {
List<DriverFreightPriceVO> list = orderGoodsService.getDriverFreightPriceList(orderNo);
return Result.ok(list);
}
@ApiOperation(value = "订单下挂单时间列表", notes = "<br>By:刘海泉")
@GetMapping("/getOrderGoodsPendingList")
public Result<List<OrderGoodsPendingVO>> getOrderGoodsPendingList(@RequestParam(value = "orderNo")
@NotBlank(message = "订单编号不能为空") String orderNo) {
List<OrderGoodsPendingVO> list = orderGoodsService.getOrderGoodsPendingList(orderNo);
return Result.ok(list);
}
@ApiOperation(value = "司机运费记录柱形图", notes = "<br>By:刘海泉")
@GetMapping("/getDriverFreightPriceChart")
@UnitCovert(param = false)
public Result<List<DriverFreightPriceChartVO>> getDriverFreightPriceChart(@RequestParam(value = "orderNo")
@NotBlank(message = "订单编号不能为空") String orderNo) {
List<DriverFreightPriceChartVO> list = orderGoodsAdjustmentPriceService.getDriverFreightPriceChart(orderNo);
return Result.ok(list);
}
}
performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
浏览文件 @ 9c921dee
......@@ -204,4 +204,8 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
List<CancelOrderGoodsWeightDTO> statisticsCancelOrderGoodsWeight(List<String> childNos);
List<OrderChild> listBeforeUnloadOrderChild(LocalDateTime startTime,LocalDateTime endTime);
List<OrderChild> listBeforeCompleteByOrderNo(String orderNo);
List<OrderChild> listCompleteByOrderNos(List<String> strings);
}
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsAdjustmentPriceDao.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.dao;
import com.msl.common.dao.BaseDao;
import com.clx.performance.mapper.OrderGoodsAdjustmentPriceMapper;
import com.clx.performance.model.OrderGoodsAdjustmentPrice;
import java.util.List;
/**
* @author kavin
* Date 2024-07-18
* Time 17:04
*/
public interface OrderGoodsAdjustmentPriceDao extends BaseDao<OrderGoodsAdjustmentPriceMapper, OrderGoodsAdjustmentPrice, Integer> {
List<OrderGoodsAdjustmentPrice> selectByOrderNoList(List<String> orderNoList);
}
performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
浏览文件 @ 9c921dee
......@@ -108,4 +108,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
void batchCancel(List<Integer> idList);
void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight);
List<OrderGoods> listAfterCreatedByOrderNo(String orderNo);
}
performance-web/src/main/java/com/clx/performance/dao/PerformanceProgressDao.java
浏览文件 @ 9c921dee
......@@ -16,5 +16,7 @@ import java.util.List;
public interface PerformanceProgressDao extends BaseDao<PerformanceProgressMapper, PerformanceProgress, Integer> {
IPage<PerformanceProgress> pagePerformanceProgress(List<Integer> statusList, PagePerformanceProgress param);
void updateRecordOrder(Integer seq,boolean isUp);
void updateRecordOrder(Long seq,boolean isUp);
long getMaxSeq();
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
浏览文件 @ 9c921dee
......@@ -668,4 +668,20 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
.le(OrderChild :: getCreateTime,endTime)
);
}
@Override
public List<OrderChild> listBeforeCompleteByOrderNo(String orderNo) {
return list(lQrWrapper()
.eq(OrderChild :: getOrderNo,orderNo)
.le(OrderChild :: getStatus,OrderChildEnum.Status.COMPLETE.getCode())
);
}
@Override
public List<OrderChild> listCompleteByOrderNos(List<String> orderNoList) {
return list(lQrWrapper()
.in(OrderChild :: getOrderNo,orderNoList)
.le(OrderChild :: getStatus,OrderChildEnum.Status.COMPLETE.getCode())
);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsAdjustmentPriceDaoImpl.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.dao.impl;
import com.clx.performance.dao.OrderGoodsAdjustmentPriceDao;
import com.clx.performance.mapper.OrderGoodsAdjustmentPriceMapper;
import com.clx.performance.model.OrderGoodsAdjustmentPrice;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author kavin
* Date 2024-07-18
* Time 17:04
*/
@Repository
public class OrderGoodsAdjustmentPriceDaoImpl extends BaseDaoImpl<OrderGoodsAdjustmentPriceMapper, OrderGoodsAdjustmentPrice, Integer> implements OrderGoodsAdjustmentPriceDao {
@Override
public List<OrderGoodsAdjustmentPrice> selectByOrderNoList(List<String> orderNoList) {
return baseMapper.selectList(lQrWrapper().in(OrderGoodsAdjustmentPrice::getOrderNo, orderNoList)
.orderByAsc(OrderGoodsAdjustmentPrice :: getCreateTime)
);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
浏览文件 @ 9c921dee
......@@ -305,4 +305,13 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
public void batchCancelOrderGoods(List<CancelOrderGoodsWeightDTO> cancelOrderGoodsWeight) {
baseMapper.batchCancelOrderGoods(cancelOrderGoodsWeight);
}
@Override
public List<OrderGoods> listAfterCreatedByOrderNo(String orderNo) {
return baseMapper.selectList(lQrWrapper().eq(OrderGoods::getOrderNo, orderNo)
.ne(OrderGoods::getOrderGoodsStatus,OrderGoodsStatusEnum.Status.CREATED.getCode())
.orderByDesc(OrderGoods :: getPendingOrderTime)
);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/PerformanceProgressDaoImpl.java
浏览文件 @ 9c921dee
......@@ -31,7 +31,7 @@ public class PerformanceProgressDaoImpl extends BaseDaoImpl<PerformanceProgressM
}
@Override
public void updateRecordOrder(Integer seq,boolean isUp) {
public void updateRecordOrder(Long seq,boolean isUp) {
LambdaUpdateWrapper<PerformanceProgress> update = new LambdaUpdateWrapper<>();
if(isUp){
update.gt(PerformanceProgress :: getSeq,seq);
......@@ -41,4 +41,10 @@ public class PerformanceProgressDaoImpl extends BaseDaoImpl<PerformanceProgressM
update.setSql("seq = seq + 1");
baseMapper.update(null,update);
}
@Override
public long getMaxSeq() {
LambdaQueryWrapper<PerformanceProgress> query = new LambdaQueryWrapper<>();
return baseMapper.selectCount(query);
}
}
performance-web/src/main/java/com/clx/performance/extranal/user/AddressService.java
浏览文件 @ 9c921dee
package com.clx.performance.extranal.user;
import com.clx.order.vo.feign.FeignAddressVO;
import com.clx.order.vo.feign.SystemAddressVO;
import com.msl.common.base.Optional;
public interface AddressService {
Optional<FeignAddressVO> getSendAndReceiveAddress(Integer sendAddressId, Integer receiveAddressId);
Optional<SystemAddressVO> getSystemAddress(Integer addressId);
}
performance-web/src/main/java/com/clx/performance/extranal/user/OrderService.java
浏览文件 @ 9c921dee
......@@ -4,8 +4,14 @@ import com.clx.order.vo.feign.FeignOrderInfoVO;
import com.msl.common.base.Optional;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
public interface OrderService {
Optional<FeignOrderInfoVO> getOrderInfo(@RequestParam String orderNo);
Optional<List<String>> getMonthSameLineOrderList(String orderNo);
}
performance-web/src/main/java/com/clx/performance/extranal/user/impl/AddressServiceImpl.java
浏览文件 @ 9c921dee
......@@ -2,6 +2,7 @@ package com.clx.performance.extranal.user.impl;
import com.clx.order.feign.AddressFeign;
import com.clx.order.vo.feign.FeignAddressVO;
import com.clx.order.vo.feign.SystemAddressVO;
import com.clx.performance.extranal.user.AddressService;
import com.msl.common.base.Optional;
import com.msl.common.result.Result;
......@@ -22,4 +23,10 @@ public class AddressServiceImpl implements AddressService {
.map(Result::getData);
}
@Override
public Optional<SystemAddressVO> getSystemAddress(Integer addressId) {
return Optional.ofNullable(addressFeign.getSystemAddress(addressId))
.filter(Result::succeed)
.map(Result::getData);
}
}
performance-web/src/main/java/com/clx/performance/extranal/user/impl/OrderServiceImpl.java
浏览文件 @ 9c921dee
......@@ -9,6 +9,8 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
@Slf4j
@AllArgsConstructor
......@@ -22,4 +24,11 @@ public class OrderServiceImpl implements OrderService {
.filter(Result::succeed)
.map(Result::getData);
}
@Override
public Optional<List<String>> getMonthSameLineOrderList(String orderNo) {
return Optional.ofNullable(orderFeign.getMonthSameLineOrderList(orderNo))
.filter(Result::succeed)
.map(Result::getData);
}
}
performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
浏览文件 @ 9c921dee
......@@ -11,6 +11,7 @@ import com.clx.order.enums.OrderEnum;
import com.clx.order.enums.SyncPlatformEnum;
import com.clx.order.feign.OrderFeign;
import com.clx.order.vo.feign.FeignOrderVO;
import com.clx.performance.common.MqWrapper;
import com.clx.performance.config.ThirdAppConfig;
import com.clx.performance.constant.RabbitKeyConstants;
import com.clx.performance.dao.OrderChildImageDao;
......@@ -24,6 +25,7 @@ import com.clx.performance.model.OrderChild;
import com.clx.performance.model.OrderChildImage;
import com.clx.performance.service.LastTruckService;
import com.clx.user.feign.TruckFeign;
import com.clx.performance.struct.OrderChildStruct;
import com.clx.user.vo.feign.FeignDriverTruckModelVo;
import com.clx.user.vo.feign.TruckInfoFeignVo;
import com.msl.common.enums.ResultCodeEnum;
......@@ -34,7 +36,9 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageBuilder;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;
......@@ -43,6 +47,8 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
import static com.clx.performance.constant.RabbitKeyConstants.*;
@Slf4j
@Component
@AllArgsConstructor
......@@ -55,6 +61,8 @@ public class OrderChildDtsListener {
private final TruckFeign truckFeign;
private final OrderChildImageDao orderChildImageDao;
private final OrderChildStruct orderChildStruct;
private final RabbitTemplate rabbitTemplate;
@RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_CHILD_QUEUE)
......@@ -65,8 +73,8 @@ public class OrderChildDtsListener {
DataTransportDTO dataTransportDTO = JSON.parseObject(msg, DataTransportDTO.class);
log.info("DTS消息同步开始, database:clx_performance.order_child, 实体:{}", dataTransportDTO);
log.info("操作类型：{}",dataTransportDTO.getOperationType().getCode());
OrderChildMessage before = DtsMapConvertUtil.convert(dataTransportDTO.getBeforeMap(), new OrderChildMessage());
OrderChildMessage after = DtsMapConvertUtil.convert(dataTransportDTO.getAfterMap(), new OrderChildMessage());
OrderChild before = DtsMapConvertUtil.convert(dataTransportDTO.getBeforeMap(), new OrderChild());
OrderChild after = DtsMapConvertUtil.convert(dataTransportDTO.getAfterMap(), new OrderChild());
thirdpartySync(DtsMapConvertUtil.convert(dataTransportDTO.getAfterMap(), new OrderChildSyncMessage()));
......@@ -76,6 +84,7 @@ public class OrderChildDtsListener {
if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) && !Objects.equals(before.getStatus(),after.getStatus())){
orderChildChangeAfter(after);
}
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
}else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
log.info("修改:{}",after);
if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) &&
......@@ -91,6 +100,7 @@ public class OrderChildDtsListener {
log.info("DTS运单取消释放借款冻结金额");
applicationEventPublisher.publishEvent(new OrderChildCancelEvent(this, after.getChildNo()));
}
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
}else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
//数据删除
......@@ -102,12 +112,15 @@ public class OrderChildDtsListener {
}
}
public void orderChildChangeAfter(OrderChildMessage after){
FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(after.getOrderNo());
public void orderChildChangeAfter(OrderChild orderChild){
FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderChild.getOrderNo());
if (orderInfoFeign == null) {
return;
}
OrderChildMessage after = orderChildStruct.convertMessage(orderChild);
//同步交易平台的运单
if(Objects.equals(orderInfoFeign.getOrderSource(), SyncPlatformEnum.Source.TRADE_PLATFORM.getCode())){
......@@ -249,4 +262,26 @@ public class OrderChildDtsListener {
}
//同步履约进度表-----运单部分
public void syncPerformanceProgress(OrderChild before,OrderChild after, Integer updateType){
boolean isSend = false;
if(Objects.equals(updateType,DtsOperationTypeEnum.INSERT.getCode())){
isSend = true;
}
if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode()) &&
(!Objects.equals(before.getStatus(),after.getStatus()) ||
!Objects.equals(before.getLoadNet(),after.getLoadNet())) ||
!Objects.equals(before.getUnloadNet(),after.getUnloadNet())
){
isSend = true;
}
if(isSend){
log.info("开始发送同步履约进度表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
rabbitTemplate.send(SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_EXCHANGE,
SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_ROUTING_KEY, body);
log.info("结束发送同步履约进度表消息,订单号:{},运单号:{}", after.getOrderNo(),after.getChildNo());
}
}
}
performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDtsListener.java
浏览文件 @ 9c921dee
......@@ -3,6 +3,7 @@ package com.clx.performance.listener;
import com.alibaba.fastjson.JSON;
import com.clx.order.enums.UpdateEnum;
import com.clx.order.enums.VehicleUsageEnum;
import com.clx.performance.common.MqWrapper;
import com.clx.performance.component.GoodsOrderTruckRecordComponent;
import com.clx.performance.component.OrderCancelComponent;
import com.clx.performance.constant.RabbitKeyConstants;
......@@ -11,18 +12,24 @@ import com.clx.performance.dto.dts.DataTransportDTO;
import com.clx.performance.enums.DtsOperationTypeEnum;
import com.clx.performance.enums.OrderGoodsLogsEnum;
import com.clx.performance.enums.OrderGoodsPendingOrderWayStatusEnum;
import com.clx.performance.enums.OrderGoodsStatusEnum;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.model.OrderGoodsAdjustmentPrice;
import com.clx.performance.service.OrderGoodsLogService;
import com.msl.common.utils.DtsMapConvertUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageBuilder;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.Objects;
import static com.clx.performance.constant.RabbitKeyConstants.*;
@Slf4j
@Component
@AllArgsConstructor
......@@ -32,7 +39,7 @@ public class OrderGoodsDtsListener {
private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
private final OrderGoodsDao orderGoodsDao;
private final OrderGoodsLogService orderGoodsLogService;
private final RabbitTemplate rabbitTemplate;
@RabbitListener(queues = RabbitKeyConstants.CLX_PERFORMANCE_ORDER_GOODS_QUEUE)
......@@ -46,9 +53,11 @@ public class OrderGoodsDtsListener {
if(Objects.equals(DtsOperationTypeEnum.INSERT.getCode(),dataTransportDTO.getOperationType().getCode())){
//同步after数据
log.info("新增:{}",JSON.toJSONString(after));
syncPerformanceProgress(before,after,DtsOperationTypeEnum.INSERT.getCode());
}else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
log.info("修改:{}",JSON.toJSONString(after));
backFillOrderWeight(after);
syncPerformanceProgress(before,after,DtsOperationTypeEnum.UPDATE.getCode());
}else if(Objects.equals(DtsOperationTypeEnum.DELETE.getCode(),dataTransportDTO.getOperationType().getCode())){
//数据删除
log.info("删除:{}",JSON.toJSONString(before));
......@@ -82,4 +91,65 @@ public class OrderGoodsDtsListener {
after.getOrderNo(),after.getOrderGoodsNo(),after.getResidueTransportWeight());
}
}
public void syncPerformanceProgress(OrderGoods before,OrderGoods after, Integer updateType) {
boolean isSend = false;
if(after.getOrderGoodsStatus() > OrderGoodsStatusEnum.Status.PAYING.getCode()){
if(Objects.equals(updateType,DtsOperationTypeEnum.INSERT.getCode())){
isSend = true;
}
if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode())
&& (!Objects.equals(before.getSeniorLogisticsManagerId(),after.getSeniorLogisticsManagerId())
|| !Objects.equals(before.getPendingOrderFreight(),after.getPendingOrderFreight())
)){
isSend = true;
}
if(isSend){
log.info("开始发送同步履约进度表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(after)).getBytes()).build();
rabbitTemplate.send(SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_EXCHANGE,
SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_ROUTING_KEY, body);
log.info("结束发送同步履约进度表消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
}
}
}
//保存货单调价记录
public void sendSaveOrderGoodsAdjustmentPriceMessage(OrderGoods before,OrderGoods after, Integer updateType){
boolean isSend = false;
//插入的货单是挂单中状态的
if(Objects.equals(updateType,DtsOperationTypeEnum.INSERT.getCode()) &&
Objects.equals(after.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.PAYING.getCode())){
isSend = true;
}
//货单状态发生变化(从已挂单变成挂单中) || 挂单中状态的挂单运费发生变化
if(Objects.equals(updateType,DtsOperationTypeEnum.UPDATE.getCode()) &&
//货单状态发生变化(从已挂单变成挂单中)
(
(Objects.equals(before.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CREATED.getCode()) &&
Objects.equals(before.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.PAYING.getCode()))
|| //挂单中之后的状态的挂单运费发生变化
(after.getOrderGoodsStatus() >= OrderGoodsStatusEnum.Status.PAYING.getCode() &&
!Objects.equals(before.getPendingOrderFreight(),after.getPendingOrderFreight()))
)
){
isSend = true;
}
if(isSend){
log.info("开始发送货单调整挂单运费消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
OrderGoodsAdjustmentPrice message = new OrderGoodsAdjustmentPrice();
message.setOrderNo(after.getOrderNo());
message.setOrderGoodsNo(after.getOrderGoodsNo());
message.setAmount(after.getPendingOrderFreight());
message.setPreAmount(Objects.nonNull(before) ? before.getPendingOrderFreight() : BigDecimal.ZERO);
Message body = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(message)).getBytes()).build();
rabbitTemplate.send(SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_EXCHANGE,
SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_ROUTING_KEY, body);
log.info("结束发送货单调整挂单运费消息,订单号:{},货单号:{}", after.getOrderNo(),after.getOrderGoodsNo());
}
}
}
performance-web/src/main/java/com/clx/performance/listener/SaveOrderGoodsAdjustmentPriceListener.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.listener;
import cn.hutool.json.JSONUtil;
import com.clx.performance.constant.RabbitKeyConstants;
import com.clx.performance.model.OrderGoodsAdjustmentPrice;
import com.clx.performance.service.OrderGoodsAdjustmentPriceService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
/**
* 处理货单取消吨数回填
*/
@Slf4j
@Component
@AllArgsConstructor
public class SaveOrderGoodsAdjustmentPriceListener {
private final OrderGoodsAdjustmentPriceService orderGoodsAdjustmentPriceService;
@RabbitListener(queues = RabbitKeyConstants.SAVE_ORDER_GOODS_ADJUSTMENT_PRICE_QUEUE)
public void onMessage(String message) {
log.info("监听到保存货单挂单运费调整记录,消息内容{}", message);
OrderGoodsAdjustmentPrice data = JSONUtil.toBean(message, OrderGoodsAdjustmentPrice.class);
orderGoodsAdjustmentPriceService.saveOrderGoodsAdjustmentPrice(data);
}
}
performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderChildListener.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.listener;
import cn.hutool.json.JSONUtil;
import com.clx.performance.constant.RabbitKeyConstants;
import com.clx.performance.model.OrderChild;
import com.clx.performance.service.PerformanceProgressService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
/**
* 处理货单取消吨数回填
*/
@Slf4j
@Component
@AllArgsConstructor
public class SyncPerformanceProgress4OrderChildListener {
private final PerformanceProgressService performanceProgressService;
@RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_CHILD_QUEUE)
public void onMessage(String message) {
log.info("监听到同步履约进度表---运单信息部分,消息内容{}", message);
OrderChild data = JSONUtil.toBean(message, OrderChild.class);
performanceProgressService.dealPerformanceProgress4OrderChild(data);
}
}
performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderGoodsListener.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.listener;
import cn.hutool.json.JSONUtil;
import com.clx.performance.constant.RabbitKeyConstants;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.service.PerformanceProgressService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
/**
* 处理货单取消吨数回填
*/
@Slf4j
@Component
@AllArgsConstructor
public class SyncPerformanceProgress4OrderGoodsListener {
private final PerformanceProgressService performanceProgressService;
@RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_GOODS_QUEUE)
public void onMessage(String message) {
log.info("监听到同步履约进度表---货单信息部分,消息内容{}", message);
OrderGoods data = JSONUtil.toBean(message, OrderGoods.class);
performanceProgressService.dealPerformanceProgress4OrderGoods(data);
}
}
performance-web/src/main/java/com/clx/performance/listener/SyncPerformanceProgress4OrderInfoListener.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.listener;
import cn.hutool.json.JSONUtil;
import com.clx.open.sdk.callback.message.OrderInfoMessage;
import com.clx.performance.constant.RabbitKeyConstants;
import com.clx.performance.service.PerformanceProgressService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
/**
* 处理货单取消吨数回填
*/
@Slf4j
@Component
@AllArgsConstructor
public class SyncPerformanceProgress4OrderInfoListener {
private final PerformanceProgressService performanceProgressService;
@RabbitListener(queues = RabbitKeyConstants.SYNC_PERFORMANCE_PROGRESS_FOR_ORDER_INFO_QUEUE)
public void onMessage(String message) {
log.info("监听到同步履约进度表---订单信息部分,消息内容{}", message);
OrderInfoMessage data = JSONUtil.toBean(message, OrderInfoMessage.class);
performanceProgressService.dealPerformanceProgress4OrderInfo(data);
}
}
performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsAdjustmentPriceMapper.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.clx.performance.model.OrderGoodsAdjustmentPrice;
/**
* @author kavin
* Date 2024-07-18
* Time 17:04
*/
public interface OrderGoodsAdjustmentPriceMapper extends BaseMapper<OrderGoodsAdjustmentPrice> {
}
performance-web/src/main/java/com/clx/performance/model/OrderGoodsAdjustmentPrice.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.msl.common.config.KeyColumn;
import com.msl.common.model.HasKey;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @author kavin
* Date 2024-07-18
* Time 17:04
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName("order_goods_adjustment_price")
public class OrderGoodsAdjustmentPrice implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("order_no")
@ApiModelProperty("订单编号")
private String orderNo;
@TableField("order_goods_no")
@ApiModelProperty("货单编码")
private String orderGoodsNo;
@TableField("pre_amount")
@ApiModelProperty("上次金额 ")
private BigDecimal preAmount;
@TableField("amount")
@ApiModelProperty("本次调价金额")
private BigDecimal amount;
@TableField("create_time")
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@Override
@KeyColumn("id")
public Integer gainKey() {
return this.id;
}
}
performance-web/src/main/java/com/clx/performance/model/PerformanceProgress.java
浏览文件 @ 9c921dee
......@@ -30,7 +30,7 @@ public class PerformanceProgress implements HasKey<Integer> {
@TableField("seq")
@ApiModelProperty("排序")
private Integer seq;
private Long seq;
@TableField("order_no")
@ApiModelProperty("订单编号")
......@@ -92,9 +92,6 @@ public class PerformanceProgress implements HasKey<Integer> {
@ApiModelProperty("任务吨数")
private BigDecimal taskWeight;
@TableField("transport_weight")
@ApiModelProperty("任务吨数")
private BigDecimal transportWeight;
@TableField("pending_weight")
@ApiModelProperty("挂单吨数")
......
performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
浏览文件 @ 9c921dee
......@@ -106,4 +106,6 @@ public interface OrderChildService {
List<OrderChildExpectDTO> getOrderChildExpect(String orderChildNo);
void cacheOrderChildExpectData(String childNo, OrderChildExpectDTO expect);
List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo);
}
performance-web/src/main/java/com/clx/performance/service/OrderGoodsAdjustmentPriceService.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.service;
import com.clx.performance.model.OrderGoodsAdjustmentPrice;
import com.clx.performance.vo.pc.DriverFreightPriceChartVO;
import java.math.BigDecimal;
import java.util.List;
/**
* @author kavin
* Date 2024-07-18
* Time 17:04
*/
public interface OrderGoodsAdjustmentPriceService {
void saveOrderGoodsAdjustmentPrice(OrderGoodsAdjustmentPrice item);
List<DriverFreightPriceChartVO> getDriverFreightPriceChart(String orderNo);
List<DriverFreightPriceChartVO> getAdjacentPosDuplicateRemoveAdjustmentPriceRecord(List<String> orderNoList);
List<BigDecimal> getNoRepeatAdjustmentPriceRecord(List<String> orderNoList);
}
performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
浏览文件 @ 9c921dee
......@@ -11,7 +11,9 @@ import com.clx.performance.param.pc.*;
import com.clx.performance.vo.app.OrderGoodsAPPVO;
import com.clx.performance.vo.feign.FreightEstimateVO;
import com.clx.performance.vo.feign.OrderGoodsFeignVO;
import com.clx.performance.vo.pc.DriverFreightPriceVO;
import com.clx.performance.vo.pc.OrderGoodsEditVO;
import com.clx.performance.vo.pc.OrderGoodsPendingVO;
import com.clx.performance.vo.pc.OrderGoodsVO;
import java.math.BigDecimal;
......@@ -108,4 +110,8 @@ public interface OrderGoodsService {
void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
BigDecimal cancelOrderGoods(CancelOrderGoodsParam param);
List<DriverFreightPriceVO> getDriverFreightPriceList(String orderNo);
List<OrderGoodsPendingVO> getOrderGoodsPendingList(String orderNo);
}
performance-web/src/main/java/com/clx/performance/service/PerformanceProgressService.java
浏览文件 @ 9c921dee
package com.clx.performance.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.open.sdk.callback.message.OrderInfoMessage;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.model.PerformanceProgress;
import com.clx.performance.param.pc.carrier.PagePerformanceProgress;
import com.clx.performance.param.pc.carrier.UpdatePerformanceProgressParam;
......@@ -28,4 +31,12 @@ public interface PerformanceProgressService {
PerformanceProgressDetailVO getPerformanceProgressDetail(Integer id);
List<PerformanceProgressOperationLogVO> getOperationLog(String orderNo);
void dealPerformanceProgress4OrderInfo(OrderInfoMessage data);
void dealPerformanceProgress4OrderGoods(OrderGoods data);
void dealPerformanceProgress4OrderChild(OrderChild data);
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @ 9c921dee
......@@ -4,10 +4,9 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.order.enums.InvoicingCompanyEnum;
import com.clx.order.enums.OrderEnum;
import com.clx.order.enums.QuotationEnum;
import com.clx.order.enums.VehicleUsageEnum;
import com.clx.order.enums.ResultEnum;
import com.clx.order.enums.*;
import com.clx.order.feign.OrderFeign;
import com.clx.order.vo.feign.FeignAddressVO;
import com.clx.order.vo.feign.FeignOrderInfoVO;
......@@ -218,6 +217,9 @@ public class OrderChildServiceImpl implements OrderChildService {
private OcrRecognitionDao ocrRecognitionDao;
@Autowired
OrderGoodsAdjustmentPriceService orderGoodsAdjustmentPriceService;
@Override
public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
......@@ -2821,4 +2823,45 @@ public class OrderChildServiceImpl implements OrderChildService {
});
}
}
@Override
public List<HistoryLineTranVolumeChartVO> getHistoryLineTransportVolume(String orderNo) {
//查询近一个月与该订单收发货地线路一致的订单
Optional<List<String>> result = orderService.getMonthSameLineOrderList(orderNo);
if(!result.isPresent()){
log.warn("通过订单号：{} 查找相同线路的订单列列表，返回结果：{}",orderNo,result);
throw new ServiceSystemException(ResultEnum.DATA_ERROR,"获取相同线路的订单列表失败");
}
List<BigDecimal> priceList = orderGoodsAdjustmentPriceService.getNoRepeatAdjustmentPriceRecord(result.get());
List<HistoryLineTranVolumeChartVO> charts = new ArrayList<>();
if(CollectionUtils.isEmpty(priceList)){
return charts;
}
//查询相同路线的订单下的所有运单
List<OrderChild> childs = orderChildDao.listCompleteByOrderNos(result.get());
if(CollectionUtils.isEmpty(childs)){
priceList.forEach(item-> charts.add(HistoryLineTranVolumeChartVO.builder()
.pendingOrderFreight(item).number(0).build()));
return charts;
}
LinkedHashMap<BigDecimal,Integer> priceMap =
priceList.stream().collect(Collectors.toMap(item->item,item->0,
(existing, replacement) -> existing, // 如果有冲突的键，则保留现有的键
LinkedHashMap::new));
//进行相同路线运费拉运单数统计
childs.forEach(item->{
if(priceMap.containsKey(item.getFreightPrice())){
priceMap.put(item.getFreightPrice(),priceMap.get(item.getFreightPrice()) + 1);
}
});
for (Map.Entry<BigDecimal, Integer> entry : priceMap.entrySet()) {
charts.add(HistoryLineTranVolumeChartVO.builder().pendingOrderFreight(entry.getKey()).number(
entry.getValue()).build());
}
return charts;
}
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsAdjustmentPriceServiceImpl.java 0 → 100644
浏览文件 @ 9c921dee
package com.clx.performance.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.clx.order.enums.ResultEnum;
import com.clx.order.feign.OrderFeign;
import com.clx.performance.dao.OrderGoodsAdjustmentPriceDao;
import com.clx.performance.extranal.user.OrderService;
import com.clx.performance.model.OrderGoodsAdjustmentPrice;
import com.clx.performance.service.OrderGoodsAdjustmentPriceService;
import com.clx.performance.vo.pc.DriverFreightPriceChartVO;
import com.msl.common.base.Optional;
import com.msl.common.exception.ServiceSystemException;
import com.msl.common.utils.DateUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* @author kavin
* Date 2024-07-18
* Time 17:04
*/
@Service
@Slf4j
@AllArgsConstructor
public class OrderGoodsAdjustmentPriceServiceImpl implements OrderGoodsAdjustmentPriceService {
private final OrderGoodsAdjustmentPriceDao orderGoodsAdjustmentPriceDao;
private final OrderFeign orderFeign;
private final OrderService orderService;
@Transactional(rollbackFor = Exception.class)
@Override
public void saveOrderGoodsAdjustmentPrice(OrderGoodsAdjustmentPrice item){
orderGoodsAdjustmentPriceDao.saveEntity(item);
}
@Override
public List<DriverFreightPriceChartVO> getDriverFreightPriceChart(String orderNo) {
//查询近一个月与该订单收发货地线路一致的订单
Optional<List<String>> result = orderService.getMonthSameLineOrderList(orderNo);
if(!result.isPresent()){
log.warn("通过订单号：{} 查找相同线路的订单列列表，返回结果：{}",orderNo,result);
throw new ServiceSystemException(ResultEnum.DATA_ERROR,"获取相同线路的订单列表失败");
}
//相邻位置相同则取同一条
return this.getAdjacentPosDuplicateRemoveAdjustmentPriceRecord(result.get());
}
@Override
public List<DriverFreightPriceChartVO> getAdjacentPosDuplicateRemoveAdjustmentPriceRecord(List<String> orderNoList){
List<OrderGoodsAdjustmentPrice> list = orderGoodsAdjustmentPriceDao.selectByOrderNoList(orderNoList);
List<DriverFreightPriceChartVO> chartResult = new ArrayList<>();
//相邻的多条记录调价相同，则保留一条，不相同则生成新的一条
if(CollectionUtil.isNotEmpty(list)){
DriverFreightPriceChartVO chart;
BigDecimal preAdjustmentPrice = BigDecimal.ZERO;
for (OrderGoodsAdjustmentPrice item : list) {
//上次的价格和本次的价格发生了变化
if(preAdjustmentPrice.compareTo(item.getAmount()) != 0){
chart = new DriverFreightPriceChartVO();
chart.setPendingOrderFreight(item.getAmount());
chart.setCreatTime(DateUtils.formatDateTime(item.getCreateTime()).get());
chartResult.add(chart);
preAdjustmentPrice = item.getAmount();
}
}
}
return chartResult;
}
@Override
public List<BigDecimal> getNoRepeatAdjustmentPriceRecord(List<String> orderNoList){
List<OrderGoodsAdjustmentPrice> list = orderGoodsAdjustmentPriceDao.selectByOrderNoList(orderNoList);
List<BigDecimal> chartResult = new ArrayList<>();
//相邻的多条记录调价相同，则保留一条，不相同则生成新的一条
if(CollectionUtil.isNotEmpty(list)){
for (OrderGoodsAdjustmentPrice item : list) {
//去重操作
if(!chartResult.contains(item.getAmount())){
chartResult.add(item.getAmount());
}
}
}
return chartResult;
}
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
浏览文件 @ 9c921dee
......@@ -40,11 +40,12 @@ import com.clx.performance.vo.app.OrderGoodsAPPVO;
import com.clx.performance.vo.feign.FreightEstimateVO;
import com.clx.performance.vo.feign.OrderGoodsFeignVO;
import com.clx.performance.vo.mq.OrderTruckBindCancelParam;
import com.clx.performance.vo.pc.DriverFreightPriceVO;
import com.clx.performance.vo.pc.OrderGoodsEditVO;
import com.clx.performance.vo.pc.OrderGoodsPendingVO;
import com.clx.performance.vo.pc.OrderGoodsVO;
import com.clx.user.enums.driver.DriverInfoEnum;
import com.clx.user.feign.UserClxFeign;
import com.github.mustachejava.ObjectHandler;
import com.msl.common.base.Optional;
import com.msl.common.enums.ResultCodeEnum;
import com.msl.common.exception.ServiceSystemException;
......@@ -1066,4 +1067,19 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
return totalCancelWeight;
}
@Override
public List<DriverFreightPriceVO> getDriverFreightPriceList(String orderNo) {
List<OrderGoods> orderGoods = orderGoodsDao.listAfterCreatedByOrderNo(orderNo);
return orderGoodsStruct.convertDriverFreightList(orderGoods);
}
@Override
public List<OrderGoodsPendingVO> getOrderGoodsPendingList(String orderNo) {
List<OrderGoods> orderGoods = orderGoodsDao.listAfterCreatedByOrderNo(orderNo);
//升序排序
List<OrderGoods> sort = orderGoods.stream().sorted(Comparator.comparing(OrderGoods::getPendingOrderTime))
.collect(Collectors.toList());
return orderGoodsStruct.convertOrderGoodsPendingList(sort);
}
}
performance-web/src/main/java/com/clx/performance/struct/OrderGoodsStruct.java
浏览文件 @ 9c921dee
......@@ -2,6 +2,8 @@ package com.clx.performance.struct;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.vo.feign.OrderGoodsFeignVO;
import com.clx.performance.vo.pc.DriverFreightPriceVO;
import com.clx.performance.vo.pc.OrderGoodsPendingVO;
import com.clx.performance.vo.pc.OrderGoodsVO;
import com.clx.performance.vo.pc.linewarn.LineWarnTraceVO;
import com.msl.common.utils.DateStructUtil;
......@@ -23,4 +25,9 @@ public interface OrderGoodsStruct {
@Mapping(target = "receiveAddress", source = "receiveAddressShorter")
LineWarnTraceVO convertLineWarnTraceVO(OrderGoods item);
List<DriverFreightPriceVO> convertDriverFreightList(List<OrderGoods> orderGoods);
List<OrderGoodsPendingVO> convertOrderGoodsPendingList(List<OrderGoods> orderGoods);
}
performance-web/src/main/java/com/clx/performance/struct/PerformanceProgressStruct.java
浏览文件 @ 9c921dee
......@@ -14,4 +14,5 @@ public interface PerformanceProgressStruct {
List<PerformanceProgressVO> convertList(List<PerformanceProgress> records);
PerformanceProgressDetailVO convert(PerformanceProgress item);
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论