From 4645691c1bf41eb196211aa5af3e8effe81b29e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 16 Jun 2020 17:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=9C=E5=9B=AD=E5=8F=91=E7=BE=8E=E5=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go               | 22 ++++++++++++++++++----
 business/partner/delivery/mtps/waybill.go |  1 +
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 7ec67735e..19ab4539e 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -2550,7 +2550,7 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
 	if toTimeP.Before(fromTimeP) {
 		return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
 	}
-	task := tasksch.NewParallelTask("RefreshOrdersPriceInfo", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
+	task := tasksch.NewParallelTask("UpdateSkuExinfoMap", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			nameID := batchItemList[0].(int)
 			skuEx := &model.SkuExinfoMap{
@@ -2561,16 +2561,30 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
 				BeginAt:      fromTimeP,
 				EndAt:        toTimeP,
 			}
-			dao.WrapAddIDCULEntity(skuEx, ctx.GetUserName())
+			dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
 			skuExs, _ := dao.GetSkuExinfos(db, []int{nameID}, vendorID, "", utils.ZeroTimeValue, utils.ZeroTimeValue)
 			if len(skuExs) > 0 {
 				skuEx2 := skuExs[0]
-				dao.WrapAddIDCULDEntity(skuEx2, ctx.GetUserName())
-				dao.UpdateEntity(db, skuEx2)
+				skuEx2.DeletedAt = time.Now()
+				skuEx2.LastOperator = ctx.GetUserName()
+				dao.UpdateEntity(db, skuEx2, "DeletedAt", "LastOperator")
 				dao.CreateEntity(db, skuEx)
 			} else {
 				dao.CreateEntity(db, skuEx)
 			}
+			now := utils.Time2Date(time.Now())
+			if now.Sub(fromTimeP) >= 0 && now.Sub(toTimeP) <= 0 {
+				var skuIDs []int
+				skuList, err2 := dao.GetSkus(db, nil, []int{nameID}, nil, nil, nil)
+				if err = err2; err == nil {
+					if len(skuList) > 0 {
+						for _, v := range skuList {
+							skuIDs = append(skuIDs, v.ID)
+						}
+						CurVendorSync.SyncStoresSkus2(ctx, nil, 0, db, []int{vendorID}, nil, false, skuIDs, nil, model.SyncFlagModifiedMask, true, true)
+					}
+				}
+			}
 			return retVal, err
 		}, nameIDs)
 	tasksch.HandleTask(task, nil, true).Run()
diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go
index 9dcc3dff1..e27913b65 100644
--- a/business/partner/delivery/mtps/waybill.go
+++ b/business/partner/delivery/mtps/waybill.go
@@ -102,6 +102,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
 		return mtpsapi.SuccessResponse
 	}
 	c.pushToGy(order, msg)
+	globals.SugarLogger.Debugf("onWaybillMsg test, %v", msg)
 	return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
 }