| @@ -70,7 +70,8 @@ | |||||
| select o.id orderId,o.order_status orderStatus,o.order_group_id orderGroupId,c.title,c.sub_title subTitle, | select o.id orderId,o.order_status orderStatus,o.order_group_id orderGroupId,c.title,c.sub_title subTitle, | ||||
| c.sale_price salePrice,c.cover_img coverImg,g.remain_people remainPeople,c.id couponId,g.expired_date | c.sale_price salePrice,c.cover_img coverImg,g.remain_people remainPeople,c.id couponId,g.expired_date | ||||
| expiredDate,g.status,g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl,o.tenant_id tenantId, | expiredDate,g.status,g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl,o.tenant_id tenantId, | ||||
| o.coupon_channel_id couponChannelId,c.press_limit_num pressLimitNum,c.status couponStatus | |||||
| o.coupon_channel_id couponChannelId,c.press_limit_num pressLimitNum, | |||||
| (select status from wx_coupon_channel where id=o.coupon_channel_id) couponStatus | |||||
| from wx_order o | from wx_order o | ||||
| left join wx_coupon c on o.product_id=c.id | left join wx_coupon c on o.product_id=c.id | ||||
| left join wx_order_group g on o.order_group_id=g.id | left join wx_order_group g on o.order_group_id=g.id | ||||
| @@ -205,7 +205,7 @@ | |||||
| <update id="updateOrderGroupStatusByCouponId" parameterType="com.iformall.domain.po.WxOrder"> | <update id="updateOrderGroupStatusByCouponId" parameterType="com.iformall.domain.po.WxOrder"> | ||||
| update wx_order set order_status=#{orderStatus},update_date=#{updateDate} | update wx_order set order_status=#{orderStatus},update_date=#{updateDate} | ||||
| where product_id=#{productId} and order_status = 10 | |||||
| where product_id=#{productId} and order_status in(10,15) | |||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||
| @@ -213,7 +213,7 @@ | |||||
| <update id="updateOrderGroupStatusByCouponChannelId" parameterType="com.iformall.domain.po.WxOrder"> | <update id="updateOrderGroupStatusByCouponChannelId" parameterType="com.iformall.domain.po.WxOrder"> | ||||
| update wx_order set order_status=#{orderStatus},update_date=#{updateDate} | update wx_order set order_status=#{orderStatus},update_date=#{updateDate} | ||||
| where coupon_channel_id=#{couponChannelId} and order_status = 10 | |||||
| where coupon_channel_id=#{couponChannelId} and order_status in(10,15) | |||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||