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

123

Browse Source
This commit is contained in:
邹宗楠
2022-01-21 15:47:09 +08:00
parent bb8ccdb628
commit db98264b34
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -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)

3
business/jxstore/cms/store_test.go
View File

@@ -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) {

2
business/partner/purchase/jx/localjx/order.go
View File

@@ -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:

3
tests/default_test.go
View File

@@ -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)