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

This commit is contained in:
苏尹岚
2020-08-21 14:19:38 +08:00

View File

@@ -4644,6 +4644,8 @@ func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*Sto
// return false, err // return false, err
// } // }
if ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini { if ctx.GetLoginType() != weixin.AuthTypeMP && ctx.GetLoginType() != weixin.AuthTypeMini {
authInfo, err := ctx.GetV2AuthInfo()
if err == nil && authInfo != nil {
if len(storeAudits) > 0 { if len(storeAudits) > 0 {
storeAudits[0].DeletedAt = time.Now() storeAudits[0].DeletedAt = time.Now()
dao.UpdateEntity(db, storeAudits[0], "DeletedAt") dao.UpdateEntity(db, storeAudits[0], "DeletedAt")
@@ -4657,6 +4659,7 @@ func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*Sto
globals.SugarLogger.Debugf("doStoreSkuAudit return3 storeID : %v nameID: %v", storeID, skuBindInfo.NameID) globals.SugarLogger.Debugf("doStoreSkuAudit return3 storeID : %v nameID: %v", storeID, skuBindInfo.NameID)
return false, err return false, err
} }
}
storeSkuAudit := &model.StoreSkuAudit{ storeSkuAudit := &model.StoreSkuAudit{
StoreID: storeID, StoreID: storeID,
NameID: skuBindInfo.NameID, NameID: skuBindInfo.NameID,