|
|
@@ -106,10 +106,9 @@ func (v *EntnicheOrder) EntnicheOrderDetail(order_code string) error {
|
|
|
orderMoney := util.Float64All((*res)["order_money"]) / 100
|
|
|
order_status := util.IntAll((*res)["order_status"])
|
|
|
payway := util.ObjToString((*res)["pay_way"])
|
|
|
- prepay_id := util.ObjToString((*res)["prepay_id"])
|
|
|
//
|
|
|
pay_money := util.Float64All((*res)["pay_money"])
|
|
|
- if pay_money != 0 && prepay_id != "" && pay_time != "" {
|
|
|
+ if pay_money != 0 && pay_time != "" {
|
|
|
(*res)["order_status"] = "已支付"
|
|
|
} else {
|
|
|
if order_status == -2 {
|
|
|
@@ -128,7 +127,7 @@ func (v *EntnicheOrder) EntnicheOrderDetail(order_code string) error {
|
|
|
(*res)["pay_way"] = "支付宝"
|
|
|
table = "ali_pay"
|
|
|
}
|
|
|
- if prepay_id != "" {
|
|
|
+ if pay_time != "" {
|
|
|
wxPayMap := map[string]interface{}{}
|
|
|
wxPayMap["out_trade_no"] = (*res)["out_trade_no"]
|
|
|
wxpay := cutil.Mysql.FindOne(table, wxPayMap, "", "create_time desc")
|
