Authored by chenchao

寄存转现货发货后买家取消订单,买家订单详情页里违约金显示错误

... ... @@ -491,8 +491,12 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
String detailDesc = orderStatus.getDetailDesc(tabType,oa);
if (Objects.nonNull(orderStatus)
&& (OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.equals(orderStatus)
|| OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.equals(orderStatus))){
&& (
OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.equals(orderStatus)
|| OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.equals(orderStatus)
|| OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE_USE_DEPOSIT_GOODS.equals(orderStatus)
)
){
double penaltyAmount = tradeBillsService.queryBuyerPenaltyAmount(buyerOrder.getOrderCode());
detailDesc = String.format(detailDesc, penaltyAmount);
}
... ...