|
|
@@ -145,8 +145,6 @@ public class OrderController {
|
|
|
Order order = orderService.getOne(new LambdaUpdateWrapper<Order>().eq(Order::getOrderNumber, deliveryOrderParam.getOrderNumber()));
|
|
|
if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.PADYED.value()) && Objects.equals(order.getDvyType(), DvyType.FETCH.value())) {
|
|
|
throw new GlobalException("订单不处于待入库状态，无法进行入库");
|
|
|
- } else if (!Objects.equals(order.getHbOrderStatus(), 1)) {
|
|
|
- throw new GlobalException("订单不处于待发货状态，无法进行发货");
|
|
|
}
|
|
|
|
|
|
List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(deliveryOrderParam.getOrderNumber());
|
|
|
@@ -184,8 +182,8 @@ public class OrderController {
|
|
|
UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
|
|
|
AppConnect connect = appConnectMapper.getByUserId(order.getUserId(), 1);
|
|
|
Delivery delivery = deliveryService.getById(deliveryOrderParam.getDvyId());
|
|
|
- CullenUtils.validateDataThrowException(connect==null,"openid不存在...");
|
|
|
- CullenUtils.validateDataThrowException(connect.getBizUserId()==null,"openid不存在...");
|
|
|
+ CullenUtils.validateDataThrowException(connect==null,"openid不存在..."+order.getUserId());
|
|
|
+ CullenUtils.validateDataThrowException(connect.getBizUserId()==null,"openid不存在..."+order.getUserId());
|
|
|
WxProviderServiceImpl.uploadShippingInfo(
|
|
|
deliveryOrderParam.getDvyFlowId(),
|
|
|
settlement.getBizPayNo(),
|
wangming