Merge branch 'test6.8.3' into gray

@@ -62,7 +62,7 @@ public class NotDeliverNoticeDelayMsgConsumer implements YhConsumer {
                 sog.setProductName(msg.getPrdName());
             }
             LOGGER.info("ready notice sellerDeliverNotice, msg {}", msg);
-            inBoxFacade.sellerDeliverNotice(msg.getSellerOrderGoods(),orderCode, 2);
+            inBoxFacade.sellerDeliverNotice(sog,orderCode, 2);
         }
 
 

@@ -101,7 +101,7 @@ public class SellerOrderCancelDeliverDelayMsgConsumer implements YhConsumer {
                         sog = sellerOrderGoodsMapper.selectByPrimaryKey(event.getSkup());
                     }
 
-                    inBoxFacade.sellerDeliverNotice(event.getSellerOrderGoods(), orderCode,3);
+                    inBoxFacade.sellerDeliverNotice(sog, orderCode,3);
                 }catch (Exception ex){
                     logger.warn("in topic {} , refund fail,req {}", getMessageTopic(), req, ex);
                     BillLogEvent buyererBillLogEvent = bleb.tradeStatus(BillTradeStatus.FAIL.getCode())