ufo / yohoufo-fore · Commits

Go to a project

Authored by qinchao
Commit aefc81ff80dc71e3e84060dd0c2f508ac1c06cf9 2 parents 2b22e12a e36b9e29

Merge branch 'dev_消息拆分697fromMaster' into test6.9.7

Inline Side-by-side
Showing 1 changed file with 68 additions and 44 deletions
... ... @@ -5,6 +5,7 @@ import com.yoho.message.sdk.common.model.SendMessageRspBo;
import com.yoho.message.sdk.service.ufo.IUFOSendService;
import com.yohobuy.ufo.model.enums.InboxBusinessTypeEnum;
import com.yohobuy.ufo.model.order.common.SuperEnterStageLevel;
import com.yohobuy.ufo.model.order.constants.SkupType;
import com.yohoufo.dal.order.SellerOrderMapper;
import com.yohoufo.dal.order.model.SellerOrder;
import com.yohoufo.dal.order.model.SellerOrderGoods;
... ... @@ -124,6 +125,7 @@ public class InBoxFacade {
public void sellerDeliver2Depot(int buyerUid, long orderCode,SellerOrderGoods psog ){
executorService.execute(()-> {
try {
String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
String prdName = psog.getProductName();
InboxBusinessTypeEnum ibtOfBuyer = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_SELLER_DELIVER;
String params = buildParams(orderCode);
... ... @@ -146,7 +148,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,sizeName,productCode,orderCode);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_SELLER_DELIVER.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
List<String> mobileList = Arrays.asList(phone);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record sellerDeliver2Depot inbox sms msg, buyerUid {}, orderCode {}, prdName {} phone {}",
... ... @@ -171,7 +173,7 @@ public class InBoxFacade {
try {
logger.info("record noticeBuyerWhenDeliveryGoodsToBuyer inbox msg, buyerUid {}, orderCode {}, psog {},SellerOrderGoods {} product {}",
buyerUid, orderCode, psog, JSON.toJSONString(psog), JSON.toJSONString(product));
String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
String prdName = psog.getProductName();
String sizeName = psog.getSizeName();
String productCode = Optional.ofNullable(product).map(Product::getProductCode).orElse("");
... ... @@ -198,7 +200,7 @@ public class InBoxFacade {
logger.warn("in noticeBuyerWhenDeliveryGoodsToBuyer 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,sizeName,productCode,orderCode);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_SEND.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record noticeBuyerWhenDeliveryGoodsToBuyer notice buyer sms msg, buyerUid {}, orderCode {}, prdName {} phone {}",
buyerUid, orderCode,prdName, phone);
... ... @@ -223,6 +225,7 @@ public class InBoxFacade {
try {
logger.info("record appraisePassNotice inbox msg, buyerUid {}, orderCode {}, psog {},SellerOrderGoods {} product {}",
buyerUid, orderCode, psog, JSON.toJSONString(psog), JSON.toJSONString(product));
String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
String prdName = psog.getProductName();
String sizeName = psog.getSizeName();
String productCode = Optional.ofNullable(product).map(Product::getProductCode).orElse("");
... ... @@ -240,7 +243,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,sizeName,productCode,orderCode);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_SEND.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record appraisePassNotice notice buyer sms msg, buyerUid {}, orderCode {}, prdName {} phone {}",
buyerUid, orderCode,prdName, phone);
... ... @@ -266,8 +269,9 @@ public class InBoxFacade {
//seller notice
String sizeName = psog.getSizeName();
Integer sellerUid = psog.getUid();
String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_APPRAISE_PASS;
String paramsOfSeller = buildParams(prdName, sizeName,productCode);
String paramsOfSeller = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller);
InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller);
... ... @@ -278,7 +282,7 @@ public class InBoxFacade {
logger.warn("in appraisePassNoticeSeller sms fail, buyerUid {} orderCode {} prdName {} ", buyerUid, orderCode,prdName);
}else{
List<String> mobileList = Arrays.asList(phoneOfSeller);
String contentOfSeller = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_APPRAISE_PASS.getContent(), orderCode);
String contentOfSeller = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_APPRAISE_PASS.getContent(),skupTypeText, orderCode);
sendSmsService.smsSendByMobile(contentOfSeller, mobileList);
logger.info("record appraisePassNoticeSeller sms msg notice seller, sellerUid {}, orderCode {}, prdName {} sizeName {} phone {}",
sellerUid, orderCode, prdName, sizeName, phoneOfSeller);
... ... @@ -307,6 +311,7 @@ public class InBoxFacade {
public void noticeBuyerWhenSellerCancelAfterPaid(int buyerUid, long orderCode,SellerOrderGoods psog ) {
try {
executorService.execute(()->{
String skupTypeText = SkupType.getSkupType(psog.getAttributes()).attrName();
String prdName = psog.getProductName();
String sizeName =psog.getSizeName();
Product product = productMapper.selectByPrimaryKey(psog.getProductId());
... ... @@ -332,7 +337,7 @@ public class InBoxFacade {
}
List<String> mobileList = Arrays.asList(phone);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_SELLER.getContent(),prdName,productCode,sizeName,orderCode);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_SELLER.getContent(),skupTypeText,prdName,productCode,sizeName,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record noticeBuyerWhenSellerCancelAfterPaid inbox sms msg, buyerUid {}, orderCode {},prdName {}",
... ... @@ -373,6 +378,7 @@ public class InBoxFacade {
public void buyerGetEarnestMoneyWhenAppraiseFail(int buyerUid, long orderCode,SellerOrderGoods sellerOrderGoods ) {
try {
executorService.execute(()->{
String skupTypeText=SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName();
String prdName = sellerOrderGoods.getProductName();
String sizeName=sellerOrderGoods.getSizeName();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.PURCHASE_CLOSED_PLATFORM;
... ... @@ -394,7 +400,7 @@ public class InBoxFacade {
}
List<String> mobileList = Arrays.asList(phone);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_PLATFORM.getContent(),prdName,sizeName,productCode,orderCode);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_CLOSED_PLATFORM.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record buyerGetEarnestMoneyWhenAppraiseFail inbox sms msg, buyerUid {}, orderCode {},prdName {}",
buyerUid, orderCode,prdName);
... ... @@ -432,6 +438,7 @@ public class InBoxFacade {
public void noticeBuyerWhenQualityCheckNotPass(int buyerUid, long orderCode,SellerOrderGoods sellerOrderGoods) {
try {
executorService.execute(() -> {
String skupTypeText=SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName();
String prdName = sellerOrderGoods.getProductName();
String sizeName = sellerOrderGoods.getSizeName();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_QUALITY_NOT_PASS;
... ... @@ -457,7 +464,7 @@ public class InBoxFacade {
String productCode = product.getProductCode();
List<String> mobileList = Arrays.asList(phone);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_QUALITY_NOT_PASS.getContent(),prdName,sizeName,productCode,orderCode);
String content=getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_QUALITY_NOT_PASS.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record noticeBuyerWhenQualityCheckNotPass inbox sms msg, buyerUid {}, orderCode {}, prdName {}",
... ... @@ -477,6 +484,7 @@ public class InBoxFacade {
executorService.execute(() -> {
logger.info("record buyerMiniFaultCreate inbox enter, buyerUid {} ,orderCode {} ,psog {},product {}",
buyerUid, orderCode ,psog, JSON.toJSONString(product));
String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
String prdName = psog.getProductName();
String sizeName = psog.getSizeName();
String productCode = Optional.ofNullable(product).map(Product::getProductCode).orElse("");
... ... @@ -501,7 +509,7 @@ public class InBoxFacade {
return;
}
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_CHECK_ORDER_PROBLEM.getContent(),prdName,sizeName,productCode,orderCode);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_CHECK_ORDER_PROBLEM.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record buyerMiniFaultCreate inbox sms msg,buyerUid {}, orderCode {},prdName {}",
buyerUid ,orderCode,prdName);
... ... @@ -519,6 +527,7 @@ public class InBoxFacade {
try {
executorService.execute(() -> {
String skupTypeText=SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName();
String prdName = sellerOrderGoods.getProductName();
String sizeName =sellerOrderGoods.getSizeName();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT;
... ... @@ -553,7 +562,7 @@ public class InBoxFacade {
if(outTimeFlag){
sms = InboxBusinessTypeEnum.SMS_NOTICE_BUYER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME;
}
String content = getReplacedContent(sms.getContent(),prdName,sizeName,productCode,orderCode);
String content = getReplacedContent(sms.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record buyerQualityCheckNotPass inbox sms msg,buyerUid {}, prdName {},orderCode {}",
buyerUid , prdName,orderCode);
... ... @@ -623,13 +632,14 @@ public class InBoxFacade {
public void sellerPlaySelf(int sellerUid,SellerOrderGoods sellerOrderGoods) {
try {
executorService.execute(() -> {
String skupTypeText=SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName();
String prdName = sellerOrderGoods.getProductName();
String sizeName = sellerOrderGoods.getSizeName();
Product product = productMapper.selectByPrimaryKey(sellerOrderGoods.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_UNSHELF;
String params = buildParams(prdName,sizeName,productCode);
String params = buildParams(skupTypeText,prdName,sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -653,13 +663,14 @@ public class InBoxFacade {
public void sellerSkupCreateOrderByBuyer(int sellerUid, SellerOrderGoods psog) {
try {
executorService.execute(() -> {
String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
String prdName = psog.getProductName();
String sizeName = psog.getSizeName();
Product product = productMapper.selectByPrimaryKey(psog.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SELLED;
String params = buildParams(prdName,sizeName,productCode);
String params = buildParams(skupTypeText,prdName,sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -680,6 +691,7 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(() -> {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
... ... @@ -688,7 +700,7 @@ public class InBoxFacade {
if(outTimeFlag){
ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME;
}
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -706,7 +718,7 @@ public class InBoxFacade {
if(outTimeFlag){
sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_MINI_FAULT_UN_ACCEPT_OUT_TIME;
}
String content = getReplacedContent(sms.getContent(),prdName,sizeName,productCode,orderCode);
String content = getReplacedContent(sms.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record sellerMiniFaultUnAccept inbox sms msg,sellerUid {}, prdName {},orderCode {}",
sellerUid, prdName,orderCode);
... ... @@ -725,12 +737,13 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(() -> {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_QUALITY_CHECK_REJECT;
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -744,7 +757,7 @@ public class InBoxFacade {
return;
}
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_QUALITY_CHECK_REJECT.getContent(),prdName,sizeName,productCode,orderCode);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_QUALITY_CHECK_REJECT.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record sellerQualityCheckNotPass inbox sms msg,sellerUid {}, prdName {},orderCode {}",
sellerUid, prdName,orderCode);
... ... @@ -762,12 +775,13 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(() -> {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_EXPRESS_QUALITY_CHECK_REJECT;
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -787,7 +801,7 @@ public class InBoxFacade {
}else if(type==3){
sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_EXPRESS_MINI_FAULT_UN_ACCEPT_OUT_TIME;
}
String content = getReplacedContent(sms.getContent(),prdName,sizeName,productCode,orderCode,wayBillCode);
String content = getReplacedContent(sms.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode,wayBillCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record sellerQualityCheckNotPass_send_back inbox sms msg,sellerUid {}, prdName {},type {},orderCode {}",
sellerUid, prdName,type,orderCode);
... ... @@ -811,11 +825,12 @@ public class InBoxFacade {
String sizeName = sog.getSizeName();
try {
executorService.execute(() -> {
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_SEND;
String timelimitDesc = new StringBuilder().append(deliveryTimeLimit).append(unit).toString();
String params = buildParams(prdName, sizeName,productCode, timelimitDesc);
String params = buildParams(skupTypeText,prdName, sizeName,productCode, timelimitDesc);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -834,7 +849,7 @@ public class InBoxFacade {
return;
}
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),prdName,sizeName,productCode,orderCode,timelimitDesc);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_SEND.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode,timelimitDesc);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record sellerSkupPaidByBuyer inbox sms msg,sellerUid {}, prdName {},orderCode {} timelimitDesc {}",
sellerUid, prdName,orderCode, timelimitDesc);
... ... @@ -856,12 +871,12 @@ public class InBoxFacade {
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
try {
executorService.execute(() -> {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
executorService.execute(() -> {
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_CLOSED_SELLER;
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -926,12 +941,13 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(() -> {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_CLOSED_PLATFORM;
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -946,7 +962,7 @@ public class InBoxFacade {
return;
}
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_CLOSED_PLATFORM.getContent(),prdName,sizeName,productCode,orderCode,wayBillCode);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_CLOSED_PLATFORM.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode,wayBillCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record noticeSellerWhenAppraiseFail sms send,sellerUid {}, prdName {},orderCode {},wayBillCode {} ",
sellerUid, prdName,orderCode,wayBillCode);
... ... @@ -968,12 +984,13 @@ public class InBoxFacade {
public void notifyUnshelfCauseBySpecialReason(int sellerUid,SellerOrderGoods psog ) {
try {
executorService.execute(() -> {
String skupTypeText=SkupType.getSkupType(psog.getAttributes()).attrName();
String prdName = psog.getProductName();
String sizeName = psog.getSizeName();
Product product = productMapper.selectByPrimaryKey(psog.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.SALE_NOTIFIED_UNSHELF;
String params = buildParams(prdName,sizeName,productCode);
String params = buildParams(skupTypeText,prdName,sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -992,7 +1009,7 @@ public class InBoxFacade {
return;
}
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_UNSHELF.getContent(),prdName,sizeName,productCode);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTIFIED_UNSHELF.getContent(),skupTypeText,prdName,sizeName,productCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record notifyUnshelfCauseBySpecialReason inbox sms msg,sellerUid {}, prdName {}, resp {}",
sellerUid, prdName);
... ... @@ -1221,12 +1238,13 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(() -> {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_APPRAISE_UNSURE_SEND_BACK;
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -1242,7 +1260,7 @@ public class InBoxFacade {
List<String> mobileList = Arrays.asList(phone);
InboxBusinessTypeEnum sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_APPRAISE_UNSURE_SEND_BACK;
String content = getReplacedContent(sms.getContent(),prdName,sizeName,productCode,orderCode,wayBillCode);
String content = getReplacedContent(sms.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode,wayBillCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("record sellerAppraiseUnsure_send_back inbox sms msg,sellerUid {}, prdName {},orderCode {}",
sellerUid, prdName,orderCode);
... ... @@ -1258,13 +1276,14 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(() -> {
// 发站内信
logger.info("record seller sham send out inbox sms msg for seller,sellerUid {}, prdName {}", sellerUid, prdName);
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, InboxBusinessTypeEnum.NOTICE_SELLER_SELLER_SHAM_SEND_OUT);
InBoxResponse resp = inBoxSDK.addInbox(req);
logger.info("record seller sham send out inbox msg,sellerUid {}, prdName {},sizeName {} resp {}",
... ... @@ -1276,7 +1295,7 @@ public class InBoxFacade {
return;
}
List<String> mobileList = Arrays.asList(phone);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_SELLER_SHAM_SEND_OUT.getContent(),prdName,sizeName,productCode);
String content = getReplacedContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_SELLER_SHAM_SEND_OUT.getContent(),skupTypeText,prdName,sizeName,productCode);
sendSmsService.smsSendByMobile(content, mobileList);
logger.info("seller sham send out msg,sellerUid {}, prdName {}", sellerUid, prdName);
});
... ... @@ -1385,6 +1404,7 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
InboxBusinessTypeEnum ibt;
InboxBusinessTypeEnum smsInboxBusinessTypeEnum;
String params ;
... ... @@ -1393,15 +1413,15 @@ public class InBoxFacade {
String productCode = product.getProductCode();
try {
if (times == 2) {
params = buildParams(prdName, sizeName,productCode, leftTime, timeUnit);
params = buildParams(skupTypeText,prdName, sizeName,productCode, leftTime, timeUnit);
ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS;
smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_SECOND;
content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,sizeName,productCode,leftTime,timeUnit,orderCode);
content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),skupTypeText,prdName,sizeName,productCode,leftTime,timeUnit,orderCode);
} else if (times == 3) {
params = buildParams(prdName, sizeName,productCode);
params = buildParams(skupTypeText,prdName, sizeName,productCode);
ibt = InboxBusinessTypeEnum.NOTICE_SELLER_DELIVER_GOODS_FAIL;
smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTIFIED_SEND_FAILED;
content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),prdName,sizeName,productCode,orderCode);
content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),skupTypeText,prdName,sizeName,productCode,orderCode);
} else {
return;
}
... ... @@ -1435,6 +1455,7 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
InboxBusinessTypeEnum ibt;
InboxBusinessTypeEnum smsInboxBusinessTypeEnum;
... ... @@ -1443,10 +1464,10 @@ public class InBoxFacade {
try {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
params = buildParams(prdName, sizeName,productCode);
params = buildParams(skupTypeText,prdName, sizeName,productCode);
ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_APPRAISE_UNSURE;
smsInboxBusinessTypeEnum = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_APPRAISE_UNSURE;
content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(), prdName, sizeName,productCode,orderCode);
content = getReplacedContent(smsInboxBusinessTypeEnum.getContent(),skupTypeText, prdName, sizeName,productCode,orderCode);
executorService.execute(() -> {
... ... @@ -1478,6 +1499,7 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(()->{
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
... ... @@ -1492,7 +1514,7 @@ public class InBoxFacade {
buyerUid, orderCode,prdName, resp);
//seller
InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_BY_BUYER_AFTER_DELIVERY;
String paramsOfSeller = buildParams(prdName, sizeName,productCode);
String paramsOfSeller = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller);
InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller);
logger.info("record buyerCancelBeforeDepotReceive to seller inbox msg, sellerUid {}, orderCode {},prdName {} resp {}",
... ... @@ -1511,7 +1533,7 @@ public class InBoxFacade {
}
List<String> mobileList = Arrays.asList(phone);
String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),orderCode);
String content= getReplacedContent(InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_DELIVERY.getContent(),skupTypeText,prdName, sizeName,productCode,orderCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record buyerCancelBeforeDepotReceive inbox sms msg, sellerUid {}, orderCode {},prdName {}",
sellerUid, orderCode, prdName);
... ... @@ -1536,12 +1558,13 @@ public class InBoxFacade {
executorService.execute(()->{
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
if(autoReSell){
ibt = InboxBusinessTypeEnum.NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
}
String params = buildParams(prdName, sizeName,productCode);
String params = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
... ... @@ -1565,7 +1588,7 @@ public class InBoxFacade {
if(autoReSell){
sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
}
String content = replaceSMSContent(sms, orderCode, prdName,sizeName,productCode);
String content = replaceSMSContent(sms,skupTypeText, orderCode, prdName,sizeName,productCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record noticeSellerWhenBuyerCancelNoResponsibility inbox sms msg, sellerUid {}, orderCode {},prdName {}",
sellerUid, orderCode, prdName);
... ... @@ -1580,6 +1603,7 @@ public class InBoxFacade {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
String skupTypeText=SkupType.getSkupType(sog.getAttributes()).attrName();
try {
executorService.execute(()->{
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.PURCHASE_CLOSED_BY_BUYER_AFTER_PAID;
... ... @@ -1596,7 +1620,7 @@ public class InBoxFacade {
if(autoReSellFlag){
ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
}
String paramsOfSeller = buildParams(prdName, sizeName,productCode);
String paramsOfSeller = buildParams(skupTypeText,prdName, sizeName,productCode);
InboxReqVO reqOfSeller = buildInboxReqVO(sellerUid, paramsOfSeller, ibtOfSeller);
InBoxResponse respOfSeller = inBoxSDK.addInbox(reqOfSeller);
logger.info("record buyerCancelBeforeSellerDeliver to seller inbox msg, sellerUid {}, orderCode {},prdName {} resp {}",
... ... @@ -1619,7 +1643,7 @@ public class InBoxFacade {
if(autoReSellFlag){
sms=InboxBusinessTypeEnum.SMS_CANCELED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
}
String content= getReplacedContent(sms.getContent(),orderCode,prdName,sizeName,productCode);
String content= getReplacedContent(sms.getContent(),skupTypeText,orderCode,prdName,sizeName,productCode);
sendSmsService.smsSendByMobile(content,mobileList);
logger.info("record buyerCancelBeforeSellerDeliver inbox sms msg, sellerUid {}, orderCode {},prdName {} ,sizeName {} ,productCode {}",
sellerUid, orderCode, prdName,sizeName,productCode);
... ...