From bb8ccdb62838119a49f5fb412a25b0944e4703b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 20 Jan 2022 09:36:54 +0800 Subject: [PATCH 1/3] 123 --- business/jxstore/cms/store.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 75eba650e..3d3cac8de 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4737,9 +4737,10 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword, vendorStoreI ` sqlGD := ` SELECT name, 10 vendor_id, wmpoiid vendor_store_id,'' org_code,1 vendor_status,address, phone tel1,pj shop_score,month_sales_tip recent_order_num, - city_name,goods_number sku_count,lat, lng, district_name, brand_name, third_category category, shipping_time + city_name,goods_number sku_count, district_name, brand_name, third_category category, shipping_time FROM gaode_showd ` + //lat, lng, //sqlCLB := ` // SELECT name ,20 vendor_id, wmpoiid vendor_store_id,'' org_code,1 vendor_status,address, phone tel1,pj shop_score,month_sales_tip recent_order_num, // city_name,goods_number sku_count,lat, lng, district_name, brand_name, third_category category , shipping_time From db98264b34a2451e7b35b3ab9f2a04afd6c79b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 21 Jan 2022 15:47:09 +0800 Subject: [PATCH 2/3] 123 --- business/jxstore/cms/store.go | 4 ++-- business/jxstore/cms/store_sku.go | 4 ++-- business/jxstore/cms/store_test.go | 3 +-- business/partner/purchase/jx/localjx/order.go | 2 +- tests/default_test.go | 3 +++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 3d3cac8de..56a3b8a6e 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -4736,8 +4736,8 @@ func QueryPageStores2(db *dao.DaoDB, pageSize, offset int, keyword, vendorStoreI FROM meituan_showd ` sqlGD := ` - SELECT name, 10 vendor_id, wmpoiid vendor_store_id,'' org_code,1 vendor_status,address, phone tel1,pj shop_score,month_sales_tip recent_order_num, - city_name,goods_number sku_count, district_name, brand_name, third_category category, shipping_time + SELECT name, 10 vendor_id, wmpoiid vendor_store_id, '' org_code, 1 vendor_status, address, phone tel1, pj shop_score, month_sales_tip recent_order_num, + city_name, goods_number sku_count, lat, lng, district_name, brand_name, third_category category, shipping_time FROM gaode_showd ` //lat, lng, diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 3ac4336b8..f3ea1892d 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -5282,7 +5282,7 @@ func doStoreSkuAudit(ctx *jxcontext.Context, storeIDs []int, skuBindInfos []*Sto globals.SugarLogger.Debugf("doStoreSkuAudit cover storeID : %v nameID: %v", storeID, skuBindInfo.NameID) } } else { - return false, fmt.Errorf("未查询到该门店商品价，storeID: %v, nameID: %V", storeID, skuBindInfo.NameID) + return false, fmt.Errorf("未查询到该门店商品价，storeID: %v, nameID: %v", storeID, skuBindInfo.NameID) } storeSkuAudit.Type = model.StoreSkuAuditTypePrice storeSkuAudit.OriginUnitPrice = int(storeSkus[0].UnitPrice) @@ -5350,7 +5350,7 @@ func doStoreSkuAuditForGy(ctx *jxcontext.Context, storeIDs []int, skuBindInfos [ } globals.SugarLogger.Debugf("doStoreSkuAudit cover storeID : %v nameID: %v", storeID, skuBindInfo.NameID) } else { - return false, fmt.Errorf("未查询到该门店商品价，storeID: %v, nameID: %V", storeID, skuBindInfo.NameID) + return false, fmt.Errorf("未查询到该门店商品价，storeID: %v, nameID: %v", storeID, skuBindInfo.NameID) } storeSkuAudit.Type = model.StoreSkuAuditTypePrice storeSkuAudit.OriginUnitPrice = int(storeSkus[0].UnitPrice) diff --git a/business/jxstore/cms/store_test.go b/business/jxstore/cms/store_test.go index bb39605e4..3b991cff1 100644 --- a/business/jxstore/cms/store_test.go +++ b/business/jxstore/cms/store_test.go @@ -1,12 +1,11 @@ package cms import ( - "testing" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" + "testing" ) func TestGetStoresVendorSnapshot(t *testing.T) { diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 8b5865fec..fc43b12e9 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -587,7 +587,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { if storeOrder.StoreID == 668357 { storeOrder.StoreID = 131 } - partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, 131, storeOrder.ActualPayPrice, 1, 1, "") + partner.CurStoreAcctManager.InsertBrandBill(jxcontext.AdminCtx, 131, storeOrder.ActualPayPrice, 1, 1, orderPay.VendorOrderID) } } case model.PayTypeTL_BrandBillCharge: diff --git a/tests/default_test.go b/tests/default_test.go index 6d662d28b..0c27e2e76 100644 --- a/tests/default_test.go +++ b/tests/default_test.go @@ -1,6 +1,7 @@ package test import ( + "fmt" "path/filepath" "runtime" "testing" @@ -19,6 +20,8 @@ func init() { // TestGet is a sample to run an endpoint test func TestGet(t *testing.T) { + fmt.Println("123") + //r, _ := http.NewRequest("GET", "/v1/object", nil) //w := httptest.NewRecorder() //beego.BeeApp.Handlers.ServeHTTP(w, r) From a5d252c7798f43d55937b3066b5b9e65b7edab04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 27 Jan 2022 10:26:38 +0800 Subject: [PATCH 3/3] 123 --- business/jxcallback/orderman/order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 78e786bf3..53eb592f3 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -1983,7 +1983,7 @@ func result2Orders(ctx *jxcontext.Context, result *jdshopapi.AllOrdersResult) (o ) for _, jdsOrder := range result.OrderList { //等待付款的排除 - if jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusWaittingExport && jdsOrder.OrderStatus != jdshopapi.JdsOrderStatusPause && jdsOrder.OrderStatus != 51 && jdsOrder.OrderStatus != 50 { + if jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingPay || jdsOrder.OrderStatus == jdshopapi.JdsOrderStatusWaittingPayDel || jdsOrder.OrderStatus == 51 || jdsOrder.OrderStatus == 50 { continue } //有可能是库里已经有这个订单了