Commit 0e21508a by 徐康

delivery amount

parent d7215d30
...@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto; import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse; import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
import com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest; import com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest;
import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto; import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
...@@ -142,7 +143,7 @@ public class DeliveryAdapter { ...@@ -142,7 +143,7 @@ public class DeliveryAdapter {
deliveryOrderRequestDto.setDisplayOrderId(displayOrderId); deliveryOrderRequestDto.setDisplayOrderId(displayOrderId);
deliveryOrderRequestDto.setTaxFlag(1); deliveryOrderRequestDto.setTaxFlag(1);
if (CollectionUtils.isNotEmpty(order.getAccountList())) { if (CollectionUtils.isNotEmpty(order.getAccountList())) {
List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = order.getAccountList().stream().filter(type -> type != null && !type.equals(1)).collect(Collectors.toList()); List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = order.getAccountList().stream().filter(type -> type != null && type.equals(OldOrderAccountType.DELIVERY_AMOUNT.getCode())).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(collect)) { if (CollectionUtils.isNotEmpty(collect)) {
//配送费 //配送费
deliveryOrderRequestDto.setDeliveryTotal(collect.get(0).getPrice().intValue()); deliveryOrderRequestDto.setDeliveryTotal(collect.get(0).getPrice().intValue());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment