订单列表 下单人信息补全。

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

@@ -127,10 +127,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         for (GoblinStoreOrderVo item : voList) {
             GoblinStoreOrderListVo vo = GoblinStoreOrderListVo.getNew();
             vo.setCreatedAt(item.getCreatedAt());
-            if (includeExportFields) {
-                vo.setUserMobile(item.getUserMobile());
-                vo.setPayTime(item.getPayTime());
-            }
+            vo.setPayTime(item.getPayTime());
             GoblinOrderAttrVo orderAttrVo = item.getOrderAttrVo();
             if (orderAttrVo != null) {
                 vo.setExpressAddressDetail(orderAttrVo.getExpressAddressDetail());
@@ -150,6 +147,9 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             vo.setStatus(item.getStatus());
             vo.setMarketType(item.getMarketType());
             vo.setPriceExpress(item.getPriceExpress());
+            vo.setUserId(item.getUserId());
+            vo.setUserName(item.getUserName());
+            vo.setUserMobile(item.getUserMobile());
             if (includeExportFields) {
                 vo.setPlatformUcouponPrice(item.getPriceCoupon());
                 vo.setStoreUcouponPrice(item.getStorePriceCoupon());
@@ -187,6 +187,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             vo.setStoreOrderListSkuVoList(orderListSkuVos);
             // 增加物流信息
             vo.setGoblinMailVoList(redisUtils.getGoblinMail(item.getOrderId()));
+            String logisticsCompany = exportLogisticsCompany(vo.getGoblinMailVoList());
+            if (StringUtils.isBlank(logisticsCompany)) {
+                logisticsCompany = toExportString(item.getLogisticsCompany());
+            }
+            vo.setLogisticsCompany(logisticsCompany);
             listVos.add(vo);
         }
         return listVos;

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

@@ -1485,9 +1485,17 @@ public class GoblinMongoUtils {
     }
 
     private void storeOrderListFields(Query query) {
-        query.fields().include("orderCode").include("createdAt").include("payType").include("payTime").include("status").include("orderSkuVoIds")
-                .include("orderId").include("userMobile").include("priceActual").include("priceExpress").include("priceCoupon").include("storePriceCoupon").include("marketId").include("marketType")
-                .include("orderAttrVo.expressContacts").include("orderAttrVo.expressAddressDetail").include("orderAttrVo.expressAddress").include("orderAttrVo.expressPhone");
+        query.fields()
+                .include("orderCode").include("createdAt").include("payType").include("payTime").include("status")
+                .include("orderSkuVoIds").include("orderId").include("storeId")
+                .include("userId").include("userName").include("userMobile")
+                .include("priceActual").include("priceTotal").include("priceExpress").include("priceCoupon").include("storePriceCoupon")
+                .include("marketId").include("marketType").include("orderType").include("source").include("deliveryTime")
+                .include("ucouponId").include("storeCouponId")
+                .include("logisticsCompany").include("logisticsCode").include("mailNo")
+                .include("mixId").include("mixName")
+                .include("orderAttrVo.expressContacts").include("orderAttrVo.expressAddressDetail")
+                .include("orderAttrVo.expressAddress").include("orderAttrVo.expressPhone");
     }
 
     //商品退款订单列表