提交 订单列表接口

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel
+public class GoblinMixOrderListVo implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = " 商城订单")
+    private List<GoblinAppOrderListVo> goblinOrder;
+    @ApiModelProperty(value = " 数字藏品订单")
+    private List<GoblinNftOrderDetailsVo> nftOrder;
+
+
+    private static final GoblinMixOrderListVo obj = new GoblinMixOrderListVo();
+
+    public static GoblinMixOrderListVo getNew() {
+        try {
+            return (GoblinMixOrderListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinMixOrderListVo();
+    }
+
+}

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

@@ -26,4 +26,7 @@ public interface IGoblinMixAppService {
 
     // 根据混合售id 获取售卖内容
     ResponseDto<List<GoblinMixDetailsItemVo>> getItem(String mixId);
+
+    // 根据mix订单号查询订单列表
+    ResponseDto<GoblinMixOrderListVo> getMixList(String masterCode);
 }

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

@@ -57,4 +57,14 @@ public class GoblinMixAppController {
     public ResponseDto<List<GoblinMixDetailsItemVo>> item(@RequestParam(value = "mixId", required = true) String mixId) {
         return goblinMixAppService.getItem(mixId);
     }
+
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "根据mix订单号查询订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "masterCode", value = "mix订单号"),
+    })
+    @GetMapping("order/list")
+    public ResponseDto<GoblinMixOrderListVo> getMixList(@RequestParam(value = "masterCode", required = true) String masterCode) {
+        return goblinMixAppService.getMixList(masterCode);
+    }
 }

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

@@ -16,6 +16,7 @@ import com.liquidnet.service.goblin.service.manage.IGoblinMixAppService;
 import com.liquidnet.service.goblin.service.manage.IGoblinMixService;
 import com.liquidnet.service.goblin.util.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -43,12 +44,11 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
     @Autowired
     GoblinRedisUtils redisUtils;
 
-
     @Override
     public ResponseDto<List<GoblinMixAppListVo>> mixList(Integer showPosition) {
         List<GoblinMixAppListVo> voList = ObjectUtil.goblinMixAppListVo();
-        List<String> startList = CollectionUtil.linkedListString();
-        List<String> stockList = CollectionUtil.linkedListString();
+        List<String> startList;
+        List<String> stockList;
         if (showPosition == 1) {//商城
             startList = redisUtils.getGoblinMixSkuStartList();
             stockList = redisUtils.getGoblinMixSkuStockList();
@@ -127,4 +127,42 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
         }
         return ResponseDto.success(baseVo.getItem());
     }
+
+    @Override
+    public ResponseDto<GoblinMixOrderListVo> getMixList(String masterCode) {
+        HashMap<String, String[]> map = redisUtils.getMixMasterCode(masterCode);
+        String[] nft = map.get("nft");
+        String[] goblin = map.get("goblin");
+
+        GoblinMixOrderListVo vo = GoblinMixOrderListVo.getNew();
+        List<GoblinAppOrderListVo> orderListVos = ObjectUtil.goblinAppOrderListVoArrayList();
+        List<GoblinNftOrderDetailsVo> nftOrderListVos = ObjectUtil.goblinNftOrderDetailsVoArrayList();
+
+        for (String orderId : nft) {
+            // 订单信息
+            GoblinNftOrderVo orderVo = redisUtils.getGoblinNftOrder(orderId);
+            GoblinNftOrderDetailsVo orderDetails = GoblinNftOrderDetailsVo.getNew().copy(orderVo);
+            // 商品信息
+            GoblinGoodsSkuInfoVo goodsSkuInfoVo = redisUtils.getGoodsSkuInfoVo(orderVo.getSkuId());
+            GoblinNftOrderGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftOrderGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo);
+            orderDetails.setGoodsSkuInfoVo(nftGoodsSkuInfoVo);
+            nftOrderListVos.add(orderDetails);
+        }
+        for (String orderId : goblin) {
+            GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
+            GoblinAppOrderListVo vos = GoblinAppOrderListVo.getNew();
+            BeanUtils.copyProperties(orderVo, vo);
+            vos.setRestTime(0L);
+            List<GoblinOrderSkuVo> skuVos = ObjectUtil.getGoblinOrderSkuVoArrayList();
+            for (String orderSkuId : orderVo.getOrderSkuVoIds()) {
+                GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+                skuVos.add(orderSkuVo);
+            }
+            vos.setOrderSkuVos(skuVos);
+            orderListVos.add(vos);
+        }
+        vo.setGoblinOrder(orderListVos);
+        vo.setNftOrder(nftOrderListVos);
+        return ResponseDto.success(vo);
+    }
 }

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

@@ -1597,19 +1597,29 @@ public class GoblinRedisUtils {
     }
 
 
-    //主订单下包含的子订单
-    public void setMasterCode(String masterCode, String orderIds) {
+    public String[] getMasterCode(String masterCode) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_MASTER.concat(masterCode);
-        redisUtil.set(redisKey, orderIds);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return null;
+        } else {
+            return ((String) obj).split(",");
+        }
     }
 
-    public String[] getMasterCode(String masterCode) {
+    public HashMap<String, String[]> getMixMasterCode(String masterCode) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_MASTER.concat(masterCode);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
             return null;
         } else {
-            return ((String) obj).split(",");
+            String[] a = ((String) obj).split("&&");
+            String[] nftA = a[0].split(",");
+            String[] goblinA = a[1].split(",");
+            HashMap<String, String[]> map = ObjectUtil.mixIdMap();
+            map.put("nft", nftA);
+            map.put("goblin", goblinA);
+            return map;
         }
     }
 

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

@@ -20,6 +20,7 @@ import com.mongodb.client.model.WriteModel;
 import org.bson.Document;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class ObjectUtil {
@@ -99,6 +100,11 @@ public class ObjectUtil {
     private static final ArrayList<GoblinMixManageListVo> goblinMixManageListVo = new ArrayList<>();
     private static final ArrayList<GoblinMixAppListVo> goblinMixAppListVo = new ArrayList<>();
     private static final ArrayList<GoblinMixDetailsVo> goblinMixDetailsVo = new ArrayList<>();
+    private static final HashMap<String, String[]> mixIdMap = new HashMap();
+
+    public static HashMap<String, String[]> mixIdMap() {
+        return (HashMap<String, String[]>) mixIdMap.clone();
+    }
 
     public static ArrayList<GoblinMixAppListVo> goblinMixAppListVo() {
         return (ArrayList<GoblinMixAppListVo>) goblinMixAppListVo.clone();