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

//售卖期bug

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
6c3269b312
3 измененных файлов: 20 добавлений и 20 удалений
  1. +2
    -2
      mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml
  2. +14
    -14
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml
  3. +4
    -4
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

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

@@ -20,8 +20,8 @@
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
<result column="send_type" jdbcType="INTEGER" property="sendType"/>
<result column="sold_start_date" jdbcType="TIMESTAMP" property="soldStartDate"/>
<result column="sold_end_date" jdbcType="TIMESTAMP" property="soldEndDate"/>
<result column="sold_start_time" jdbcType="TIMESTAMP" property="soldStartTime"/>
<result column="sold_end_time" jdbcType="TIMESTAMP" property="soldEndTime"/>
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>


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

@@ -20,8 +20,8 @@
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
<result column="send_type" jdbcType="INTEGER" property="sendType"/>
<result column="sold_start_date" jdbcType="TIMESTAMP" property="soldStartDate"/>
<result column="sold_end_date" jdbcType="TIMESTAMP" property="soldEndDate"/>
<result column="sold_start_time" jdbcType="TIMESTAMP" property="soldStartTime"/>
<result column="sold_end_time" jdbcType="TIMESTAMP" property="soldEndTime"/>
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
@@ -417,14 +417,14 @@
<select id="findSimpleDetail" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap">
select c.id,c.type,c.cover_img,c.title,c.sub_title,c.item_group,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,
c.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date,
c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date,
c.auto_refund,c.business,c.subsidy_type,c.source_type,c.merchant_type,c.content_type,c.gift_list,c.support_transfer,c.subsidy_num,
c.is_after_set_price,c.card_score_rule from wx_coupon c where c.id = #{id} and c.`tenant_id` = #{tenantId}
</select>
<select id="findCouponCVoDetail" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap">
select c.id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.item_group,c.sale_price,c.use_price,
c.use_limit_rule,c.use_limit_quantity,c.send_type,c.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date,
c.use_limit_rule,c.use_limit_quantity,c.send_type,c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date,
c.valid_days,c.detail,c.price,c.tail_price,c.orig_price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.is_after_set_price,c.card_score_rule,
c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price,c.conditions,c.content_type
from wx_coupon c where c.id = #{id} and c.`tenant_id` = #{tenantId}
@@ -434,7 +434,7 @@
<select id="findSimpleDetailList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap">
select c.id,c.type,c.cover_img,c.title,c.sub_title,c.item_group,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,
c.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date,
c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date,
c.auto_refund,c.business,c.subsidy_type,c.source_type,c.merchant_type,c.content_type,c.is_after_set_price,c.card_score_rule
from wx_coupon c
<include refid="dynamicWhereConditions"/>
@@ -792,8 +792,8 @@
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
<result column="send_type" jdbcType="INTEGER" property="sendType"/>
<result column="sold_start_date" jdbcType="TIMESTAMP" property="soldStartDate"/>
<result column="sold_end_date" jdbcType="TIMESTAMP" property="soldEndDate"/>
<result column="sold_start_time" jdbcType="TIMESTAMP" property="soldStartTime"/>
<result column="sold_end_time" jdbcType="TIMESTAMP" property="soldEndTime"/>
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
@@ -846,8 +846,8 @@
<result column="use_limit_rule" jdbcType="INTEGER" property="useLimitRule"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
<result column="send_type" jdbcType="INTEGER" property="sendType"/>
<result column="sold_start_date" jdbcType="TIMESTAMP" property="soldStartDate"/>
<result column="sold_end_date" jdbcType="TIMESTAMP" property="soldEndDate"/>
<result column="sold_start_time" jdbcType="TIMESTAMP" property="soldStartTime"/>
<result column="sold_end_time" jdbcType="TIMESTAMP" property="soldEndTime"/>
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
@@ -1367,7 +1367,7 @@
resultType="com.iformall.domain.po.WxCoupon">
select ct.id as id,wc.id as couponId,
wc.tenant_id,wc.parent_tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,wc.`title`,wc.`sub_title`,wc.`item_group`,wc.`sale_price`,wc.`freight_price`,wc.`use_price`,wc.`use_limit_rule`,wc.`use_limit_quantity`,wc.`send_type`,
wc.sold_start_date,wc.sold_end_date,wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.tail_price,wc.orig_price,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
wc.sold_start_time,wc.sold_end_time,wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.tail_price,wc.orig_price,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`,
wc.`press_limit_num`, wc.`press_limit_hours`,wc.`press_pay_reduce_stock`,wc.`press_support_is_new`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`,wc.`conditions`,
wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.`detail_picture` as detailPicture,wc.id as couponId
@@ -1399,7 +1399,7 @@
<select id="newfindCList" parameterType="com.iformall.domain.po.WxCoupon" resultMap="BaseResultMap">
select id,remain_inventory,inventory,cover_img,title,sub_title,item_group,sale_price,use_price,price,tail_price,
orig_price,unit,use_limit_rule,use_limit_quantity,send_type,support_transfer,press_limit_num,auto_refund,
conditions,valid_type,sold_start_date,sold_end_date,valid_start_date,valid_end_date,valid_days,credit_price,
conditions,valid_type,sold_start_time,sold_end_time,valid_start_date,valid_end_date,valid_days,credit_price,
remark,content_type,source_type,merchant_type
from wx_coupon where `tenant_id` = #{tenantId}
<if test=" null != id ">
@@ -1439,8 +1439,8 @@
<result column="title" jdbcType="VARCHAR" property="title"/>
<result column="sale_price" jdbcType="INTEGER" property="salePrice"/>
<result column="send_type" jdbcType="INTEGER" property="sendType"/>
<result column="sold_start_date" jdbcType="TIMESTAMP" property="soldStartDate"/>
<result column="sold_end_date" jdbcType="TIMESTAMP" property="soldEndDate"/>
<result column="sold_start_time" jdbcType="TIMESTAMP" property="soldStartTime"/>
<result column="sold_end_time" jdbcType="TIMESTAMP" property="soldEndTime"/>
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
@@ -1477,7 +1477,7 @@
<select id="ttCouponList" parameterType="com.iformall.domain.vo.TtCouponVo" resultMap="TtCouponVoResultMap">
select c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`type`,c.`cover_img`,
c.`title`,c.`sub_title`,c.`sale_price`,c.`freight_price`,c.`send_type`,
c.sold_start_date,c.sold_end_date,c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,
c.sold_start_time,c.sold_end_time,c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,
c.`valid_days`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`,
c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,
c.`auto_refund`,c.`credit_price`,c.`credit_refund`,


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

@@ -434,8 +434,8 @@
<result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>

<result column="sold_start_date" jdbcType="TIMESTAMP" property="soldStartDate"/>
<result column="sold_end_date" jdbcType="TIMESTAMP" property="soldEndDate"/>
<result column="sold_start_time" jdbcType="TIMESTAMP" property="soldStartTime"/>
<result column="sold_end_time" jdbcType="TIMESTAMP" property="soldEndTime"/>
<result column="valid_type" jdbcType="INTEGER" property="validType"/>
<result column="valid_start_date" jdbcType="TIMESTAMP" property="validStartDate"/>
<result column="valid_end_date" jdbcType="TIMESTAMP" property="validEndDate"/>
@@ -464,7 +464,7 @@
select 0 level,o.compose_order_type,o.compose_order_id,o.payment,o.order_status,o.create_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_time,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.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date,
c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date,
o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`
from wx_coupon c,wx_order o
where o.product_id = c.id and o.order_status in (0,2)
@@ -492,7 +492,7 @@
select 0 level, o.compose_order_type,o.compose_order_id,o.payment,o.order_status,o.create_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_time,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.sold_start_date,c.sold_end_date,c.valid_type,c.valid_start_date,c.valid_end_date,
c.sold_start_time,c.sold_end_time,c.valid_type,c.valid_start_date,c.valid_end_date,
o.`coupon_number`,o.`freight_price`,o.`shipping_type`,o.`shipping_address`
from wx_coupon c,wx_order o
where o.product_id = c.id and o.order_status in (1,3,4,5)


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