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

添加美团服务商配置,修改抖音自动获取品牌

Browse Source
This commit is contained in:
邹宗楠
2023-02-28 14:16:13 +08:00
parent 746ce5bca9
commit 00a363c8e6
6 changed files with 78 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/model/dao/dao_order.go
View File

@@ -376,7 +376,7 @@ func GetAfsOrderSkuInfo(db *DaoDB, vendorOrderID, afsOrderID string, vendorID in
return skus, err
}
func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, statusList []int, isFinish bool) (skuList []*OrderSkuWithActualPayPrice, err error) {
func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAtEnd time.Time, statusList []int, isFinish bool, isService int) (skuList []*OrderSkuWithActualPayPrice, err error) {
// order_finished_at
sql := `
SELECT t1.*,
@@ -403,6 +403,11 @@ func GetStoreOrderSkuList(db *DaoDB, storeIDs []int, finishedAtBegin, finishedAt
sql += " AND t2.status IN (" + GenQuestionMarks(len(statusList)) + ")"
sqlParams = append(sqlParams, statusList)
}
if isService == model.YES {
sql += "AND t2.vendor_id <> ?"
sqlParams = append(sqlParams, model.VendorIDMTWM)
}
err = GetRows(db, &skuList, sql, sqlParams...)
return skuList, err
}

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

@@ -24,13 +24,13 @@ func TestGetAfsOrderSkuInfo(t *testing.T) {
}
func TestGetStoreOrderSkuList(t *testing.T) {
skuList, err := GetStoreOrderSkuList(GetDB(), []int{100118}, time.Now().Add(-30*time.Hour), time.Now(), nil, false)
skuList, err := GetStoreOrderSkuList(GetDB(), []int{100118}, time.Now().Add(-30*time.Hour), time.Now(), nil, false, 1)
if err != nil {
t.Fatal(err)
}
t.Log(utils.Format4Output(skuList, false))
afsSkuList, err := GetStoreOrderSkuList(GetDB(), []int{100118}, time.Now().Add(-30*time.Hour), time.Now(), nil, false)
afsSkuList, err := GetStoreOrderSkuList(GetDB(), []int{100118}, time.Now().Add(-30*time.Hour), time.Now(), nil, false, 1)
if err != nil {
t.Fatal(err)
}

1
business/model/store.go
View File

@@ -492,6 +492,7 @@ type StoreMap struct {
DeliveryFeeDeductionFee int `json:"deliveryFeeDeductionFee"` //在vendorID=14,存储打包费
DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争
CreateDeliveryType int `orm:"default(0)" json:"createDeliveryType"` //默认0系统发单，1为门店发单
IsService int `orm:"default(0)" json:"isService"` // 默认0非服务商，1服务商
SyncStatus int8 `orm:"default(2)" json:"syncStatus"`
IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步