|
|
@@ -391,7 +391,11 @@ public class TransportDubboServiceImpl implements TransportDubboService {
|
|
|
orderStatus.add(LogisticsOrderEnum.HAVE_RECONCILED.getCode());
|
|
|
// orderStatus.add(LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getCode());
|
|
|
List<String> logisticsNo = logisticsOrderMapper.checkLogisticsOrderIsFinishByEntId(consignEntId, acceptCarriageEntId, orderStatus);
|
|
|
- return HttpResult.ok(logisticsNo);
|
|
|
+ if (CollectionUtils.isNotEmpty(logisticsNo)){
|
|
|
+ return HttpResult.error("",logisticsNo);
|
|
|
+ }else {
|
|
|
+ return HttpResult.ok();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|