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

Merge remote-tracking branch 'origin/mark' into yonghui

Browse Source
This commit is contained in:
苏尹岚
2019-12-30 17:32:32 +08:00
parent 0432d97cb1 f1d025eb15
commit e4b2a71ec6
6 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/model/dao/store.go
View File

@@ -26,6 +26,7 @@ type StoreDetail struct {
FreightDeductionPackStr string `orm:"size(4096)" json:"-"` //
FreightDeductionPackObj *model.FreightDeductionPack `orm:"-" json:"-"`
BoxFee int `orm:"default(1)" json:"boxFee"` // 打包费
AutoPickup int8 `orm:"default(1)" json:"autoPickup"` // 是否自动拣货
DeliveryType int8 `orm:"default(0)" json:"deliveryType"` // 配送类型
@@ -84,7 +85,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
sql := `
SELECT t1.*,
t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee, t2.sync_status, t2.vendor_org_code,
t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name,
t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.box_fee,
t3.value price_percentage_pack_str,
t4.value freight_deduction_pack_str,
district.name district_name,

2
business/model/dao/thing_map.go
View File

@@ -38,7 +38,7 @@ func GetThingMapMap(db *DaoDB, thingType int, vendorIDs, thingIDs []int) (thingM
func SetThingMapSyncStatus(db *DaoDB, vendorIDs []int, vendorOrgCodes []string, thingType int, thingIDs []int, syncStatus int8) (num int64, err error) {
sql := `
UPDATE thing_map t1
SET t1.sync_status |= ?
SET t1.sync_status = t1.sync_status | ?
WHERE t1.deleted_at = ? AND t1.thing_type = ?
`
sqlParams := []interface{}{

2
business/model/store.go
View File

@@ -398,6 +398,8 @@ type StoreMap struct {
FreightDeductionPack string `orm:"size(32)" json:"freightDeductionPack"` //
BoxFee int `orm:"default(0)" json:"boxFee"` // 打包费
AutoPickup int8 `orm:"default(1)" json:"autoPickup"` // 是否自动拣货
DeliveryType int8 `orm:"default(0)" json:"deliveryType"` // 配送类型
DeliveryFee int `json:"deliveryFee"`