|
|
@@ -15,6 +15,7 @@ import com.qs.mp.common.exception.ServiceException;
|
|
|
import com.qs.mp.common.service.IDeliveryCompanyService;
|
|
|
import com.qs.mp.common.utils.DateUtils;
|
|
|
import com.qs.mp.common.utils.LogUtil;
|
|
|
+import com.qs.mp.common.utils.StringUtils;
|
|
|
import com.qs.mp.pay.domain.PayOrder;
|
|
|
import com.qs.mp.system.service.id.BizIdGenerator;
|
|
|
import com.qs.mp.user.domain.UserAddr;
|
|
|
@@ -316,7 +317,25 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
|
|
|
flag = false;
|
|
|
failContent = "物流公司不存在";
|
|
|
}
|
|
|
+ if (flag) {
|
|
|
+ if (StringUtils.isBlank(deliverOrderExcel.getDeliveryFlowId())) {
|
|
|
+ flag = false;
|
|
|
+ failContent = "物流单号不存在";
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+ if (flag) {
|
|
|
+ UserDeliverOrder userDeliverOrder = userDeliverOrderService.getById(deliverOrderExcel.getOrderId());
|
|
|
+ if (Objects.isNull(userDeliverOrder)) {
|
|
|
+ flag = false;
|
|
|
+ failContent = "订单不存在";
|
|
|
+ } else {
|
|
|
+ if (!DeliverOrderStatusEnum.NOT_DELIVER.equals(userDeliverOrder.getStatus())) {
|
|
|
+ flag = false;
|
|
|
+ failContent = "订单状态不为待发货";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
if (flag) {
|
|
|
// 校验订单信息
|
cup