From 6e4ecfd441402c50d83c9925223d02b5d6314234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Wed, 19 Feb 2020 08:43:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=89=93=E6=AC=BE=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=95=86?= =?UTF-8?q?=E5=93=81=E8=BF=87=E6=BB=A4=E9=A5=BF=E9=B2=9C=E8=BE=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/cs/weimob_order.go | 2 +- business/jxstore/cms/sku.go | 33 +++++++++++-------- business/jxstore/tempop/tempop.go | 2 +- business/partner/purchase/jx/localjx/order.go | 4 +-- controllers/cms_sku.go | 3 +- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/business/cs/weimob_order.go b/business/cs/weimob_order.go index 412667bfb..53633a40b 100644 --- a/business/cs/weimob_order.go +++ b/business/cs/weimob_order.go @@ -79,7 +79,7 @@ func changeStoreSkusByOrder(order *weimobapi.OrderDetail) { if skuName.Status != model.SkuStatusNormal { cms.UpdateSkuName(ctx, skuName.ID, map[string]interface{}{ "status": model.SkuStatusNormal, - }) + }, false) } for _, sku := range skuName.Skus { if sku.Status != model.SkuStatusNormal { diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index fab229e5a..a7afebcb9 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -788,7 +788,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s return outSkuNameExt, err } -func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interface{}) (num int64, err error) { +func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interface{}, isExd bool) (num int64, err error) { userName := ctx.GetUserName() skuName := &model.SkuName{} skuName.ID = nameID @@ -853,9 +853,11 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf dao.Rollback(db) return 0, err } - if err = OnUpdateThing(ctx, db, nil, int64(nameID), model.ThingTypeSkuName); err != nil { - dao.Rollback(db) - return 0, err + if !isExd { + if err = OnUpdateThing(ctx, db, nil, int64(nameID), model.ThingTypeSkuName); err != nil { + dao.Rollback(db) + return 0, err + } } if utils.Interface2Int64WithDefault(payload["isGlobal"], 0) == 0 && payload["places"] != nil { if places, ok := payload["places"].([]interface{}); ok { @@ -888,10 +890,11 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf dao.Rollback(db) return 0, err } - - if err = OnUpdateThing(ctx, db, nil, int64(v.ID), model.ThingTypeSku); err != nil { - dao.Rollback(db) - return 0, err + if sku.ExdSkuID == "" { + if err = OnUpdateThing(ctx, db, nil, int64(v.ID), model.ThingTypeSku); err != nil { + dao.Rollback(db) + return 0, err + } } } } @@ -1075,9 +1078,11 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{} } return 0, err } - if err = OnUpdateThing(ctx, db, nil, int64(skuID), model.ThingTypeSku); err != nil { - dao.Rollback(db) - return 0, err + if sku.ExdSkuID != "" { + if err = OnUpdateThing(ctx, db, nil, int64(skuID), model.ThingTypeSku); err != nil { + dao.Rollback(db) + return 0, err + } } dao.Commit(db) @@ -1387,16 +1392,16 @@ func UpdateSkuNamesExPrefix(ctx *jxcontext.Context, nameIDs []int, exPrefix, fro "exPrefixEnd": toTimeP, } if now.Sub(toTimeP) <= 0 && now.Sub(fromTimeP) >= 0 { - _, err = UpdateSkuName(ctx, nameID, payload) + _, err = UpdateSkuName(ctx, nameID, payload, false) } else if now.Sub(fromTimeP) > 0 && now.Sub(toTimeP) > 0 { payload["exPrefixBegin"] = nil payload["exPrefixEnd"] = nil - _, err = UpdateSkuName(ctx, nameID, payload) + _, err = UpdateSkuName(ctx, nameID, payload, false) } else { skuList, err := dao.GetSkus(db, nil, []int{nameID}, nil, nil) if err == nil && len(skuList) > 0 { if skuList[0].ExPrefixBegin != nil { - _, err = UpdateSkuName(ctx, nameID, payload) + _, err = UpdateSkuName(ctx, nameID, payload, false) CurVendorSync.SyncStoresSkus2(ctx, nil, 0, db, partner.GetSingleStoreVendorIDs(), nil, false, []int{skuList[0].ID}, nil, model.SyncFlagModifiedMask, true, true) } else { skuName := &model.SkuName{ diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 934ccd3d8..48623eb26 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -577,7 +577,7 @@ func DeleteWrongSpu(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) ( mapData := map[string]interface{}{ "name": skuNameList[step].Name, } - _, err = cms.UpdateSkuName(ctx, skuNameList[step].ID, mapData) + _, err = cms.UpdateSkuName(ctx, skuNameList[step].ID, mapData, false) if err != nil { globals.SugarLogger.Debugf("DeleteWrongSpu failed nameid:%d, name:%s, with error:%v", skuNameList[step].ID, skuNameList[step].Name, err) } diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 0bb68ed63..b9484f2e3 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -678,8 +678,8 @@ func AutoPayForPopluarMan(ctx *jxcontext.Context) (err error) { errMsg string errCode string db = dao.GetDB() - fromDateStr = time.Now().AddDate(0, 0, -5).Format("2006-1-2") + " 00:00:00" - toDateStr = time.Now().AddDate(0, 0, -5).Format("2006-1-2") + " 23:59:59" + fromDateStr = time.Now().AddDate(0, 0, -1).Format("2006-1-2") + " 00:00:00" + toDateStr = time.Now().AddDate(0, 0, -1).Format("2006-1-2") + " 23:59:59" mapResult = make(map[string]interface{}) ) result, err := dao.GetOrdersForJxPay(db, utils.Str2Time(fromDateStr), utils.Str2Time(toDateStr)) diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index eeba4f5c5..62fa786d2 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -185,6 +185,7 @@ func (c *SkuController) AddSkuName() { // @Param token header string true "认证token" // @Param nameID formData int true "需要修改的商品名ID，payload中的相应数据会被忽略" // @Param payload formData string true "json数据，SkuNameExt对象()，Skus无效, Places有效" +// @Param isExd formData bool true "是否要修改饿鲜达商品" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /UpdateSkuName [put] @@ -197,7 +198,7 @@ func (c *SkuController) UpdateSkuName() { delete(payload, "exPrefix") delete(payload, "exPrefixBegin") delete(payload, "exPrefixEnd") - retVal, err = cms.UpdateSkuName(params.Ctx, params.NameID, payload) + retVal, err = cms.UpdateSkuName(params.Ctx, params.NameID, payload, params.IsExd) } return retVal, "", err })