Merge branch 'refs/heads/dev-1.6-shouqianba' into container-test

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

@@ -77,11 +77,19 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         for (GoblinStoreOrderVo item : voList) {
             GoblinStoreOrderListVo vo = GoblinStoreOrderListVo.getNew();
             vo.setCreatedAt(item.getCreatedAt());
-            vo.setExpressAddressDetail(item.getOrderAttrVo().getExpressAddressDetail());
-            vo.setExpressContacts(item.getOrderAttrVo().getExpressContacts());
-            vo.setExpressPhone(item.getOrderAttrVo().getExpressPhone());
+            GoblinOrderAttrVo orderAttrVo = item.getOrderAttrVo();
+            if (orderAttrVo != null) {
+                vo.setExpressAddressDetail(orderAttrVo.getExpressAddressDetail());
+                vo.setExpressContacts(orderAttrVo.getExpressContacts());
+                vo.setExpressPhone(orderAttrVo.getExpressPhone());
+                vo.setExpressAddress(orderAttrVo.getExpressAddress());
+            } else {
+                vo.setExpressAddressDetail("");
+                vo.setExpressContacts("");
+                vo.setExpressPhone("");
+                vo.setExpressAddress("");
+            }
             vo.setOrderCode(item.getOrderCode());
-            vo.setExpressAddress(item.getOrderAttrVo().getExpressAddress());
             vo.setOrderId(item.getOrderId());
             vo.setPayType(item.getPayType());
             vo.setPriceActual(item.getPriceActual());
@@ -92,11 +100,18 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 vo.setMarketName("");
             } else {
                 GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(item.getMarketId().split("ZZ")[1]);
-                vo.setMarketName(marketingVo.getName());
+                vo.setMarketName(marketingVo != null ? marketingVo.getName() : "");
             }
             List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
-            for (String skuId : item.getOrderSkuVoIds()) {
+            List<String> skuIds = item.getOrderSkuVoIds();
+            if (skuIds == null) {
+                skuIds = Collections.emptyList();
+            }
+            for (String skuId : skuIds) {
                 GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(skuId);
+                if (orderSkuVo == null) {
+                    continue;
+                }
                 GoblinStoreOrderListSkuVo itemSkuVo = GoblinStoreOrderListSkuVo.getNew();
                 itemSkuVo.setNum(orderSkuVo.getNum());
                 itemSkuVo.setOrderSkuId(orderSkuVo.getOrderSkuId());