Просмотр исходного кода

freightPrice

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
9947659740
3 измененных файлов: 12 добавлений и 4 удалений
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
  2. +1
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  3. +5
    -2
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 6
- 0
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;

}

+ 1
- 2
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()));
}



+ 5
- 2
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Просмотреть файл

@@ -344,6 +344,8 @@

<result column="shipping_type" jdbcType="INTEGER" property="shippingType"/>
<result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/>
<result column="shipping_status" jdbcType="INTEGER" property="shippingStatus"/>
<result column="delivery_info" jdbcType="VARCHAR" property="deliveryInfo"/>

<collection column="{productId=product_id,tenantId=tenant_id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo"
@@ -360,9 +362,10 @@
</sql> -->

<sql id="allCUserOrderListColumns">
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`
</sql>

<select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap">


Загрузка…
Отмена
Сохранить