From 7b5b2e0dc4cd37ffb24e338d6de9d96dd35db85b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 15 Oct 2019 15:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E8=BF=90BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go         | 2 +-
 business/partner/purchase/jd/store.go | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 4a8e4284f..da195eb10 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -979,7 +979,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 					}
 				}
 				dao.Commit(db)
-				if valid["status"] != nil {
+				if valid["status"] != nil || valid["freightDeductionPack"] != nil {
 					_, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName)
 				}
 			}
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 9c1995b3c..4018c9c1e 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -3,6 +3,7 @@ package jd
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -181,6 +182,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 										FullFreeMoney: int64(v.BeginPrice),
 										FreeType:      jdapi.FreightFreeTypePartBase,
 										FreeMoney:     int64(v.DeductFreight),
+										FreeFreightTimes: []*jdapi.FreeFreightTime{
+											&jdapi.FreeFreightTime{
+												FreeBeginTime: utils.Time2TimeStr(time.Now()),
+												FreeEndTime:   utils.Time2TimeStr(time.Now().Add(24 * time.Hour * 365 * 2)),
+											},
+										},
 									})
 								}
 							}