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

- 重构配送门店管理

Browse Source
This commit is contained in:
gazebo
2019-07-23 14:29:58 +08:00
parent 79d81fdd73
commit 22737c7681
13 changed files with 325 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,12 +36,14 @@ type StoreDetail struct {
type StoreDetail2 struct {
model.Store
VendorID int `orm:"column(vendor_id)" json:"vendorID"`
VendorID int `orm:"column(vendor_id)" json:"vendorID"`
VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"` // 这个其实是京西快递门店ID的概念
CourierStatus int `json:"courierStatus"`
AuditStatus int `json:"auditStatus"`
CourierStoreName string `json:"courierStoreName"`
VendorStoreID string `orm:"column(vendor_store_id)" json:"vendorStoreID"`
DistrictName string `json:"districtName"`
CityName string `json:"cityName"`
AuditStatus int `json:"auditStatus"`
}
func (s *StoreDetail) GetPricePerentage(price int) (pricePercentage int) {
@@ -152,36 +154,31 @@ func GetPossibleStoresByPlaceName(db *DaoDB, cityName, provinceName string) (sto
}
// 这个返回的地点信息是城市
func GetMissingDadaStores(db *DaoDB, storeID int, isMustHaveJdStore bool) (storeList []*StoreDetail2, err error) {
func GetStoreDetail2(db *DaoDB, storeID int, vendorStoreID string, vendorID int) (storeDetail *StoreDetail2, err error) {
sql := `
SELECT t1.*,
city.name city_name, district.name district_name,
t3.vendor_store_id, t3.vendor_id
t3.vendor_store_id, t3.vendor_id, t3.status courier_status, t3.audit_status
FROM store t1
LEFT JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ?
LEFT JOIN place city ON city.code = t1.city_code
LEFT JOIN place district ON district.code = t1.district_code
LEFT JOIN store_courier_map t3 ON t3.store_id = t1.id AND t3.vendor_id = ? AND t3.deleted_at = ?
WHERE t1.deleted_at = ?
`
WHERE t1.deleted_at = ?`
sqlParams := []interface{}{
model.VendorIDJD,
utils.DefaultTimeValue,
model.VendorIDDada,
vendorID,
utils.DefaultTimeValue,
utils.DefaultTimeValue,
}
if isMustHaveJdStore {
sql += " AND t2.id IS NOT NULL"
}
if storeID != 0 {
sql += " AND t1.id = ?"
sqlParams = append(sqlParams, storeID)
}
if err = GetRows(db, &storeList, sql, sqlParams...); err == nil {
return storeList, nil
if vendorStoreID != "" {
sql += " AND t3.vendor_store_id = ?"
sqlParams = append(sqlParams, vendorStoreID)
}
return nil, err
err = GetRow(db, &storeDetail, sql, sqlParams...)
return storeDetail, err
}
func GetStoreCourierList(db *DaoDB, storeID, status int) (courierStoreList []*model.StoreCourierMap, err error) {