Authored by chenchao

add tariff price in order detail

... ... @@ -180,6 +180,10 @@ public class OrderDetailInfo {
* 运费券金额
*/
String shippingCouponCutPrice;
/**
* 税费
*/
String tariffPrice;
/**
* 实付金额
... ...
package com.yohoufo.order.service.impl;
import com.google.common.collect.Lists;
import com.yoho.core.common.utils.YHMath;
import com.yoho.error.ServiceError;
import com.yoho.error.exception.ServiceException;
import com.yohobuy.ufo.model.order.bo.ButtonShowBo;
... ... @@ -10,6 +11,7 @@ import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
import com.yohobuy.ufo.model.order.common.ButtonShow;
import com.yohobuy.ufo.model.order.common.OrderStatus;
import com.yohobuy.ufo.model.order.common.TabType;
import com.yohobuy.ufo.model.order.constants.RegionEnum;
import com.yohobuy.ufo.model.order.constants.SkupType;
import com.yohobuy.ufo.model.order.resp.ExpressInfoDetail;
import com.yohobuy.ufo.model.order.vo.AddressInfo;
... ... @@ -27,6 +29,7 @@ import com.yohoufo.order.model.response.OrderDetailInfo;
import com.yohoufo.order.service.IBuyerOrderMetaService;
import com.yohoufo.order.service.IExpressInfoService;
import com.yohoufo.order.service.IOrderDetailService;
import com.yohoufo.order.service.seller.support.SkupTypeCodeSupport;
import com.yohoufo.order.service.support.BuyerOrderMetaMapperSupport;
import com.yohoufo.order.utils.*;
import lombok.Builder;
... ... @@ -244,6 +247,11 @@ public abstract class AbsOrderDetailService extends AbsOrderViewService implemen
.shippingCouponCutPrice(MathUtils.formatStr(amountDetailBo.getShippingCouponCutAmount()))
.realPayPrice(buyerOrder.getAmount() == null ? "0" : buyerOrder.getAmount().toPlainString())
.build();
SkupTypeCodeSupport.CodeNode codeNode = SkupTypeCodeSupport.explain(buyerOrder.getAttributes());
if (codeNode.getRegion() == RegionEnum.HONGKONG.getCode()){
double finalTariffPrice = YHMath.sub(amountDetailBo.getTariffAmount(), amountDetailBo.getTariffCutAmount());
priceInfo.setTariffPrice(MathUtils.formatStr(finalTariffPrice));
}
} else {
//priceInfo
priceInfo = OrderDetailInfo.PriceInfo.builder()
... ...