订单列表

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

 package com.liquidnet.service.goblin.param;
 
-import com.liquidnet.service.goblin.dto.vo.GoblinFrontGoodDetailVo;
 import com.liquidnet.service.goblin.entity.GoblinOrderAttr;
 import com.liquidnet.service.goblin.entity.GoblinOrderSku;
 import com.liquidnet.service.goblin.entity.GoblinStoreOrder;

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

+package com.liquidnet.service.goblin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
+
+import java.util.List;
+
+public interface IGoblinOrderAppService {
+
+    ResponseDto<List<GoblinStoreOrderVo>> orderList(int page);
+
+    ResponseDto<GoblinStoreOrderVo> orderDetails(String orderId);
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinAppOrderService.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinOrderService.java

@@ -6,7 +6,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
 import com.liquidnet.service.goblin.param.PayAgainParam;
 import com.liquidnet.service.goblin.param.SyncOrderParam;
 
-public interface IGoblinAppOrderService {
+public interface IGoblinOrderService {
 
     ResponseDto<GoblinPayInnerResultVo> checkOrder(GoblinOrderParam param);
 

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

+package com.liquidnet.service.goblin.controller;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.codec.vo.EncryptedReq;
+import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
+import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
+import com.liquidnet.service.goblin.param.PayAgainParam;
+import com.liquidnet.service.goblin.param.SyncOrderParam;
+import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
+import com.liquidnet.service.goblin.service.IGoblinOrderService;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@Api(tags = "订单相关-App")
+@RestController
+@RequestMapping("/order")
+public class GoblinOrderAppController {
+
+    @Autowired
+    IGoblinOrderAppService goblinOrderAppService;
+
+    @PostMapping("list")
+    @ApiOperation("列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数", example = "1"),
+    })
+    public ResponseDto<List<GoblinStoreOrderVo>> orderList(@RequestParam("page") @Valid int page) {
+        return goblinOrderAppService.orderList(page);
+    }
+
+    @PostMapping("deltails")
+    @ApiOperation("详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id", example = "1"),
+    })
+    public ResponseDto<GoblinStoreOrderVo> orderDetails(@RequestParam("orderId") @Valid String orderId) {
+        return goblinOrderAppService.orderDetails(orderId);
+    }
+
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinAppOrderController.java → liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinOrderController.java

@@ -6,7 +6,7 @@ import com.liquidnet.service.goblin.dto.manage.GoblinOrderParam;
 import com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo;
 import com.liquidnet.service.goblin.param.PayAgainParam;
 import com.liquidnet.service.goblin.param.SyncOrderParam;
-import com.liquidnet.service.goblin.service.IGoblinAppOrderService;
+import com.liquidnet.service.goblin.service.IGoblinOrderService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,13 +15,13 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 @Slf4j
-@Api(tags = "订单相关")
+@Api(tags = "订单相关-支付相关")
 @RestController
-@RequestMapping("/order")
-public class GoblinAppOrderController {
+@RequestMapping("/order/pay")
+public class GoblinOrderController {
 
     @Autowired
-    IGoblinAppOrderService goblinAppOrderService;
+    IGoblinOrderService goblinAppOrderService;
 
     @PostMapping("pre")
     @ApiOperation("下单")

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

+package com.liquidnet.service.goblin.service.impl;
+
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
+import com.liquidnet.service.goblin.service.IGoblinOrderAppService;
+import com.liquidnet.service.goblin.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
+
+    @Autowired
+    GoblinRedisUtils redisUtils;
+    @Autowired
+    GoblinMongoUtils mongoUtils;
+    @Autowired
+    QueueUtils queueUtils;
+    @Autowired
+    GoblinOrderUtils orderUtils;
+
+
+    @Override
+    public ResponseDto<List<GoblinStoreOrderVo>> orderList(int page) {
+        String uid = CurrentUtil.getCurrentUid();
+        List<GoblinStoreOrderVo> orderVoList = ObjectUtil.getGoblinStoreOrderVoArrayList();
+        List<String> orderIds = redisUtils.getOrderList(uid);
+        int size = 40;
+        int initCount = (page - 1) * size;
+        int finalCount = page * size;
+        if (finalCount >= orderIds.size()) {
+            finalCount = orderIds.size();
+        }
+        for (int i = initCount; i < finalCount; i++) {
+            String orderId = orderIds.get(i);
+            GoblinStoreOrderVo vo = redisUtils.getGoblinOrder(orderId);
+            orderVoList.add(vo);
+        }
+        return ResponseDto.success(orderVoList);
+    }
+
+    @Override
+    public ResponseDto<GoblinStoreOrderVo> orderDetails(String orderId) {
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinStoreOrderVo vo = redisUtils.getGoblinOrder(orderId);
+        if (!vo.getUserId().equals(uid)) {
+            return ResponseDto.failure("无权查看");
+        }
+        return ResponseDto.success(vo);
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinAppOrderServiceImpl.java → liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -26,7 +26,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import com.liquidnet.service.goblin.entity.GoblinOrderAttr;
 import com.liquidnet.service.goblin.entity.GoblinOrderSku;
 import com.liquidnet.service.goblin.entity.GoblinStoreOrder;
-import com.liquidnet.service.goblin.service.IGoblinAppOrderService;
+import com.liquidnet.service.goblin.service.IGoblinOrderService;
 import com.liquidnet.service.goblin.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -43,7 +43,7 @@ import java.util.*;
 
 @Service
 @Slf4j
-public class GoblinAppOrderServiceImpl implements IGoblinAppOrderService {
+public class GoblinOrderServiceImpl implements IGoblinOrderService {
 
     @Autowired
     GoblinRedisUtils redisUtils;

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

@@ -40,7 +40,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinStoreOrder> goblinStoreOrderArrayList = new ArrayList<>();
     private static final ArrayList<GoblinOrderAttr> goblinOrderAttrArrayList = new ArrayList<>();
     private static final ArrayList<GoblinOrderSqlParam> goblinOrderSqlParamArrayList = new ArrayList<>();
-
+    private static final ArrayList<GoblinStoreOrderVo> goblinStoreOrderVoArrayList = new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
@@ -48,6 +48,10 @@ public class ObjectUtil {
         return goblinStoreMgtGoodsVoPagedResult.clone();
     }
 
+    public static ArrayList<GoblinStoreOrderVo> getGoblinStoreOrderVoArrayList() {
+        return (ArrayList<GoblinStoreOrderVo>) goblinStoreOrderVoArrayList.clone();
+    }
+
     public static ArrayList<GoblinGoodsInfoVo> getGoblinGoodsInfoVos() {
         return (ArrayList<GoblinGoodsInfoVo>) goblinGoodsInfoVos.clone();
     }