临时提交

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@ApiModel
+@Data
+public class GoblinStoreOrderListVo implements Cloneable {
+    @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "订单号")
+    private String orderCode;
+    @ApiModelProperty(value = "下单时间")
+    private String createdAt;
+    @ApiModelProperty(value = "下单方式")
+    private String payType;
+    @ApiModelProperty(value = " 收货人姓名")
+    private String expressContacts;
+    @ApiModelProperty(value = " 收货人联系方式")
+    private String expressPhone;
+    @ApiModelProperty(value = " 收货人地址")
+    private String expressAddressDetail;
+    @ApiModelProperty(value = " 收货人省市县")
+    private String expressAddress;
+    @ApiModelProperty(value = " 付款金额")
+    private BigDecimal priceActual;
+    @ApiModelProperty(value = " 订单状态")
+    private Integer status;
+
+
+    private static final GoblinStoreOrderListVo obj = new GoblinStoreOrderListVo();
+
+    public static GoblinStoreOrderListVo getNew() {
+        try {
+            return (GoblinStoreOrderListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreOrderListVo();
+        }
+    }
+}

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

@@ -3,17 +3,18 @@ package com.liquidnet.service.goblin.service.manage;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinOrderLogVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderListVo;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.Valid;
 
 public interface IGoblinStoreOrderService {
-    ResponseDto<PageInfo<GoblinOrderLogVo>> orderList(Integer page,
-                                                      String orderCode,
-                                                      Integer type,
-                                                      String cst,
-                                                      String cet,
-                                                      String expressContacts,
-                                                      String phone,
-                                                      Integer status);
+    ResponseDto<PageInfo<GoblinStoreOrderListVo>> orderList(Integer page,
+                                                            String orderCode,
+                                                            Integer type,
+                                                            String cst,
+                                                            String cet,
+                                                            String expressContacts,
+                                                            String phone,
+                                                            Integer status);
 }

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

@@ -2,16 +2,20 @@ package com.liquidnet.service.goblin.service.impl.manage;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinOrderLogVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.IGoblinStoreMoneyService;
 import com.liquidnet.service.goblin.service.manage.IGoblinStoreOrderService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.DateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.List;
 
@@ -24,7 +28,34 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
     GoblinMongoUtils mongoUtils;
 
     @Override
-    public ResponseDto<PageInfo<GoblinOrderLogVo>> orderList(Integer page, String orderCode, Integer type, String cst, String cet, String expressContacts, String phone, Integer status) {
-        return null;
+    public ResponseDto<PageInfo<GoblinStoreOrderListVo>> orderList(Integer page, String orderCode, Integer type, String cst, String cet, String expressContacts, String phone, Integer status) {
+        List<GoblinStoreOrderListVo> listVos = ObjectUtil.getGoblinStoreOrderListVoArrayList();
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
+        if (storeInfoVo == null) {
+            return ResponseDto.failure("无法查看");
+        }
+        HashMap<String, Object> map = mongoUtils.storeOrderList(storeInfoVo.getStoreId(), page, orderCode, cst, cet, expressContacts, phone, status);
+        long total = (long) map.get("total");
+        List<GoblinStoreOrderVo> voList = (List<GoblinStoreOrderVo>) map.get("data");
+        for (GoblinStoreOrderVo item : voList) {
+            GoblinStoreOrderListVo vo = GoblinStoreOrderListVo.getNew();
+            vo.setCreatedAt(item.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            vo.setExpressAddressDetail(item.getOrderAttrVo().getExpressAddressDetail());
+            vo.setExpressContacts(item.getOrderAttrVo().getExpressContacts());
+            vo.setExpressPhone(item.getOrderAttrVo().getExpressPhone());
+            vo.setOrderCode(item.getOrderCode());
+            vo.setExpressAddress(item.getOrderAttrVo().getExpressAddress());
+            vo.setOrderId(item.getOrderId());
+            vo.setPayType(item.getPayType());
+            vo.setPriceActual(item.getPriceActual());
+            vo.setStatus(item.getStatus());
+            for (String skuId : item.getOrderSkuVoIds()) {
+                GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(skuId);
+            }
+        }
+        PageInfo<GoblinStoreOrderListVo> pageInfo = new PageInfo(listVos);
+        pageInfo.setTotal(total);
+        return ResponseDto.success(pageInfo);
     }
 }

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

@@ -537,8 +537,8 @@ public class GoblinMongoUtils {
         }
         Query query = Query.query(criteria);
         query.skip(skipCount).limit(size);
-        query.fields().include("orderCode").include("createdAt").include("payType")
-                .include("orderAttrVo.").include("orderAttrVo.").include("orderAttrVo.").include("orderAttrVo.")
+        query.fields().include("orderCode").include("createdAt").include("payType").include("status").include("orderSkuVoIds").include("orderId").include("priceActual")
+                .include("orderAttrVo.expressContacts").include("orderAttrVo.expressAddressDetail").include("orderAttrVo.expressAddress").include("orderAttrVo.expressPhone");
         List<GoblinStoreOrderVo> dataList = mongoTemplate.find(query, GoblinStoreOrderVo.class, GoblinStoreOrderVo.class.getSimpleName());
         //查询总数量
         Query countQuery = Query.query(criteria);

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

@@ -44,6 +44,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinOrderSqlParam> goblinOrderSqlParamArrayList = new ArrayList<>();
     private static final ArrayList<GoblinStoreOrderVo> goblinStoreOrderVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinZhengzaiPushVo> goblinZhengzaiPushVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinStoreOrderListVo> goblinStoreOrderListVoArrayList = new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
@@ -51,6 +52,10 @@ public class ObjectUtil {
         return goblinStoreMgtGoodsVoPagedResult.clone();
     }
 
+    public static ArrayList<GoblinStoreOrderListVo> getGoblinStoreOrderListVoArrayList() {
+        return (ArrayList<GoblinStoreOrderListVo>) goblinStoreOrderListVoArrayList.clone();
+    }
+
     public static ArrayList<GoblinZhengzaiPushVo> getGoblinZhengzaiPushVoArrayList() {
         return (ArrayList<GoblinZhengzaiPushVo>) goblinZhengzaiPushVoArrayList.clone();
     }