Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/front/dataExport.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"jfw/config"
+	"jfw/pay"
 	"jfw/public"
 	"log"
 	"qfw/util"
@@ -264,14 +265,19 @@ func (d *DataExport) CancelOrder() error {
 */
 func (d *DataExport) DeleteOrder() error {
 	if userId := d.GetSession("userId"); userId != nil {
-		//	if openid := d.GetSession("s_m_openid"); openid != nil {
 		queryMap := map[string]interface{}{
 			"id":      d.GetString("id"),
 			"user_id": userId.(string),
 		}
-		boo := public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
-		//撤销订单
-		d.ServeJson(map[string]interface{}{"success": boo})
+		flag := false
+		order := public.Mysql.FindOne(tableName_order, queryMap, "pay_way,out_trade_no,prepay_time", "")
+		if order != nil {
+			flag = pay.CloseDataExportOrder(util.ObjToString((*order)["pay_way"]), util.ObjToString((*order)["out_trade_no"]), util.ObjToString((*order)["prepay_time"]))
+		}
+		if flag {
+			flag = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{"order_status": -1})
+		}
+		d.ServeJson(map[string]interface{}{"success": flag})
 	}
 	return nil
 }

src/jfw/pay/dataExportPay.go

@@ -737,9 +737,11 @@ func CloseDataExportOrder(payWay, tradeno, prepayTime string) (status bool) {
 	log.Printf("%s取消订单，订单号%s\n", payWay, tradeno)
 	if payWay == "ali_pc" {
 		status = Alipay.CloseOrder(tradeno)
-	}
-	if payWay == "wx_pc" || payWay == "wx_js" {
+	} else if payWay == "wx_pc" || payWay == "wx_js" {
 		status = public.WxStruct.CloseOrder(config.Sysconfig["weixinrpc"].(string), tradeno)
+	} else {
+		//非扫码支付 暂不处理
+		status = true
 	}
 	if !status {
 		log.Printf("%s订单关闭失败：%s\n", payWay, tradeno)