|
@@ -54,12 +54,7 @@ public class OmsOrderController {
|
|
|
try {
|
|
|
boolean b = lock.tryLock(60, 60, TimeUnit.SECONDS);
|
|
|
if (b) {
|
|
|
- Map<String, String> delivery = orderService.delivery(deliveryParamList);
|
|
|
- if (delivery.isEmpty()) {
|
|
|
- return CommonResult.success(delivery);
|
|
|
- }else {
|
|
|
- return CommonResult.failed(ResultCode.FAILED,ResultCode.FAILED.getMessage(),delivery);
|
|
|
- }
|
|
|
+ return CommonResult.success(orderService.delivery(deliveryParamList));
|
|
|
}
|
|
|
} catch (InterruptedException e) {
|
|
|
log.error("批量发货异常", e);
|