|
|
@@ -147,15 +147,20 @@ func getReturnPayDetail(token string) (map[string]interface{}, error) {
|
|
|
if token == "" {
|
|
|
return nil, errors.New("<p>参数异常</p>")
|
|
|
}
|
|
|
- rList := public.Mysql.SelectBySql("SELECT d.product_type,d.user_phone,d.company_name,r.return_money,r.pay_param,r.pay_way,r.expire_time,r.status FROM dataexport_order d inner join return_money_online r on (d.order_code=r.order_code) WHERE r.token=? ", token)
|
|
|
+ rList := public.Mysql.SelectBySql("SELECT d.order_status,d.product_type,d.user_phone,d.company_name,r.return_money,r.pay_param,r.pay_way,r.expire_time,r.status FROM dataexport_order d inner join return_money_online r on (d.order_code=r.order_code) WHERE r.token=? ", token)
|
|
|
if rList == nil || len(*rList) == 0 {
|
|
|
return nil, fmt.Errorf("<p>未知回款单</p>")
|
|
|
}
|
|
|
+
|
|
|
var (
|
|
|
rMap = (*rList)[0]
|
|
|
expire_time = gconv.String(rMap["expire_time"])
|
|
|
status = gconv.Int64(rMap["status"])
|
|
|
+ orderStatus = gconv.Int64(rMap["order_status"])
|
|
|
)
|
|
|
+ if orderStatus == -2 {
|
|
|
+ return nil, fmt.Errorf("<p>该订单已取消，如有问题<br>请联系您的客户经理</p>")
|
|
|
+ }
|
|
|
if status > 0 {
|
|
|
return nil, fmt.Errorf("<p>您已完成支付!</p>")
|
|
|
} else if status == -1 {
|
