Merge remote-tracking branch 'origin/hjc' into hjc

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinAppZhengzaiServiceImpl.java

@@ -102,7 +102,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
             for (String orderId : orderIds) {
                 GoblinStoreOrderVo storeOrderVo = redisUtils.getGoblinOrder(orderId);
                 if (!storeInfoVo.getStoreId().equals(storeOrderVo.getStoreId())) {
-                    return ResponseDto.failure("店铺异常");
+                    continue;
                 }
                 if (storeOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_STATUS_0.getValue())) {
                     return ResponseDto.failure("出货失败，订单未支付");
@@ -153,7 +153,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
             for (String orderId : orderIds) {
                 GoblinStoreOrderVo storeOrderVo = redisUtils.getGoblinOrder(orderId);
                 if (!storeInfoVo.getStoreId().equals(storeOrderVo.getStoreId())) {
-                    return ResponseDto.failure("店铺异常");
+                    continue;
                 }
                 if (storeOrderVo.getStatus().equals(GoblinStatusConst.Status.ORDER_STATUS_0.getValue())) {
                     return ResponseDto.failure("订单未支付");