1

business/jxstore/cms/store_sku.go

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

business/model/dao/dao_bz.go

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

business/partner/purchase/mtwm/callback.go

@@ -118,5 +118,12 @@ func pushIMToGyOrPet(msg *mtwmapi.ImCallbackMsg, serverType string) {
 	}
 
 	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
 }