|
@@ -44,9 +44,6 @@ func GetOrder(serviceParam map[string]string, param string) []map[string]string |
|
|
"newCustomer": zhios_third_party_utils.IntToStr(v.NewCustomer), |
|
|
"newCustomer": zhios_third_party_utils.IntToStr(v.NewCustomer), |
|
|
"js_time": "", |
|
|
"js_time": "", |
|
|
} |
|
|
} |
|
|
if v.Status == 2 { |
|
|
|
|
|
tmp["status"] = "已完结" |
|
|
|
|
|
} |
|
|
|
|
|
if v.SettledTime > 0 && v.Settled == 1 { |
|
|
if v.SettledTime > 0 && v.Settled == 1 { |
|
|
tmp["js_time"] = zhios_third_party_utils.Int64ToStr(v.SettledTime / 1000) |
|
|
tmp["js_time"] = zhios_third_party_utils.Int64ToStr(v.SettledTime / 1000) |
|
|
} |
|
|
} |
|
@@ -56,7 +53,7 @@ func GetOrder(serviceParam map[string]string, param string) []map[string]string |
|
|
if v1.Status == 0 { |
|
|
if v1.Status == 0 { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
commission += zhios_third_party_utils.StrToFloat64(v1.Commission) |
|
|
|
|
|
|
|
|
commission += zhios_third_party_utils.StrToFloat64(v1.EstimateCommissionAfterDeduction) |
|
|
payment += zhios_third_party_utils.StrToFloat64(v1.CommissionTotalCost) |
|
|
payment += zhios_third_party_utils.StrToFloat64(v1.CommissionTotalCost) |
|
|
} |
|
|
} |
|
|
tmp["payment"] = zhios_third_party_utils.Float64ToStr(payment) |
|
|
tmp["payment"] = zhios_third_party_utils.Float64ToStr(payment) |
|
|