提交 正在下单商铺 根据订单号查询订单列表

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNowOrderDetailsVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 商城订单表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinNowOrderDetailsVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = " 订单id")
+    private String orderId;
+    @ApiModelProperty(value = " 订单号")
+    private String orderCode;
+    @ApiModelProperty(value = "支付单号")
+    private String paymentId;
+    @ApiModelProperty(value = " 商户单号")
+    private String payCode;
+    @ApiModelProperty(value = " 支付方式")
+    private String payType;
+    @ApiModelProperty(value = " 订单金额")
+    private String priceActual;
+    @ApiModelProperty(value = " 支付时间")
+    private String payTime;
+
+    private static final GoblinNowOrderDetailsVo obj = new GoblinNowOrderDetailsVo();
+
+    public static GoblinNowOrderDetailsVo getNew() {
+        try {
+            return (GoblinNowOrderDetailsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinNowOrderDetailsVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNowOrderListVo.java

@@ -22,14 +22,16 @@ public class GoblinNowOrderListVo implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = " 订单id")
+    @ApiModelProperty(value = "订单id")
     private String orderId;
-    @ApiModelProperty(value = " 订单号")
+    @ApiModelProperty(value = "订单号")
     private String orderCode;
-    @ApiModelProperty(value = " 订单金额")
+    @ApiModelProperty(value = "订单金额")
     private String priceActual;
-    @ApiModelProperty(value = " 支付时间")
+    @ApiModelProperty(value = "支付时间")
     private String payTime;
+    @ApiModelProperty(value = "用户id")
+    private String uid;
 
     private static final GoblinNowOrderListVo obj = new GoblinNowOrderListVo();
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinStoreZhengzaiService.java

@@ -30,4 +30,6 @@ public interface IGoblinStoreZhengzaiService {
     ResponseDto<Boolean> orderPush(String orderMasterCode);
 
     ResponseDto<List<GoblinNowOrderListVo>> nowOrderList(GoblinNowOrderListParam param);
+
+    ResponseDto<GoblinAppOrderDetailsVo> nowOrderDetails(GoblinNowOrderListParam param);
 }

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

@@ -102,6 +102,12 @@ public class GoblinStoreZhengzaiController {
         return goblinStoreZhengzaiService.nowOrderList(param);
     }
 
+    @PostMapping("now/details")
+    @ApiOperation("pos根据订单号查询详情")
+    public ResponseDto<GoblinAppOrderDetailsVo> nowOrderDeatils(@RequestBody GoblinNowOrderListParam param) {
+        return goblinStoreZhengzaiService.nowOrderDetails(param);
+    }
+
 //    @PostMapping("paySuccess")
 //    @ApiOperation("汇付支付成功回调")
 //    @ResponseBody

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.param.GoblinNowOrderListParam;
+import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
 import com.liquidnet.service.goblin.service.IGoblinStoreZhengzaiService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -39,6 +40,8 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
     GoblinMongoUtils mongoUtils;
     @Autowired
     QueueUtils queueUtils;
+    @Autowired
+    IGoblinOrderAppService goblinOrderAppService;
 
 
     @Override
@@ -204,6 +207,16 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
         return ResponseDto.success(data);
     }
 
+    @Override
+    public ResponseDto<GoblinAppOrderDetailsVo> nowOrderDetails(GoblinNowOrderListParam param) {
+        String storeId = param.getStoreId();
+        String marketId = param.getMarketId();
+        String orderCode = param.getOrderCode();
+        GoblinNowOrderListVo data = mongoUtils.getGoblinNowOrderDetailsVo(orderCode, storeId, marketId);
+        ResponseDto<GoblinAppOrderDetailsVo> responseVo = goblinOrderAppService.orderDetails(data.getOrderId(), data.getUid());
+        return ResponseDto.success(responseVo.getData());
+    }
+
     //获取 订单剩余可支付时间[S]
     private long getRestTime(GoblinStoreOrderVo orderVo) {
         long restTime = 0L;

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

@@ -1899,12 +1899,19 @@ 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(orderCode)).and("orderCode").regex("^.*" + orderCode + "$");
+        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 + "$"));
         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());
         return list;
     }
+
+    public GoblinNowOrderListVo getGoblinNowOrderDetailsVo(String orderCode, String storeId, String marketId) {
+        Criteria criteria = Criteria.where("storeId").is(storeId).and("market_id").is("ZZ".concat(marketId)).and("orderCode").is(orderCode);
+        Query query = Query.query(criteria);
+        GoblinNowOrderListVo data = mongoTemplate.findOne(query, GoblinNowOrderListVo.class, GoblinStoreOrderVo.class.getSimpleName());
+        return data;
+    }
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */
 }