优化添加代发或取消代发的逻辑

AllBase/Model/DBModel/ShopLoginInfo.cs

@@ -124,6 +124,6 @@ namespace AllBase.Model.DBModel
 		public int? markupRate { get; set; } // 10,
 		public string accessToken { get; set; } // "100_cw6r7-hhGaLKG7ndv558eO_3z3-5PokAG8d0Y1vc3Rczd3FuIqkefdaqVj5CNtkCYtMbTYvhnwJ7-JkBVQVe9nE0KK5SBI8AlfA7E0_sTtqcwMqKAXoCj1X4h3sjZIMX84dboC-PfzlI0wh0ADHeAHDSVZ"
 		public DateTime mdyTime { get; set; } = DateTime.MinValue;
-		public bool isExpire { get { return mdyTime.AddMinutes(60) < DateTime.Now; } }
+		public bool isExpire { get { return mdyTime.AddMinutes(30) < DateTime.Now; } }
 	}
 }

AllBase/Model/DBModel/oms_wei_refund_info.cs

@@ -100,13 +100,23 @@ namespace AllBase.Model.DBModel
                 else if (value == "MERCHANT_FAIL") this.RefundStatusStr = "售后关闭";
                 else if (value == "USER_WAIT_CONFIRM_UPDATE") this.RefundStatusStr = "待用户处理商家协商";
                 else if (value == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE") this.RefundStatusStr = "待用户处理商家代发起的售后申请";
-                else if (value == "WAIT_PACKAGE_INTERCEPT") this.RefundStatusStr = "物流拦截中";
+				else if (value == "WAIT_PACKAGE_INTERCEPT") this.RefundStatusStr = "物流拦截中";
+				else if (value == "USER_WAIT_RECEIPT") this.RefundStatusStr = "换货商品已发货";
+				else this.RefundStatusStr = value;
+				//MERCHANT_EXCHANGE_SUCCESS
+
+				if (order_id == "3738189148379849472")
+				{
+
+				}
 
                 List<string> refundStrLst = new List<string>() { "商家受理中", "待买家退货", "待商家收货", "商家逾期未退款", "退款完成", "退货退款完成", "平台退款中", "待用户确认",
                     "待用户处理商家协商", "待用户处理商家代发起的售后申请", "物流拦截中"};
-                if (refundStrLst.Contains(this.RefundStatusStr) || RefundStatusStr == "售后状态读取失败")
+                if (refundStrLst.Contains(this.RefundStatusStr))
                     this.IsRefund = true;
-            }
+				if (RefundStatusStr == "售后状态读取失败")
+					this.IsRefund = true;
+			}
         }
         /// <summary>
         /// 买家身份标识