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

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

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

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

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "GoblinNowOrderListParam")
+@Data
+public class GoblinNowOrderListParam implements Cloneable {
+
+    @ApiModelProperty(required = false, value = "页数")
+    private int page;
+    @ApiModelProperty(required = true, value = "店铺id")
+    private String storeId;
+    @ApiModelProperty(required = true, value = "活动id")
+    private String marketId;
+    @ApiModelProperty(required = true, value = "订单号")
+    private String orderCode;
+
+
+    private static final GoblinNowOrderListParam obj = new GoblinNowOrderListParam();
+
+    public static GoblinNowOrderListParam getNew() {
+        try {
+            return (GoblinNowOrderListParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinNowOrderListParam();
+        }
+    }
+}

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

 package com.liquidnet.service.goblin.service;
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderListVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiGoodPageVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiGoodVo;
+import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.param.GoblinNowOrderListParam;
 
 import java.util.List;
 
@@ -30,4 +28,6 @@ public interface IGoblinStoreZhengzaiService {
     ResponseDto<List<GoblinAppOrderListVo>> orderList(int page);
 
     ResponseDto<Boolean> orderPush(String orderMasterCode);
+
+    ResponseDto<List<GoblinNowOrderListVo>> nowOrderList(GoblinNowOrderListParam param);
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.controller;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 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 io.swagger.annotations.*;
@@ -23,7 +24,7 @@ public class GoblinStoreZhengzaiController {
 
     @Autowired
     IGoblinStoreZhengzaiService goblinStoreZhengzaiService;
-//    @Autowired
+    //    @Autowired
 //    IGoblinOrderService goblinOrderService;
     @Autowired
     IGoblinOrderAppService goblinOrderAppService;
@@ -55,7 +56,7 @@ public class GoblinStoreZhengzaiController {
     public ResponseDto<GoblinZhengzaiGoodPageVo> getStoreList2(@RequestParam("marketId") @Valid String marketId,
                                                                @RequestParam("page") @Valid Integer page,
                                                                @RequestParam(value = "kw", required = false) @Size(min = 1, max = 64, message = "搜索内容长度超出范围1～64位") String keyword) {
-        return goblinStoreZhengzaiService.getSpuList2(marketId,keyword,page);
+        return goblinStoreZhengzaiService.getSpuList2(marketId, keyword, page);
     }
 
     @PostMapping("list")
@@ -95,6 +96,12 @@ public class GoblinStoreZhengzaiController {
         return goblinOrderAppService.orderDetails(orderId, null);
     }
 
+    @PostMapping("now/list")
+    @ApiOperation("pos根据订单号查询")
+    public ResponseDto<List<GoblinNowOrderListVo>> nowOrderList(@RequestBody GoblinNowOrderListParam param) {
+        return goblinStoreZhengzaiService.nowOrderList(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

@@ -8,6 +8,7 @@ import com.liquidnet.service.base.SqlMapping;
 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.IGoblinStoreZhengzaiService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -75,7 +76,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
             return ResponseDto.failure("店铺不存在");
         }
         GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(marketId);
-        if (marketingVo.getStatus()!=null && marketingVo.getStatus() == 7) {
+        if (marketingVo.getStatus() != null && marketingVo.getStatus() == 7) {
             return ResponseDto.failure("活动已停用");
         }
         //todo
@@ -115,7 +116,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
             return ResponseDto.failure("店铺不存在");
         }
         GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(marketId);
-        if (marketingVo.getStatus()!=null && marketingVo.getStatus() == 7) {
+        if (marketingVo.getStatus() != null && marketingVo.getStatus() == 7) {
             return ResponseDto.failure("活动已停用");
         }
         //todo
@@ -126,7 +127,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
         }
 
         // 支持搜索SPU
-        HashMap map = mongoUtils.getMarketSpuData(marketId,page, keyword,storeId);
+        HashMap map = mongoUtils.getMarketSpuData(marketId, page, keyword, storeId);
         long total = (long) map.get("total");
         List<String> hitSpuIdList = (List<String>) map.get("data");
 
@@ -193,6 +194,16 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
         return ResponseDto.success();
     }
 
+    @Override
+    public ResponseDto<List<GoblinNowOrderListVo>> nowOrderList(GoblinNowOrderListParam param) {
+        String storeId = param.getStoreId();
+        String marketId = param.getMarketId();
+        int page = param.getPage();
+        String orderCode = param.getOrderCode();
+        List<GoblinNowOrderListVo> data = mongoUtils.getGoblinNowOrderListVo(orderCode, storeId, marketId, page);
+        return ResponseDto.success(data);
+    }
+
     //获取 订单剩余可支付时间[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

@@ -656,8 +656,8 @@ public class GoblinMongoUtils {
         query.fields().include("spuId");
         long total = mongoTemplate.count(query, GoblinStoreMgtGoodsListVo.class, GoblinGoodsInfoVo.class.getSimpleName());
         List<GoblinStoreMgtGoodsListVo> goodsListVos = mongoTemplate.find(query, GoblinStoreMgtGoodsListVo.class, GoblinGoodsInfoVo.class.getSimpleName());
-        map.put("total",total);
-        map.put("data",CollectionUtils.isEmpty(goodsListVos) ? CollectionUtil.arrayListString() : goodsListVos.stream().map(GoblinStoreMgtGoodsListVo::getSpuId).distinct().collect(Collectors.toList()));
+        map.put("total", total);
+        map.put("data", CollectionUtils.isEmpty(goodsListVos) ? CollectionUtil.arrayListString() : goodsListVos.stream().map(GoblinStoreMgtGoodsListVo::getSpuId).distinct().collect(Collectors.toList()));
         return map;
     }
 
@@ -1895,6 +1895,16 @@ public class GoblinMongoUtils {
         map.put("total", total);
         return map;
     }
+
+
+    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 + "$");
+        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;
+    }
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */
 }