Merge branch 'lmy_start' into dev_yy_dh

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

@@ -592,6 +592,10 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
 
         for (String orderSkuId : skuIds) {
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+            if(orderSkuVo==null){
+                log.error("调过子订单号:"+orderSkuId);
+                continue;
+            }
             orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_3.getValue());
             //redis
             redisUtils.setGoblinOrderSku(orderSkuId, orderSkuVo);