diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 418a85e45..21f844728 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -56,7 +56,7 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string db := dao.GetDB() sql := ` FROM sku_name t1 - JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00' + JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = '1970-01-01 00:00:00' AND t2.status = ? LEFT JOIN store_sku_bind t4 ON t4.sku_id = t2.id AND t4.deleted_at = '1970-01-01 00:00:00' AND t4.store_id = ? WHERE t1.deleted_at = '1970-01-01 00:00:00' ` @@ -66,6 +66,7 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string sql += " AND t4.sku_id IS NULL" } sqlParams := []interface{}{ + model.SkuStatusNormal, storeID, } if keyword != "" { @@ -130,8 +131,8 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string if params["toStatus"] != nil { toStatus = params["toStatus"].(int) } - sql += " AND t2.status >= ? AND t2.status <= ? AND t4.status >= ? AND t4.status <= ?" - sqlParams = append(sqlParams, fromStatus, toStatus, fromStatus, toStatus) + sql += " AND t4.status >= ? AND t4.status <= ?" + sqlParams = append(sqlParams, fromStatus, toStatus) } sql += ` GROUP BY @@ -194,6 +195,7 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string panic(r) } }() + // globals.SugarLogger.Debug(sqlData, sqlParams) if err = dao.GetRows(db, &skuNamesInfo.SkuNames, sqlData, sqlParams...); err == nil { countInfo := &struct{ Ct int }{} if err = dao.GetRow(db, countInfo, "SELECT FOUND_ROWS() ct"); err == nil { @@ -208,6 +210,8 @@ func GetStoreSkus(storeID int, isFocused bool, keyword string, params map[string for _, v := range skuName.Skus { delete(v, "unitPrice") } + } else { + skuName.UnitPrice = skuName.Price } } } diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index c2dc6d481..1d272ea60 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -101,7 +101,6 @@ func (p *PurchaseHandler) UpdateStore(storeID int, userName string) (err error) "baidu_shop_id": store.VendorStoreID, "name": jxutils.ComposeStoreName(store.Name, partner.StoreNameSeparator, VendorStorePrefix), "phone": store.Tel1, - "ivr_phone": store.Tel2, "longitude": jxutils.IntCoordinate2Standard(store.Lng), "latitude": jxutils.IntCoordinate2Standard(store.Lat), "address": store.Address, @@ -109,7 +108,10 @@ func (p *PurchaseHandler) UpdateStore(storeID int, userName string) (err error) "delivery_region": JxDeliveryRegion2Ebai(&store.Store), "business_time": JxBusinessTime2Ebai(&store.Store), } - globals.SugarLogger.Debug(utils.Format4Output(params, false)) + if store.Tel2 != "" { + params["ivr_phone"] = store.Tel2 + } + // globals.SugarLogger.Debug(utils.Format4Output(params, false)) if globals.EnableStoreWrite { if err = api.EbaiAPI.ShopUpdate(params); err == nil { shopID := 0 @@ -176,12 +178,14 @@ func JxDeliveryRegion2Ebai(store *model.Store) interface{} { } deliveryRegion := []interface{}{ map[string]interface{}{ - "name": store.Address + "配送区", + "name": "主要配送区", "delivery_fee": 600, "delivery_time": "60", "min_buy_free": "0", "min_order_price": "0", - "region": region, + "region": []interface{}{ + region, + }, }, } return deliveryRegion diff --git a/business/partner/purchase/ebai/store_test.go b/business/partner/purchase/ebai/store_test.go index 93aca443e..87e76e283 100644 --- a/business/partner/purchase/ebai/store_test.go +++ b/business/partner/purchase/ebai/store_test.go @@ -15,7 +15,7 @@ func TestReadStore(t *testing.T) { } func TestUpdateStore(t *testing.T) { - err := new(PurchaseHandler).UpdateStore(100002, "autotest") + err := new(PurchaseHandler).UpdateStore(100077, "autotest") if err != nil { t.Fatal(err.Error()) }