新疆西藏海南内蒙古运费修改
This commit is contained in:
@@ -20,6 +20,7 @@ type UserDeliveryAddressEx struct {
|
|||||||
UserName string `json:"userName"`
|
UserName string `json:"userName"`
|
||||||
CityName string `json:"cityName"`
|
CityName string `json:"cityName"`
|
||||||
DistrictName string `json:"districtName"`
|
DistrictName string `json:"districtName"`
|
||||||
|
ParentCode int `json:"parentCode"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GetSelfInfoResult struct {
|
type GetSelfInfoResult struct {
|
||||||
@@ -183,11 +184,13 @@ func QueryUserDeliveryAddress(db *DaoDB, addressID int64, userIDs []string, offs
|
|||||||
t1.*,
|
t1.*,
|
||||||
t2.name user_name,
|
t2.name user_name,
|
||||||
district.name district_name,
|
district.name district_name,
|
||||||
city.name city_name
|
city.name city_name,
|
||||||
|
cp.code parent_code
|
||||||
FROM user_delivery_address t1
|
FROM user_delivery_address t1
|
||||||
LEFT JOIN user t2 ON t2.user_id = t1.user_id
|
LEFT JOIN user t2 ON t2.user_id = t1.user_id
|
||||||
LEFT JOIN place district ON district.code = t1.district_code
|
LEFT JOIN place district ON district.code = t1.district_code
|
||||||
LEFT JOIN place city ON city.code = t1.city_code
|
LEFT JOIN place city ON city.code = t1.city_code
|
||||||
|
LEFT JOIN place cp ON cp.code = city.parent_code
|
||||||
WHERE t1.deleted_at = ?
|
WHERE t1.deleted_at = ?
|
||||||
`
|
`
|
||||||
sqlParams := []interface{}{
|
sqlParams := []interface{}{
|
||||||
|
|||||||
@@ -896,6 +896,14 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
|
|||||||
if fromStoreID != -1 {
|
if fromStoreID != -1 {
|
||||||
deliveryAddress.ConsigneeName = storeDetail2.Name
|
deliveryAddress.ConsigneeName = storeDetail2.Name
|
||||||
}
|
}
|
||||||
|
//内蒙古海南统一35
|
||||||
|
//新疆西藏统一45
|
||||||
|
if deliveryAddress.ParentCode == 150000 || deliveryAddress.ParentCode == 460000 {
|
||||||
|
outJxOrder.FreightPrice = 3500
|
||||||
|
}
|
||||||
|
if deliveryAddress.ParentCode == 650000 || deliveryAddress.ParentCode == 540000 {
|
||||||
|
outJxOrder.FreightPrice = 4500
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if outJxOrder.FreightPrice > specialFreightPrice {
|
if outJxOrder.FreightPrice > specialFreightPrice {
|
||||||
outJxOrder.FreightPrice = specialFreightPrice
|
outJxOrder.FreightPrice = specialFreightPrice
|
||||||
|
|||||||
Reference in New Issue
Block a user