From 9947659740e7d6ffc010e49dad944f6442b988ec Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 26 Sep 2021 18:34:09 +0800 Subject: [PATCH] freightPrice --- .../main/java/com/iformall/domain/vo/WxOrderCouponVo.java | 6 ++++++ .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 3 +-- mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index 38f191bc3..976255e97 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -132,4 +132,10 @@ public class WxOrderCouponVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") private Integer shippingType; + @io.swagger.annotations.ApiModelProperty(value="配送状态 0:默认(无) 1*:自提 2*:配送",name="shippingStatus") + private Integer shippingStatus; + + @io.swagger.annotations.ApiModelProperty(value="配送信息",name="deliveryInfo") + private String deliveryInfo; + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 43b3b05ac..ce9b81dab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2170,10 +2170,9 @@ public class WxOrderServiceImpl implements WxOrderService { record.setFormId(orderdto.getSignleOrder().getFormId()); record.setPayment(price.getRealPayMent()); - record.setFreightPrice(coupon.getFreightPrice()); - record.setShippingType(orderdto.getShippingType()); if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(orderdto.getShippingType())){ + record.setFreightPrice(coupon.getFreightPrice()); record.setShippingAddress(JSON.toJSONString(orderdto.getAddress())); } diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 4c4fa1f12..4ed341455 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -344,6 +344,8 @@ + + --> - o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.`freight_price`,o.order_status,o.create_date,o.update_date, + o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, - o.compose_order_type,o.compose_order_id,o.`shipping_type`,o.`shipping_address` + o.compose_order_type,o.compose_order_id, + co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`