From 55aeeacc40f87ae6aba31445a1fa45261c81fa38 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 3 Oct 2019 22:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=96=B0=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E5=8D=95=E6=B6=88=E6=81=AF=E6=97=B6=E7=94=A8=E9=94=99=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E5=8D=95=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=20=E9=87=8D=E6=96=B0=E6=94=B6=E5=88=B0=E6=96=B0?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8D=95=E6=B6=88=E6=81=AF=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=9A=84BUG=E4=BF=AE=E5=A4=8D=E3=80=82=E4=BD=86?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BA=AC=E4=B8=9C=E8=AE=A2=E5=8D=95=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=9A=84=E6=94=B6=E5=88=B0=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8D=95=E6=B6=88=E6=81=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E8=A7=A3=E5=86=B3=EF=BC=88=E6=AF=94=E5=A6=82?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=EF=BC=9A923795309000741=EF=BC=8C=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E5=8D=95=EF=BC=9A24078668=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order_afs.go | 2 ++
 business/jxutils/weixinmsg/weixinmsg.go   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/order_afs.go b/business/jxcallback/orderman/order_afs.go
index cb985d2e8..942271fb2 100644
--- a/business/jxcallback/orderman/order_afs.go
+++ b/business/jxcallback/orderman/order_afs.go
@@ -72,11 +72,13 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
 		}
 	}
 	if existAfsOrder != nil {
+		// todo 可能导致状态回绕
 		existAfsOrder.Status = afsOrder.Status
 		existAfsOrder.VendorStatus = afsOrder.VendorStatus
 		if _, err = dao.UpdateEntity(db, existAfsOrder, "Status", "VendorStatus"); err != nil {
 			return err
 		}
+		afsOrder = existAfsOrder
 	} else {
 		// 全退都要先全删除再建
 		if afsOrder.RefundType == model.AfsTypeFullRefund {
diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go
index b8a25c888..41ab78cff 100644
--- a/business/jxutils/weixinmsg/weixinmsg.go
+++ b/business/jxutils/weixinmsg/weixinmsg.go
@@ -572,7 +572,7 @@ func NotifyAfsOrderStatus(afsOrder *model.AfsOrder) (err error) {
 			"color": WX_HIGHLEVEL_TEMPLATE_COLOR,
 		},
 		"keyword3": map[string]interface{}{
-			"value": utils.Time2Str(afsOrder.CreatedAt),
+			"value": utils.Time2Str(afsOrder.AfsCreatedAt),
 			"color": venderColors[order.VendorID],
 		},
 		"remark": map[string]interface{}{