提交 98f806a5 authored 作者: huyufan's avatar huyufan

修改BUG

上级 b997e465
......@@ -92,4 +92,28 @@ public class RabbitBeanConfig {
}
@Bean
public Queue orderGoodsOnQueue() {
Map<String, Object> params = new HashMap<>(6);
params.put("x-dead-letter-exchange", RabbitKeyConstants.ORDER_GOODS_ON_DEAD_EXCHANGE);
params.put("x-dead-letter-routing-key", RabbitKeyConstants.ORDER_GOODS_ON_DEAD_ROUTE_KEY);
return new Queue(RabbitKeyConstants.ORDER_GOODS_ON_QUEUE, true, false, false, params);
}
/**
* 订单挂单中交换机
**/
@Bean
public DirectExchange orderGoodsOnExchange() {
return new DirectExchange(RabbitKeyConstants.ORDER_ON_EXCHANGE);
}
/**
* 订单挂单中绑定
*/
@Bean
public Binding orderGoodsOnExchangeBind() {
return BindingBuilder.bind(orderOnQueue()).to(orderOnExchange()).with(RabbitKeyConstants.ORDER_ON_ROUTE_KEY);
}
}
......@@ -37,4 +37,12 @@ public class RabbitKeyConstants {
//承运订单同步一部 需要手动创建对列交换机
public static final String CLX_PERFORMANCE_ORDER_CHILD_QUEUE = "clx_performance.order_child_queue";
public static final String ORDER_GOODS_ON_DEAD_ROUTE_KEY ="clx-order.order.goods.on.dead.route.key";
public static final String ORDER_GOODS_ON_QUEUE ="clx-order.order.goods.on.queue";
public static final String ORDER_GOODS_ON_DEAD_EXCHANGE ="clx-order.order.goods.on.dead.exchange";
public static final String ORDER_GOODSON_EXCHANGE ="clx-order.order.on.exchange";
}
......@@ -80,4 +80,10 @@ public class CarrierOrderChildController {
return Result.ok();
}
@ApiOperation(value = "业务信息", notes = "<br>By:胡宇帆")
@PostMapping("/orderChildBussInfo")
public Result<CarrierOrderChildDetailVO> getOrderChildBussInfo(@NotBlank(message = "车牌号不能为空") String truckNo) {
return Result.ok(orderChildService.getOrderChildBussInfo(truckNo));
}
}
......@@ -53,4 +53,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
int countValidByOrderGoodsNo(String orderGoodsNo);
Integer getOrderChildTotalByUserNo(Long userNo);
List<OrderChild> getOrderChildBussInfo(String truckNo);
}
......@@ -184,4 +184,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
return baseMapper.getOrderChildTotalByUserNo(userNo);
}
@Override
public List<OrderChild> getOrderChildBussInfo(String truckNo) {
return baseMapper.selectList(lambdaQuery().eq(OrderChild::getTruckNo, truckNo)
.eq(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE)
);
}
}
......@@ -61,4 +61,6 @@ public interface OrderChildService {
GoingOrderChildVO getGoingLatestOrderChild();
Integer getOrderChildTotalByUserNo(Long userNo);
CarrierOrderChildDetailVO getOrderChildBussInfo(String truckNo);
}
......@@ -1138,4 +1138,24 @@ public class OrderChildServiceImpl implements OrderChildService {
public Integer getOrderChildTotalByUserNo(Long userNo) {
return orderChildDao.getOrderChildTotalByUserNo(userNo);
}
@Override
public CarrierOrderChildDetailVO getOrderChildBussInfo(String truckNo) {
List<OrderChild> childList = orderChildDao.getOrderChildBussInfo(truckNo);
//运单完成数量
int totalSUm = childList.size();
//历史装车总理
BigDecimal old1 = childList.stream().map(OrderChild::getLoadNet).reduce(BigDecimal::add).get();
BigDecimal old2 = childList.stream().map(OrderChild::getUnloadNet).reduce(BigDecimal::add).get();
BigDecimal w = old2.subtract(old1).compareTo(BigDecimal.ZERO) < 0 ?BigDecimal.ZERO : old2.subtract(old1);
BigDecimal divide = w.divide(old1, 0, BigDecimal.ROUND_HALF_UP);
// orderChildDao.getOrderChildBussInfo(truckNo)
// return null;
return null;
}
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论