ufo / yohoufo-fore · Commits

Go to a project

Authored by qinchao
Commit dbc0c9428efc861d1a4d4768defc3934265c2a0a 1 parent 470c2bb0

短信提醒文件

Inline Side-by-side
Showing 4 changed files with 14 additions and 14 deletions
@@ -48,7 +48,7 @@ public class NotDeliverNoticeDelayMsgConsumer implements YhConsumer { @@ -48,7 +48,7 @@ public class NotDeliverNoticeDelayMsgConsumer implements YhConsumer {
48 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCodeUid(orderCode, buyerUid); 48 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCodeUid(orderCode, buyerUid);
49 if(OrderStatus.HAS_PAYED.getCode() == buyerOrder.getStatus().intValue()){ 49 if(OrderStatus.HAS_PAYED.getCode() == buyerOrder.getStatus().intValue()){
50 LOGGER.info("ready notice sellerDeliverNotice, msg {}", msg); 50 LOGGER.info("ready notice sellerDeliverNotice, msg {}", msg);
51 - inBoxFacade.sellerDeliverNotice(msg.getSellerOrderGoods(), 2); 51 + inBoxFacade.sellerDeliverNotice(msg.getSellerOrderGoods(),orderCode, 2);
52 } 52 }
53 53
54 54
@@ -91,7 +91,7 @@ public class SellerOrderCancelDeliverDelayMsgConsumer implements YhConsumer { @@ -91,7 +91,7 @@ public class SellerOrderCancelDeliverDelayMsgConsumer implements YhConsumer {
91 try{ 91 try{
92 payRefundService.refund(req, bleb); 92 payRefundService.refund(req, bleb);
93 // 93 //
94 - inBoxFacade.sellerDeliverNotice(event.getSellerOrderGoods(), 3); 94 + inBoxFacade.sellerDeliverNotice(event.getSellerOrderGoods(), orderCode,3);
95 }catch (Exception ex){ 95 }catch (Exception ex){
96 logger.warn("in topic {} , refund fail,req {}", getMessageTopic(), req, ex); 96 logger.warn("in topic {} , refund fail,req {}", getMessageTopic(), req, ex);
97 BillLogEvent buyererBillLogEvent = bleb.tradeStatus(BillTradeStatus.FAIL.getCode()) 97 BillLogEvent buyererBillLogEvent = bleb.tradeStatus(BillTradeStatus.FAIL.getCode())
@@ -89,7 +89,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -89,7 +89,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
89 BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMapper.selectByOrderCode(uid, orderCode); 89 BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMapper.selectByOrderCode(uid, orderCode);
90 int skup = buyerOrderGoods.getSkup(); 90 int skup = buyerOrderGoods.getSkup();
91 SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup); 91 SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
92 - inBoxFacade.sellerSkupPaidByBuyer(sellerOrderGoods); 92 + inBoxFacade.sellerSkupPaidByBuyer(sellerOrderGoods,orderCode);
93 93
94 DeliverNoticeEvent deliverNoticeEvent = DeliverNoticeEvent.builder().skup(sellerOrderGoods.getId()) 94 DeliverNoticeEvent deliverNoticeEvent = DeliverNoticeEvent.builder().skup(sellerOrderGoods.getId())
95 .sellerOrderGoods(sellerOrderGoods) 95 .sellerOrderGoods(sellerOrderGoods)
@@ -108,7 +108,7 @@ public class InBoxFacade { @@ -108,7 +108,7 @@ public class InBoxFacade {
108 logger.warn("in sellerDeliver2Depot sms fail, buyerUid {} orderCode {} prdName {} ", buyerUid, orderCode,prdName); 108 logger.warn("in sellerDeliver2Depot sms fail, buyerUid {} orderCode {} prdName {} ", buyerUid, orderCode,prdName);
109 return; 109 return;
110 } 110 }
111 - String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_SELLER_DELIVER.getContent(),prdName); 111 + String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_SELLER_DELIVER.getContent(),prdName,orderCode);
112 List<String> mobileList = Arrays.asList(phone); 112 List<String> mobileList = Arrays.asList(phone);
113 sendSmsService.smsSendByMobile(content,mobileList); 113 sendSmsService.smsSendByMobile(content,mobileList);
114 logger.info("record sellerDeliver2Depot inbox sms msg, buyerUid {}, orderCode {}, prdName {} phone {}", 114 logger.info("record sellerDeliver2Depot inbox sms msg, buyerUid {}, orderCode {}, prdName {} phone {}",
@@ -168,7 +168,7 @@ public class InBoxFacade { @@ -168,7 +168,7 @@ public class InBoxFacade {
168 logger.warn("in appraisePassNotice notice buyer sms fail, buyerUid {} orderCode {} prdName {} ", buyerUid, orderCode,prdName); 168 logger.warn("in appraisePassNotice notice buyer sms fail, buyerUid {} orderCode {} prdName {} ", buyerUid, orderCode,prdName);
169 }else{ 169 }else{
170 List<String> mobileList = Arrays.asList(phone); 170 List<String> mobileList = Arrays.asList(phone);
171 - String content = getReplacedContent(InboxBusinessTypeEnum.SMS_SEND.getContent(),prdName); 171 + String content = getReplacedContent(InboxBusinessTypeEnum.SMS_SEND.getContent(),prdName,orderCode);
172 sendSmsService.smsSendByMobile(content,mobileList); 172 sendSmsService.smsSendByMobile(content,mobileList);
173 logger.info("record appraisePassNotice notice buyer sms msg, buyerUid {}, orderCode {}, prdName {} phone {}", 173 logger.info("record appraisePassNotice notice buyer sms msg, buyerUid {}, orderCode {}, prdName {} phone {}",
174 buyerUid, orderCode,prdName, phone); 174 buyerUid, orderCode,prdName, phone);
@@ -211,7 +211,7 @@ public class InBoxFacade { @@ -211,7 +211,7 @@ public class InBoxFacade {
211 211
212 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_SELLER; 212 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_SELLER;
213 //String content=smsIbt.getReplacedContent(prdName); 213 //String content=smsIbt.getReplacedContent(prdName);
214 - String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_SELLER.getContent(),prdName); 214 + String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_SELLER.getContent(),prdName,orderCode);
215 215
216 sendSmsService.smsSendByMobile(content,mobileList); 216 sendSmsService.smsSendByMobile(content,mobileList);
217 logger.info("record noticeBuyerWhenSellerCancelAfterPaid inbox sms msg, buyerUid {}, orderCode {},prdName {}", 217 logger.info("record noticeBuyerWhenSellerCancelAfterPaid inbox sms msg, buyerUid {}, orderCode {},prdName {}",
@@ -270,7 +270,7 @@ public class InBoxFacade { @@ -270,7 +270,7 @@ public class InBoxFacade {
270 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM; 270 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM;
271 //String content=smsIbt.getReplacedContent(prdName); 271 //String content=smsIbt.getReplacedContent(prdName);
272 272
273 - String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_PLATFORM.getContent(),prdName); 273 + String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_PLATFORM.getContent(),prdName,orderCode);
274 sendSmsService.smsSendByMobile(content,mobileList); 274 sendSmsService.smsSendByMobile(content,mobileList);
275 logger.info("record buyerGetEarnestMoneyWhenAppraiseFail inbox sms msg, buyerUid {}, orderCode {},prdName {}", 275 logger.info("record buyerGetEarnestMoneyWhenAppraiseFail inbox sms msg, buyerUid {}, orderCode {},prdName {}",
276 buyerUid, orderCode,prdName); 276 buyerUid, orderCode,prdName);
@@ -382,7 +382,7 @@ public class InBoxFacade { @@ -382,7 +382,7 @@ public class InBoxFacade {
382 * 382 *
383 * @param sog SellerOrderGoods 383 * @param sog SellerOrderGoods
384 */ 384 */
385 - public void sellerSkupPaidByBuyer(SellerOrderGoods sog) { 385 + public void sellerSkupPaidByBuyer(SellerOrderGoods sog,long orderCode) {
386 int sellerUid = sog.getUid(); 386 int sellerUid = sog.getUid();
387 String prdName = sog.getProductName(); 387 String prdName = sog.getProductName();
388 String sizeName = sog.getSizeName(); 388 String sizeName = sog.getSizeName();
@@ -403,7 +403,7 @@ public class InBoxFacade { @@ -403,7 +403,7 @@ public class InBoxFacade {
403 return; 403 return;
404 } 404 }
405 List<String> mobileList = Arrays.asList(phone); 405 List<String> mobileList = Arrays.asList(phone);
406 - String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName); 406 + String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName,orderCode);
407 sendSmsService.smsSendByMobile(content, mobileList); 407 sendSmsService.smsSendByMobile(content, mobileList);
408 logger.info("record sellerSkupPaidByBuyer inbox sms msg,sellerUid {}, prdName {}", 408 logger.info("record sellerSkupPaidByBuyer inbox sms msg,sellerUid {}, prdName {}",
409 sellerUid, prdName); 409 sellerUid, prdName);
@@ -637,7 +637,7 @@ public class InBoxFacade { @@ -637,7 +637,7 @@ public class InBoxFacade {
637 } 637 }
638 } 638 }
639 639
640 - public void sellerDeliverNotice(SellerOrderGoods sog, int times) { 640 + public void sellerDeliverNotice(SellerOrderGoods sog,long orderCode, int times) {
641 int sellerUid = sog.getUid(); 641 int sellerUid = sog.getUid();
642 String prdName = sog.getProductName(); 642 String prdName = sog.getProductName();
643 String sizeName = sog.getSizeName(); 643 String sizeName = sog.getSizeName();
@@ -673,11 +673,11 @@ public class InBoxFacade { @@ -673,11 +673,11 @@ public class InBoxFacade {
673 if(times == 2 || times == 3){ 673 if(times == 2 || times == 3){
674 String content = null; 674 String content = null;
675 if (times == 2) { 675 if (times == 2) {
676 - content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND.getContent(),prdName); 676 + content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND.getContent(),prdName,orderCode);
677 } 677 }
678 678
679 if (times == 3) { 679 if (times == 3) {
680 - content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED.getContent(),prdName); 680 + content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED.getContent(),prdName,orderCode);
681 } 681 }
682 sendSmsService.smsSendByMobile(content, mobileList); 682 sendSmsService.smsSendByMobile(content, mobileList);
683 logger.info("record sellerDeliverNotice inbox sms msg,sellerUid {}, prdName {}, times {},resp {}", 683 logger.info("record sellerDeliverNotice inbox sms msg,sellerUid {}, prdName {}, times {},resp {}",
@@ -723,7 +723,7 @@ public class InBoxFacade { @@ -723,7 +723,7 @@ public class InBoxFacade {
723 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM; 723 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM;
724 //String content=smsIbt.getReplacedContent(prdName); 724 //String content=smsIbt.getReplacedContent(prdName);
725 725
726 - String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),prdName); 726 + String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),orderCode);
727 sendSmsService.smsSendByMobile(content,mobileList); 727 sendSmsService.smsSendByMobile(content,mobileList);
728 logger.info("record buyerCancelBeforeDepotReceive inbox sms msg, sellerUid {}, orderCode {},prdName {}", 728 logger.info("record buyerCancelBeforeDepotReceive inbox sms msg, sellerUid {}, orderCode {},prdName {}",
729 sellerUid, orderCode, prdName); 729 sellerUid, orderCode, prdName);
@@ -765,7 +765,7 @@ public class InBoxFacade { @@ -765,7 +765,7 @@ public class InBoxFacade {
765 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM; 765 //SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM;
766 //String content=smsIbt.getReplacedContent(prdName); 766 //String content=smsIbt.getReplacedContent(prdName);
767 767
768 - String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_PAID.getContent(),prdName); 768 + String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_PAID.getContent(),orderCode,prdName);
769 sendSmsService.smsSendByMobile(content,mobileList); 769 sendSmsService.smsSendByMobile(content,mobileList);
770 logger.info("record buyerCancelBeforeSellerDeliver inbox sms msg, sellerUid {}, orderCode {},prdName {}", 770 logger.info("record buyerCancelBeforeSellerDeliver inbox sms msg, sellerUid {}, orderCode {},prdName {}",
771 sellerUid, orderCode, prdName); 771 sellerUid, orderCode, prdName);