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

@@ -142,16 +142,25 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             return ResponseDto.failure("无法查看");
         }
         GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
-        if (orderVo == null || !orderVo.getStoreId().equals(storeInfoVo.getStoreId())) {
+        if (orderVo == null || orderVo.getStoreId() == null
+                || !orderVo.getStoreId().equals(storeInfoVo.getStoreId())) {
             return ResponseDto.failure("无法查看");
         }
         GoblinStoreOrderListVo vo = GoblinStoreOrderListVo.getNew();
         vo.setCreatedAt(orderVo.getCreatedAt());
-        vo.setExpressAddressDetail(orderVo.getOrderAttrVo().getExpressAddressDetail());
-        vo.setExpressContacts(orderVo.getOrderAttrVo().getExpressContacts());
-        vo.setExpressPhone(orderVo.getOrderAttrVo().getExpressPhone());
+        GoblinOrderAttrVo orderAttrVo = orderVo.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(orderVo.getOrderCode());
-        vo.setExpressAddress(orderVo.getOrderAttrVo().getExpressAddress());
         vo.setOrderId(orderVo.getOrderId());
         vo.setPayType(orderVo.getPayType());
         vo.setPriceActual(orderVo.getPriceActual());
@@ -160,6 +169,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         vo.setPriceExpress(orderVo.getPriceExpress());
         if (!(orderVo.getUcouponId() == null || orderVo.getUcouponId().equals(""))) {
             CandyCouponVo candyCouponVo = orderUtils.getCouponDetails(orderVo.getUcouponId(), orderVo.getUserId());
+            if (candyCouponVo != null) {
                 vo.setPlatformUcouponId(candyCouponVo.getUcouponId());
                 vo.setPlatformUcouponName(candyCouponVo.getTitle());
                 vo.setPlatformUcouponPrice(orderVo.getPriceCoupon());
@@ -168,20 +178,30 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 vo.setPlatformUcouponName("");
                 vo.setPlatformUcouponPrice(BigDecimal.ZERO);
             }
+        } else {
+            vo.setPlatformUcouponId("");
+            vo.setPlatformUcouponName("");
+            vo.setPlatformUcouponPrice(BigDecimal.ZERO);
+        }
         if (!(orderVo.getStoreCouponId() == null || orderVo.getStoreCouponId().equals(""))) {
             List<GoblinUserCouponVo> voList = redisUtils.getUserCouponVos(orderVo.getUserId());
+            if (voList != null) {
                 for (GoblinUserCouponVo goblinUserCouponVo : voList) {
-                if (goblinUserCouponVo.getUcouponId().equals(orderVo.getStoreCouponId())) {
+                    if (goblinUserCouponVo != null && goblinUserCouponVo.getUcouponId() != null
+                            && goblinUserCouponVo.getUcouponId().equals(orderVo.getStoreCouponId())) {
                         vo.setStoreUcouponId(goblinUserCouponVo.getStoreCouponId());
                         vo.setStoreUcouponName(goblinUserCouponVo.getTitle());
                         vo.setStoreUcouponPrice(orderVo.getStorePriceCoupon());
                         break;
                     }
                 }
+            }
             if (null == vo.getStoreUcouponId()) {
                 List<CouponOutLineVo> outLineVos = redisUtils.getOutLineCoupon();
+                if (outLineVos != null) {
                     for (CouponOutLineVo outLineVo : outLineVos) {
-                    if (outLineVo.getStoreCouponId().equals(orderVo.getStoreCouponId())) {
+                        if (outLineVo != null && outLineVo.getStoreCouponId() != null
+                                && outLineVo.getStoreCouponId().equals(orderVo.getStoreCouponId())) {
                             vo.setStoreUcouponId(outLineVo.getStoreCouponId());
                             vo.setStoreUcouponName(outLineVo.getName());
                             vo.setStoreUcouponPrice(orderVo.getStorePriceCoupon());
@@ -189,6 +209,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                         }
                     }
                 }
+            }
 
         } else {
             vo.setStoreUcouponId("");
@@ -199,13 +220,20 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             vo.setMarketName("");
         } else {
             GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(orderVo.getMarketId().split("ZZ")[1]);
-            vo.setMarketName(marketingVo.getName());
+            vo.setMarketName(marketingVo != null ? marketingVo.getName() : "");
         }
 
         vo.setGoblinMailVoList(redisUtils.getGoblinMail(orderId));
         List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
-        for (String skuId : orderVo.getOrderSkuVoIds()) {
+        List<String> skuIds = orderVo.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());

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

@@ -1179,6 +1179,22 @@ public class GoblinMongoUtils {
                 object);
     }
 
+    public GoblinStoreOrderVo getGoblinStoreOrderVoByOrderId(String orderId) {
+        if (orderId == null || orderId.trim().isEmpty()) {
+            return null;
+        }
+        return mongoTemplate.findOne(Query.query(Criteria.where("orderId").is(orderId)),
+                GoblinStoreOrderVo.class, GoblinStoreOrderVo.class.getSimpleName());
+    }
+
+    public GoblinOrderSkuVo getGoblinOrderSkuVoByOrderSkuId(String orderSkuId) {
+        if (orderSkuId == null || orderSkuId.trim().isEmpty()) {
+            return null;
+        }
+        return mongoTemplate.findOne(Query.query(Criteria.where("orderSkuId").is(orderSkuId)),
+                GoblinOrderSkuVo.class, GoblinOrderSkuVo.class.getSimpleName());
+    }
+
     //添加 订单SkuVo全量
     public GoblinOrderSkuVo insertGoblinOrderSkuVo(GoblinOrderSkuVo vo) {
         return mongoTemplate.insert(vo, GoblinOrderSkuVo.class.getSimpleName());

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

@@ -1559,7 +1559,11 @@ public class GoblinRedisUtils {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER.concat(orderId);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
-            return null;
+            GoblinStoreOrderVo fromMongo = goblinMongoUtils.getGoblinStoreOrderVoByOrderId(orderId);
+            if (fromMongo != null) {
+                redisUtil.set(redisKey, fromMongo);
+            }
+            return fromMongo;
         } else {
             return (GoblinStoreOrderVo) obj;
         }
@@ -1586,7 +1590,11 @@ public class GoblinRedisUtils {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_SKU.concat(orderSkuId);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
-            return null;
+            GoblinOrderSkuVo fromMongo = goblinMongoUtils.getGoblinOrderSkuVoByOrderSkuId(orderSkuId);
+            if (fromMongo != null) {
+                redisUtil.set(redisKey, fromMongo);
+            }
+            return fromMongo;
         } else {
             return (GoblinOrderSkuVo) obj;
         }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinSqbOrderServiceImpl.java

@@ -261,7 +261,13 @@ public class GoblinSqbOrderServiceImpl implements IGoblinSqbOrderService {
             orderSkuVo.setSkuPrice(skuPrice);
             orderSkuVo.setSkuPriceActual(priceTotal); // 按件数总价
             orderSkuVo.setSkuName(skuInfo != null ? skuInfo.getName() : "收钱吧未匹配SKU");
-            orderSkuVo.setSkuImage(skuInfo != null ? skuInfo.getSkuPic() : "");
+            String skuImg = "";
+            if (skuInfo != null && StringUtil.isNotBlank(skuInfo.getSkuPic())) {
+                skuImg = skuInfo.getSkuPic();
+            } else if (goodsInfo != null && StringUtil.isNotBlank(goodsInfo.getCoverPic())) {
+                skuImg = goodsInfo.getCoverPic();
+            }
+            orderSkuVo.setSkuImage(skuImg);
             orderSkuVo.setSkuSpecs("[]");
             orderSkuVo.setPriceVoucher(BigDecimal.ZERO);
             orderSkuVo.setCreatedAt(now);