|
|
package com.yohoufo.order.service.proxy;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.fasterxml.jackson.databind.ser.std.ObjectArraySerializer;
|
|
|
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.OrderAttributes;
|
|
|
import com.yohobuy.ufo.model.order.constants.SkupType;
|
|
|
import com.yohoufo.dal.order.model.BuyerOrder;
|
|
|
import com.yohoufo.dal.order.model.SellerOrderGoods;
|
...
|
...
|
@@ -11,6 +13,7 @@ import com.yohoufo.dal.product.ProductMapper; |
|
|
import com.yohoufo.dal.product.model.Product;
|
|
|
import com.yohoufo.inboxclient.model.InBoxResponse;
|
|
|
import com.yohoufo.inboxclient.model.InboxReqVO;
|
|
|
import com.yohoufo.order.utils.BuyerOrderUtils;
|
|
|
import com.yohoufo.order.utils.SellerGoodsHelper;
|
|
|
import lombok.NonNull;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
...
|
...
|
@@ -21,6 +24,7 @@ import org.springframework.stereotype.Service; |
|
|
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
import java.util.Optional;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.function.Supplier;
|
...
|
...
|
@@ -430,7 +434,16 @@ public class BuyerNoticeFacade extends BaseNoticeFacade { |
|
|
}
|
|
|
|
|
|
private String buildGoodsTypeTagForBuyer(BuyerOrder buyerOrder, SellerOrderGoods sellerOrderGoods) {
|
|
|
return SellerGoodsHelper.buildBuyerOrderGoodsTypeTag(buyerOrder.getAttributes(), SkupType.getSkupType(sellerOrderGoods.getAttributes()));
|
|
|
SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes());
|
|
|
boolean isDepositOrder = BuyerOrderUtils.isDeposit(buyerOrder);
|
|
|
boolean isQuickDeliverGoods = SkupType.QUICK_DELIVER.equals(skupType);
|
|
|
if (isQuickDeliverGoods && isDepositOrder) {
|
|
|
return SkupType.QUICK_DELIVER.attrName() + SkupType.DEPOSIT.attrName();
|
|
|
} else if (isDepositOrder) {
|
|
|
return SkupType.DEPOSIT.attrName();
|
|
|
} else {
|
|
|
return skupType.attrName();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
} |
...
|
...
|
|