离线支付-订单列表

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.entity.GoblinBraceletOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -232,12 +234,14 @@ public class GoblinBraceletOrderVo implements Serializable, Cloneable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
 
     /**
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
 
     private static final GoblinBraceletOrderVo obj = new GoblinBraceletOrderVo();

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

@@ -2,11 +2,14 @@ package com.liquidnet.service.goblin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinBraceletOrderVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinBraceletPayResultVo;
 import com.liquidnet.service.goblin.entity.GoblinBraceletOrder;
 import com.liquidnet.service.goblin.param.GoblinBraceletOrderPayParam;
 import com.liquidnet.service.goblin.param.dougong.DougongSyncCallbackparam;
 
+import java.util.List;
+
 public interface IGoblinBraceletOrderService extends IService<GoblinBraceletOrder> {
 
     /**
@@ -28,4 +31,10 @@ public interface IGoblinBraceletOrderService extends IService<GoblinBraceletOrde
      * @return
      */
     ResponseDto<Boolean> dougongCallBack(DougongSyncCallbackparam callbackparam);
+
+    /**
+     * 获取订单列表
+     * @return
+     */
+    List<GoblinBraceletOrderVo> getOrderList();
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.controller;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.codec.annotation.DecryptAndVerify;
 import com.liquidnet.service.base.codec.vo.EncryptedReq;
+import com.liquidnet.service.goblin.dto.vo.GoblinBraceletOrderVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinBraceletPayResultVo;
 import com.liquidnet.service.goblin.param.GoblinBraceletOrderPayParam;
 import com.liquidnet.service.goblin.param.dougong.DougongSyncCallbackparam;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 @Slf4j
 @Api(tags = "商城-手环相关")
@@ -50,6 +52,12 @@ public class GoblinBraceletOrderController {
         return braceLetOrderService.checkOrderResult(orderId);
     }
 
+    @GetMapping("/order/list")
+    @ApiOperation("查询订单列表")
+    public ResponseDto<List<GoblinBraceletOrderVo>> getOrderList(){
+        return ResponseDto.success(braceLetOrderService.getOrderList());
+    }
+
 
     @PostMapping("/callback")
 //    @ApiOperation("斗拱支付回调")

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

@@ -314,4 +314,20 @@ public class GoblinBraceletOrderServiceImpl extends ServiceImpl<GoblinBraceletOr
 
     }
 
+    @Override
+    public List<GoblinBraceletOrderVo> getOrderList() {
+        final String uid = CurrentUtil.getCurrentUid();
+        LambdaQueryWrapper<GoblinBraceletOrder> queryWrapper = new QueryWrapper<GoblinBraceletOrder>()
+                .lambda()
+                .eq(GoblinBraceletOrder::getUserId, uid)
+                .orderByDesc(GoblinBraceletOrder::getCreatedAt);
+        List<GoblinBraceletOrder> goblinBraceletOrders = braceletOrderMapper.selectList(queryWrapper);
+        if (goblinBraceletOrders.isEmpty()) {
+            return Collections.emptyList();
+        }
+        return goblinBraceletOrders.stream()
+                .map(m -> GoblinBraceletOrderVo.getNew().copy(m))
+                .collect(Collectors.toList());
+    }
+
 }