|
|
@@ -362,7 +362,8 @@
|
|
|
LEFT JOIN `order` o ON og.order_sn = o.order_sn
|
|
|
LEFT JOIN `user` u ON o.user_id = u.user_id
|
|
|
WHERE og.`status` = 1
|
|
|
- AND og.refund_status IN (0, 1, 3)
|
|
|
+-- AND og.refund_status IN (0, 1, 3)
|
|
|
+ AND og.refund_status IN (0,3)
|
|
|
AND og.pay_status IN (2, 3, 4)
|
|
|
AND og.goods_id = #{goodsId}
|
|
|
</select>
|
|
|
@@ -400,7 +401,8 @@
|
|
|
1 = 1
|
|
|
AND g.goods_type = 6
|
|
|
AND og.pay_status IN ( 2, 3, 4 )
|
|
|
- AND og.refund_status IN (0,3,1)
|
|
|
+-- AND og.refund_status IN (0,3,1)
|
|
|
+ AND og.refund_status IN (0,3)
|
|
|
<if test="goodsId != null and goodsId != ''">
|
|
|
AND og.goods_id = #{goodsId}
|
|
|
</if>
|
|
|
@@ -436,7 +438,8 @@
|
|
|
AND o.user_id=#{userId}
|
|
|
AND og.`status` =1
|
|
|
and og.pay_status in (2,3,4)
|
|
|
- AND og.refund_status in (0,3,1)
|
|
|
+-- AND og.refund_status in (0,3,1)
|
|
|
+ AND og.refund_status in (0,3)
|
|
|
<if test="educationTypeId != null and educationTypeId != ''">
|
|
|
AND g.education_type_id = #{educationTypeId}
|
|
|
</if>
|
|
|
@@ -495,7 +498,8 @@
|
|
|
AND o.user_id=#{userId}
|
|
|
AND og.`status` =1
|
|
|
and og.pay_status in (2,3,4)
|
|
|
- AND og.refund_status in (0,3,1)
|
|
|
+-- AND og.refund_status in (0,3,1)
|
|
|
+ AND og.refund_status in (0,3)
|
|
|
<if test="educationTypeId != null and educationTypeId != ''">
|
|
|
AND g.education_type_id = #{educationTypeId}
|
|
|
</if>
|
|
|
@@ -572,7 +576,8 @@
|
|
|
WHERE
|
|
|
o.user_id = #{userId}
|
|
|
AND og.pay_status IN ( 2, 3, 4 )
|
|
|
- AND og.refund_status != 2
|
|
|
+-- AND og.refund_status != 2
|
|
|
+ AND og.refund_status IN (0,3)
|
|
|
AND og.STATUS = 1
|
|
|
AND o.`status` = 1
|
|
|
AND g.`status` = 1
|
|
|
@@ -596,7 +601,8 @@
|
|
|
WHERE
|
|
|
o.user_id = #{userId}
|
|
|
AND og.pay_status IN ( 2, 3, 4 )
|
|
|
- AND og.refund_status != 2
|
|
|
+-- AND og.refund_status != 2
|
|
|
+ AND og.refund_status IN (0,3)
|
|
|
AND og.STATUS = 1
|
|
|
AND o.`status` = 1
|
|
|
AND g.`status` = 1
|
|
|
@@ -622,7 +628,8 @@
|
|
|
WHERE
|
|
|
o.user_id = #{userId}
|
|
|
AND og.pay_status IN ( 2, 3, 4 )
|
|
|
- AND og.refund_status != 2
|
|
|
+-- AND og.refund_status != 2
|
|
|
+ AND og.refund_status IN (0,3)
|
|
|
AND og.STATUS = 1
|
|
|
AND o.`status` = 1
|
|
|
AND g.`status` = 1
|