ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit e15ee4c758257953beb42517d15dbc6089836c96 1 parent 241fc537

fixbug

Inline Side-by-side
Showing 3 changed files with 35 additions and 55 deletions
... ... @@ -205,7 +205,7 @@ public class BuyerOrderCancelService {
}
if (noResponsibility){
inBoxFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode,reSellAfterCancel);
sellerNoticeFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode,reSellAfterCancel);
}else {
inBoxFacade.buyerCancelBeforeSellerDeliver(buyerOrder, penaltyAmount.toPlainString(), psog,reSellAfterCancel);
}
... ... @@ -330,7 +330,7 @@ public class BuyerOrderCancelService {
sellerOrderMapper.updateBySkups(soc, Arrays.asList(skup));
SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
if (noResponsibility){
inBoxFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode,false);
sellerNoticeFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode,false);
}else {
inBoxFacade.buyerCancelBeforeDepotReceive(buyerOrder, penaltyAmount.toPlainString(), psog, useDepositGoods);
}
... ...
... ... @@ -518,60 +518,7 @@ public class InBoxFacade extends BaseNoticeFacade{
sellerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,sog, isAutoReSell);
}
/**
* 买家在24小时内取消预售
* 站内：您的商品「商品名称」「尺码」，已被买家取消，您出售的商品已下架，保证金将于1个工作日内退回您的账户。
* 短信：买家已取消订单，订单编号{}。您的商品「商品名称」已下架，更多信息请查看Yoho!Buy有货APP [我的-球鞋交易-出售]。
*/
public void noticeSellerWhenBuyerCancelNoResponsibility(SellerOrderGoods sog, long orderCode,boolean autoReSell){
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
try {
executorService.execute(()->{
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
String goodsTypeTag = buildGoodsTypeTagForSeller(sog);
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(goodsTypeTag,prdName, sizeName,productCode);
InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
InBoxResponse resp = inBoxSDK.addInbox(req);
log.info("record noticeSellerWhenBuyerCancelNoResponsibility to seller inbox msg, sellerUid {}, orderCode {},prdName {} resp {}",
sellerUid, orderCode,prdName, resp);
//发push
SendMessageRspBo bo = ufoSendService.buyerCancelBooking(String.valueOf(sellerUid),String.valueOf(orderCode),prdName, sizeName,productCode);
log.info("record noticeSellerWhenBuyerCancelNoResponsibility push seller uid is {}, orderCode is {}, result is {}", sellerUid, orderCode, JSON.toJSONString(bo));
//短信
String phone = userProxyService.getMobile(sellerUid);
if (StringUtils.isBlank(phone)){
log.warn("in noticeSellerWhenBuyerCancelNoResponsibility sms fail, sellerUid {} orderCode {} prdName {}", sellerUid, orderCode,prdName);
return;
}
List<String> mobileList = Arrays.asList(phone);
InboxBusinessTypeEnum sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
if(autoReSell){
sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
}
String content = buildSmsContent(sms, orderCode,goodsTypeTag, prdName,sizeName,productCode);
sendSmsService.smsSendByMobile(content,mobileList);
log.info("record noticeSellerWhenBuyerCancelNoResponsibility inbox sms msg, sellerUid {}, orderCode {},prdName {}",
sellerUid, orderCode, prdName);
});
} catch (Exception e) {
log.warn("InBoxFacade noticeSellerWhenBuyerCancelNoResponsibility error inbox msg, sellerUid {}, orderCode {} ,prdName {}",
sellerUid, orderCode, prdName, e);
}
}
public void noticeFastDeliverySeller(Integer uid, BigDecimal theshold){
... ...
... ... @@ -712,4 +712,37 @@ public class SellerNoticeFacade extends BaseNoticeFacade {
}
}
/**
* 买家在24小时内取消预售
* 站内：您的商品「商品名称」「尺码」，已被买家取消，您出售的商品已下架，保证金将于1个工作日内退回您的账户。
* 短信：买家已取消订单，订单编号{}。您的商品「商品名称」已下架，更多信息请查看Yoho!Buy有货APP [我的-球鞋交易-出售]。
*/
public void noticeSellerWhenBuyerCancelNoResponsibility(SellerOrderGoods sog, long orderCode, boolean autoReSell) {
Integer sellerUid = sog.getUid();
String prdName = sog.getProductName();
String sizeName = sog.getSizeName();
try {
Product product = productMapper.selectByPrimaryKey(sog.getProductId());
String productCode = product.getProductCode();
String goodsTypeTag = buildGoodsTypeTagForSeller(sog);
InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
if (autoReSell) {
ibt = InboxBusinessTypeEnum.NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
}
InboxBusinessTypeEnum sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
if (autoReSell) {
sms = InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
}
newSellerNotice(sog)
.withLogPrefix("notice seller when buyer cancel no responsibility")
.withInBox(ibt, goodsTypeTag, prdName, sizeName, productCode)
.withPush(() -> ufoSendService.buyerCancelBooking(String.valueOf(sellerUid), String.valueOf(orderCode), prdName, sizeName, productCode))
.withSms(sms, orderCode, goodsTypeTag, prdName, sizeName, productCode)
.send();
} catch (Exception e) {
log.warn("notice seller when buyer cancel no responsibility fail, sellerUid {}, orderCode {} ,prdName {}", sellerUid, orderCode, prdName, e);
}
}
}
... ...