修改 pos

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

@@ -213,6 +213,9 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
         String marketId = param.getMarketId();
         String orderCode = param.getOrderCode();
         GoblinNowOrderListVo data = mongoUtils.getGoblinNowOrderDetailsVo(orderCode, storeId, marketId);
+        if(data==null){
+            return ResponseDto.failure("订单不存在");
+        }
         ResponseDto<GoblinAppOrderDetailsVo> responseVo = goblinOrderAppService.orderDetails(data.getOrderId(), data.getUid());
         return ResponseDto.success(responseVo.getData());
     }

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

@@ -1899,7 +1899,8 @@ public class GoblinMongoUtils {
 
     public List<GoblinNowOrderListVo> getGoblinNowOrderListVo(String orderCode, String storeId, String marketId, Integer pageNum) {
         int pageSize = 20;
-        Criteria criteria = Criteria.where("storeId").is(storeId).and("market_id").is("ZZ".concat(marketId)).orOperator(Criteria.where("paymentId").is(orderCode), Criteria.where("orderCode").regex("^.*" + orderCode + "$"));
+        Criteria criteria = Criteria.where("storeId").is(storeId).and("marketId").is("ZZ".concat(marketId))
+                .orOperator(Criteria.where("paymentId").is(orderCode), Criteria.where("orderCode").regex("^.*" + orderCode + "$"));
         Query query = Query.query(criteria);
         query.with(PageRequest.of(pageNum - 1, pageSize)).with(Sort.by(Sort.Order.desc("createdAt")));
         List<GoblinNowOrderListVo> list = mongoTemplate.find(query, GoblinNowOrderListVo.class, GoblinStoreOrderVo.class.getSimpleName());