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

修改合并bug

release_toaliyun_real
xhxu 6 лет назад
Родитель
Сommit
44cf18a540
2 измененных файлов: 7 добавлений и 4 удалений
  1. +2
    -2
      mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml
  2. +5
    -2
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

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

@@ -206,8 +206,8 @@

<select id="findVoList" parameterType="com.iformall.domain.vo.WxCardVo" resultMap="VoBaseResultMap">
select <include refid="allVoColumns" />
from (select ci.`id`, ci.`tenant_id`, ci.`coupon_id`, ci.`transaction_id`, ci.`amount`, ci.`sale_amount`, ci.`remaining_amount`, ci.`service_fee_amount`, ci.`share_fee_amount`, ci.`remaining_share_fee_amount`, ci.`rate_amount`, ci.`create_date`, ci.`update_date` from wx_card_info ci where ci.`tenant_id` = #{tenantId}) ci
<!--from wx_card_info ci -->
<!--from (select ci.`id`, ci.`tenant_id`, ci.`coupon_id`, ci.`transaction_id`, ci.`amount`, ci.`sale_amount`, ci.`remaining_amount`, ci.`service_fee_amount`, ci.`share_fee_amount`, ci.`remaining_share_fee_amount`, ci.`rate_amount`, ci.`create_date`, ci.`update_date` from wx_card_info ci where ci.`tenant_id` = #{tenantId}) ci-->
from wx_card_info ci
left join wx_coupon c on c.id = ci.coupon_id
left join wx_coupon_order co on co.id = ci.id
left join wx_c_user cu on cu.id = co.c_user_id


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

@@ -626,6 +626,7 @@
<resultMap id="AdminBVoResultMap" type="com.iformall.domain.vo.WxCouponOrderBVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="sub_tenant_id" jdbcType="VARCHAR" property="subTenantId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
@@ -659,6 +660,7 @@
</resultMap>

<sql id="allAdminCouponOrderListColumns">
<!--
co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num,

@@ -675,7 +677,7 @@
cu.phone,m2.name as verify_merchant_name,cal.channel_type
-->

co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,
co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,
co.create_date,co.update_date,co.coupon_price, c.title,c.sale_price,c.use_price,c.price,
c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
@@ -727,7 +729,7 @@
FROM wx_coupon_merchant wcm
WHERE STATUS = 0 AND wcm.tenant_id = #{tenantId} GROUP BY product_id) couc
RIGHT JOIN (
SELECT co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type,
SELECT co.id,co.tenant_id,co.sub_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.coupon_type,
co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price
FROM wx_coupon_order co
WHERE co.tenant_id = #{tenantId}) co
@@ -990,6 +992,7 @@
<resultMap id="CVoResultMapOptimize" type="com.iformall.domain.vo.WxCouponOrderCVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="sub_tenant_id" jdbcType="VARCHAR" property="subTenantId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="coupon_type" jdbcType="INTEGER" property="couponType" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />


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