liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2025-02-21 09:56:11 +08:00
parent 1b72c9b0a0
commit 6180f69883
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/store_sku.go
View File

@@ -2456,6 +2456,7 @@ func updateStoreSkusSaleWithoutSync(ctx *jxcontext.Context, storeID int, skuBind
model.FieldMtwmSyncStatus: skuBind.MtwmSyncStatus | model.SyncFlagSaleMask, model.FieldMtwmSyncStatus: skuBind.MtwmSyncStatus | model.SyncFlagSaleMask,
model.FieldTaoSyncStatus: skuBind.TaoSyncStatus | model.SyncFlagSaleMask, model.FieldTaoSyncStatus: skuBind.TaoSyncStatus | model.SyncFlagSaleMask,
model.FieldDdSyncStatus: skuBind.DdSyncStatus | model.SyncFlagSaleMask, model.FieldDdSyncStatus: skuBind.DdSyncStatus | model.SyncFlagSaleMask,
"Stock": v.Stock,
} }
if utils.IsTimeZero(autoSaleTime) || skuBind.Status == model.SkuStatusNormal { if utils.IsTimeZero(autoSaleTime) || skuBind.Status == model.SkuStatusNormal {
kvs["AutoSaleAt"] = utils.DefaultTimeValue kvs["AutoSaleAt"] = utils.DefaultTimeValue
@@ -2527,8 +2528,7 @@ func UpdateStoresSkusSale(ctx *jxcontext.Context, storeIDs []int, skuBindSkuInfo
for _, v := range skuBindSkuInfos { for _, v := range skuBindSkuInfos {
skuIDs = append(skuIDs, v.SkuID) skuIDs = append(skuIDs, v.SkuID)
} }
db := dao.GetDB() hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, 0, dao.GetDB(), nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
} }
if num == 0 || !isAsync || hint == "" { if num == 0 || !isAsync || hint == "" {
hint = utils.Int64ToStr(num) hint = utils.Int64ToStr(num)

4
business/model/dao/dao_bz.go
View File

@@ -54,13 +54,11 @@ func UpdateEntityByKV(db *DaoDB, item interface{}, kvs map[string]interface{}, c
qs = qs.Filter(k, v) qs = qs.Filter(k, v)
} }
} }
globals.SugarLogger.Debugf("-------kvs:= %s", utils.Format4Output(kvs, false))
for k, v := range kvs { for k, v := range kvs {
if v == "" { if v == "" || v == nil {
delete(kvs, k) delete(kvs, k)
} }
} }
globals.SugarLogger.Debugf("-------kvs2:= %s", utils.Format4Output(kvs, false))
num, err = qs.Update(kvs) num, err = qs.Update(kvs)
if err != nil && !IsDuplicateError(err) { if err != nil && !IsDuplicateError(err) {
globals.SugarLogger.Errorf("UpdateEntityByKV %s failed with error:%v", reflect.TypeOf(item).Name(), err) globals.SugarLogger.Errorf("UpdateEntityByKV %s failed with error:%v", reflect.TypeOf(item).Name(), err)

9
business/partner/purchase/mtwm/callback.go
View File

@@ -118,5 +118,12 @@ func pushIMToGyOrPet(msg *mtwmapi.ImCallbackMsg, serverType string) {
} }
request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") request.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
cl.Do(request) request.Header.Set("accept", "application/json, text/plain, */*")
resp, err := cl.Do(request)
if err != nil {
return
}
defer resp.Body.Close()
return
} }