ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit 5fb47f079e30c69d0a2864f623f01138db4b10a3 2 parents ed568289 7356882d

Merge branch 'test6.8.3' into gray

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -62,7 +62,7 @@ public class NotDeliverNoticeDelayMsgConsumer implements YhConsumer { @@ -62,7 +62,7 @@ public class NotDeliverNoticeDelayMsgConsumer implements YhConsumer {
62 sog.setProductName(msg.getPrdName()); 62 sog.setProductName(msg.getPrdName());
63 } 63 }
64 LOGGER.info("ready notice sellerDeliverNotice, msg {}", msg); 64 LOGGER.info("ready notice sellerDeliverNotice, msg {}", msg);
65 - inBoxFacade.sellerDeliverNotice(msg.getSellerOrderGoods(),orderCode, 2); 65 + inBoxFacade.sellerDeliverNotice(sog,orderCode, 2);
66 } 66 }
67 67
68 68
@@ -101,7 +101,7 @@ public class SellerOrderCancelDeliverDelayMsgConsumer implements YhConsumer { @@ -101,7 +101,7 @@ public class SellerOrderCancelDeliverDelayMsgConsumer implements YhConsumer {
101 sog = sellerOrderGoodsMapper.selectByPrimaryKey(event.getSkup()); 101 sog = sellerOrderGoodsMapper.selectByPrimaryKey(event.getSkup());
102 } 102 }
103 103
104 - inBoxFacade.sellerDeliverNotice(event.getSellerOrderGoods(), orderCode,3); 104 + inBoxFacade.sellerDeliverNotice(sog, orderCode,3);
105 }catch (Exception ex){ 105 }catch (Exception ex){
106 logger.warn("in topic {} , refund fail,req {}", getMessageTopic(), req, ex); 106 logger.warn("in topic {} , refund fail,req {}", getMessageTopic(), req, ex);
107 BillLogEvent buyererBillLogEvent = bleb.tradeStatus(BillTradeStatus.FAIL.getCode()) 107 BillLogEvent buyererBillLogEvent = bleb.tradeStatus(BillTradeStatus.FAIL.getCode())