From b013d0ab53bdede0d2225b23b441dad8593aebe0 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 7 Nov 2018 20:07:06 +0800
Subject: [PATCH] - add remark on table promotion

---
 business/jxstore/promotion/jd_promotion.go | 20 ++++++++++++--------
 business/model/model.go                    |  1 +
 business/model/promotion.go                |  1 +
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/promotion/jd_promotion.go b/business/jxstore/promotion/jd_promotion.go
index dd344bd24..3eb31f4de 100644
--- a/business/jxstore/promotion/jd_promotion.go
+++ b/business/jxstore/promotion/jd_promotion.go
@@ -397,16 +397,20 @@ func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueW
 			} else if step == 3 {
 				err = promotionHandler.ConfirmPromotion(infoId, "")
 				if err == nil {
-					promotion.Status = model.PromotionStatusRemoteCreated
-				} else {
-					promotion.Status = model.PromotionStatusRemoteFailed
+					db := dao.GetDB()
+					if _, err = dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
+						model.FieldStatus: model.PromotionStatusRemoteCreated,
+					}, ctx.GetUserName(), nil); err == nil {
+						RefreshJdPromotionLockStatus(promotion.ID)
+					}
 				}
+			}
+			if err != nil {
 				db := dao.GetDB()
-				if _, err = dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
-					"Status": promotion.Status,
-				}, ctx.GetUserName(), nil); err == nil {
-					RefreshJdPromotionLockStatus(promotion.ID)
-				}
+				dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
+					model.FieldStatus: model.PromotionStatusRemoteFailed,
+					model.FieldRemark: err.Error(),
+				}, ctx.GetUserName(), nil)
 			}
 			return nil, err
 		}, 4)
diff --git a/business/model/model.go b/business/model/model.go
index f0c069907..4cdc8694e 100644
--- a/business/model/model.go
+++ b/business/model/model.go
@@ -36,6 +36,7 @@ const (
 	FieldSpecQuality = "SpecQuality"
 	FieldSpecUnit    = "SpecUnit"
 	FieldName        = "Name"
+	FieldRemark      = "Remark"
 )
 
 type ModelIDCUL struct {
diff --git a/business/model/promotion.go b/business/model/promotion.go
index 79e5abd1b..5ff9109f8 100644
--- a/business/model/promotion.go
+++ b/business/model/promotion.go
@@ -33,6 +33,7 @@ type Promotion struct {
 	VendorPromotionID string    `orm:"size(64);column(vendor_promotion_id);index" json:"vendorPromotionID"`
 	BeginAt           time.Time `orm:"type(datetime);index" json:"beginAt"`
 	EndAt             time.Time `orm:"type(datetime);index" json:"endAt"`
+	Remark            string    `orm:"type(text)" json:"-"`
 }
 
 func init() {