Merge remote-tracking branch 'origin/mark' into don

2019-10-09 08:45:50 +08:00
parent 0079a04817 1c7edc4b86
commit aa6e94be89
20 changed files with 221 additions and 68 deletions
--- a/business/jxutils/weixinmsg/weixinmsg.go
+++ b/business/jxutils/weixinmsg/weixinmsg.go
@@ -575,7 +575,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{}{