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 {
BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCodeUid(orderCode, buyerUid);
if(OrderStatus.HAS_PAYED.getCode() == buyerOrder.getStatus().intValue()){
LOGGER.info("ready notice sellerDeliverNotice, msg {}", msg);
inBoxFacade.sellerDeliverNotice(msg.getSellerOrderGoods(), 2);
inBoxFacade.sellerDeliverNotice(msg.getSellerOrderGoods(),orderCode, 2);
}
... ...
... ... @@ -91,7 +91,7 @@ public class SellerOrderCancelDeliverDelayMsgConsumer implements YhConsumer {
try{
payRefundService.refund(req, bleb);
//
inBoxFacade.sellerDeliverNotice(event.getSellerOrderGoods(), 3);
inBoxFacade.sellerDeliverNotice(event.getSellerOrderGoods(), orderCode,3);
}catch (Exception ex){
logger.warn("in topic {} , refund fail,req {}", getMessageTopic(), req, ex);
BillLogEvent buyererBillLogEvent = bleb.tradeStatus(BillTradeStatus.FAIL.getCode())
... ...
... ... @@ -89,7 +89,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
BuyerOrderGoods buyerOrderGoods = buyerOrderGoodsMapper.selectByOrderCode(uid, orderCode);
int skup = buyerOrderGoods.getSkup();
SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
inBoxFacade.sellerSkupPaidByBuyer(sellerOrderGoods);
inBoxFacade.sellerSkupPaidByBuyer(sellerOrderGoods,orderCode);
DeliverNoticeEvent deliverNoticeEvent = DeliverNoticeEvent.builder().skup(sellerOrderGoods.getId())
.sellerOrderGoods(sellerOrderGoods)
... ...
... ... @@ -108,7 +108,7 @@ public class InBoxFacade {
logger.warn("in sellerDeliver2Depot sms fail, buyerUid {} orderCode {} prdName {} ", buyerUid, orderCode,prdName);
return;
}
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_SELLER_DELIVER.getContent(),prdName);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_SELLER_DELIVER.getContent(),prdName,orderCode);
List<String> mobileList = Arrays.asList(phone);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record sellerDeliver2Depot inbox sms msg, buyerUid {}, orderCode {}, prdName {} phone {}",
... ... @@ -168,7 +168,7 @@ public class InBoxFacade {
logger.warn("in appraisePassNotice notice buyer sms fail, buyerUid {} orderCode {} prdName {} ", buyerUid, orderCode,prdName);
}else{
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_SEND.getContent(),prdName);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_SEND.getContent(),prdName,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record appraisePassNotice notice buyer sms msg, buyerUid {}, orderCode {}, prdName {} phone {}",
buyerUid, orderCode,prdName, phone);
... ... @@ -211,7 +211,7 @@ public class InBoxFacade {
//SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_SELLER;
//String content=smsIbt.getReplacedContent(prdName);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_SELLER.getContent(),prdName);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_SELLER.getContent(),prdName,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record noticeBuyerWhenSellerCancelAfterPaid inbox sms msg, buyerUid {}, orderCode {},prdName {}",
... ... @@ -270,7 +270,7 @@ public class InBoxFacade {
//SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM;
//String content=smsIbt.getReplacedContent(prdName);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_PLATFORM.getContent(),prdName);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_PLATFORM.getContent(),prdName,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record buyerGetEarnestMoneyWhenAppraiseFail inbox sms msg, buyerUid {}, orderCode {},prdName {}",
buyerUid, orderCode,prdName);
... ... @@ -382,7 +382,7 @@ public class InBoxFacade {
*
* @param sog SellerOrderGoods
*/
public void sellerSkupPaidByBuyer(SellerOrderGoods sog) {
public void sellerSkupPaidByBuyer(SellerOrderGoods sog,long orderCode) {
int sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
... ... @@ -403,7 +403,7 @@ public class InBoxFacade {
return;
}
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName,orderCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record sellerSkupPaidByBuyer inbox sms msg,sellerUid {}, prdName {}",
sellerUid, prdName);
... ... @@ -637,7 +637,7 @@ public class InBoxFacade {
}
}
public void sellerDeliverNotice(SellerOrderGoods sog, int times) {
public void sellerDeliverNotice(SellerOrderGoods sog,long orderCode, int times) {
int sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
... ... @@ -673,11 +673,11 @@ public class InBoxFacade {
if(times == 2 || times == 3){
String content = null;
if (times == 2) {
content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND.getContent(),prdName);
content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND.getContent(),prdName,orderCode);
}
if (times == 3) {
content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED.getContent(),prdName);
content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED.getContent(),prdName,orderCode);
}
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record sellerDeliverNotice inbox sms msg,sellerUid {}, prdName {}, times {},resp {}",
... ... @@ -723,7 +723,7 @@ public class InBoxFacade {
//SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM;
//String content=smsIbt.getReplacedContent(prdName);
String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),prdName);
String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record buyerCancelBeforeDepotReceive inbox sms msg, sellerUid {}, orderCode {},prdName {}",
sellerUid, orderCode, prdName);
... ... @@ -765,7 +765,7 @@ public class InBoxFacade {
//SmsContentEnum smsIbt=SmsContentEnum.SMS_CLOSED_PLATFORM;
//String content=smsIbt.getReplacedContent(prdName);
String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_PAID.getContent(),prdName);
String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_PAID.getContent(),orderCode,prdName);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record buyerCancelBeforeSellerDeliver inbox sms msg, sellerUid {}, orderCode {},prdName {}",
sellerUid, orderCode, prdName);
... ...