SHA1
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,10 @@
 
				 /nbbuild/
			
 
				 /dist/
			
 
				 /nbdist/
			
 
				-/.nb-gradle/
			
 
				+/.nb-gradle/
			
 
				+
			
 
				+
			
 
				+### Maven ###
			
 
				+target/
			
 
				+**/target
			
 
				+**/target/
			
--- a/kmall-api/src/main/resources/mybatis/mapper/ApiOrderMapper.xml
+++ b/kmall-api/src/main/resources/mybatis/mapper/ApiOrderMapper.xml
@@ -756,7 +756,7 @@
 
				 
			
 
				     <select id="queryOrderByMerchOrderSnAndRefundStatus" resultMap="orderMap">
			
 
				         select * from mall_order o inner join mall_order_refund r on r.order_id = o.id where o.merch_order_sn = #{merchOrderSn}
			
 
				-         and r.refund_status = 2
			
 
				+         and r.refund_status = 5
			
 
				     </select>
			
 
				 
			
 
				     <select id="querySubmitNumByStoreTopicId" resultType="com.kmall.api.entity.OrderVo">
Tekijä	SHA1 Viesti	Päivämäärä
吕健	8ebe39b39b Merge branch 'master' of lvjian/kmall-pt into master	2 kuukautta sitten
lvjian	5d4d8fc504 处理退款后，一直卡在微信处理中问题	2 kuukautta sitten
lvjian	f37c74e93b 忽略 target 文件夹	2 kuukautta sitten