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

src/jfw/front/dataExport.go

@@ -220,7 +220,7 @@ func (d *DataExport) QueryOrder() error {
 		}
 	}
 	for _, v := range *list {
-		if v["pay_way"] == "微信" && util.IntAll(v["order_status"]) == 0 {
+		if v["pay_way"] == "wx_pc" && util.IntAll(v["order_status"]) == 0 {
 			r, _ := qr.Encode(util.ObjToString(v["code_url"]), qr.M)
 			pngdat := r.PNG()
 			v["code_url"] = base64.StdEncoding.EncodeToString(pngdat)
@@ -315,9 +315,9 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 	if orderStatus == 1 {
 		orderDetail["transaction_id"] = func() string {
 			table := ""
-			if util.ObjToString(orderDetail["pay_way"]) == "微信" {
+			if util.ObjToString(orderDetail["pay_way"]) == "wx_pc" {
 				table = "weixin_pay"
-			} else if util.ObjToString(orderDetail["pay_way"]) == "支付宝" {
+			} else if util.ObjToString(orderDetail["pay_way"]) == "ali_pc" {
 				table = "ali_pay"
 			} else {
 				return ""

src/jfw/pay/dataExportPay.go

@@ -327,11 +327,6 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
 	}
 	user_mail_status := util.ObjToString(p.GetSession("DataExportVerifyEmail_val")) != ""
 	pay_way := p.GetString("pay_way")
-	if pay_way == "weixin" {
-		pay_way = "微信"
-	} else if pay_way == "alipay" {
-		pay_way = "支付宝"
-	}
 	user_mail, _ := p.GetSession("DataExportVerifyEmail_val").(string)
 	user_phone, _ := p.GetSession("DataExportVerifyPhone").(string)
 	if user_phone != "" {
@@ -474,7 +469,7 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
 	}
 	if isPass {
 		//创建微信预支付订单
-		if pay_way == "微信" {
+		if pay_way == "wx_pc" {
 			tradeno, ret := public.WxStruct.CreatePrepayOrder(config.Sysconfig["weixinrpc"].(string), "b", p.IP(), openId, "", order_money)
 			log.Println("支付交易单", openId, ret)
 			if ret != nil && (*ret)["status"] == "1" {
@@ -514,7 +509,7 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
 			} else {
 				log.Println("生成微信预支付交易单失败", ret)
 			}
-		} else if pay_way == "支付宝" {
+		} else if pay_way == "ali_pc" {
 			now := time.Now()
 			payOutTime := now.Add(time.Hour * 2)
 			if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(order_money), util.FormatDate(&payOutTime, util.Date_Full_Layout)); err == nil {
@@ -612,9 +607,9 @@ func (p *DataExportPayAction) GetOrderPayMsg() {
 		codeUrl := ""
 		now := time.Now()
 		prepay_time = util.FormatDate(&now, util.Date_Full_Layout)
-		if pay_way == "微信" {
+		if pay_way == "wx_pc" {
 			tradeno, ret := public.WxStruct.CreatePrepayOrder(config.Sysconfig["weixinrpc"].(string), "b", p.IP(), openid, "", orderMoney)
-			if ret != nil {
+			if ret != nil && (*ret)["status"] == "1" {
 				if public.Mysql.Update("dataexport_order", map[string]interface{}{
 					"id": orderid,
 				}, map[string]interface{}{
@@ -628,10 +623,12 @@ func (p *DataExportPayAction) GetOrderPayMsg() {
 					pngdat := r.PNG()
 					codeUrl = base64.StdEncoding.EncodeToString(pngdat)
 				} else {
-					return "", "创建微信订单出错", false
+					return "", pay_way + "更新数据库出错", false
 				}
+			} else {
+				return "", "创建微信订单出错", false
 			}
-		} else if pay_way == "支付宝" {
+		} else if pay_way == "ali_pc" {
 			payOutTime := now.Add(time.Hour * 2)
 			if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(orderMoney), util.FormatDate(&payOutTime, util.Date_Full_Layout)); err == nil {
 				if public.Mysql.Update("dataexport_order", map[string]interface{}{
@@ -643,9 +640,11 @@ func (p *DataExportPayAction) GetOrderPayMsg() {
 					"out_trade_no": tradeno,
 					"pay_way":      pay_way,
 				}) {
-					//surplus_second = 7200
+					codeUrl = qr_url
+				} else {
+					return "", pay_way + "更新数据库出错", false
 				}
-				codeUrl = qr_url
+
 			} else {
 				return "", "创建支付宝订单出错", false
 			}
@@ -672,10 +671,10 @@ func CloseDataExportOrder(payWay, tradeno, prepayTime string) (status bool) {
 		}
 	}
 	log.Printf("%s取消订单，订单号%s\n", payWay, tradeno)
-	if payWay == "支付宝" {
+	if payWay == "ali_pc" {
 		status = Alipay.CloseOrder(tradeno)
 	}
-	if payWay == "微信" {
+	if payWay == "wx_pc" {
 		status = public.WxStruct.CloseOrder(config.Sysconfig["weixinrpc"].(string), tradeno)
 	}
 	if !status {

src/web/templates/pc/myOrder.html

@@ -540,9 +540,9 @@
 				if ($(this).hasClass("underline")) {
 					return
 				}
-				payway = "微信"
+				payway = "wx_pc"
 				if ($(this).text() == "支付宝") {
-					payway = "支付宝"
+					payway = "ali_pc"
 				}
 				$.post("/dataexport/getOrderPayMsg", {
 					payway: payway,
@@ -569,7 +569,7 @@
         
 				$("#myModal .price").text("￥" + price);
 				interval_t = parseInt(t / 1000);
-				if (payway == "微信") {
+				if (payway == "wx_pc") {
 					$("#myModal .active:eq(0)").addClass("underline").parent('li').siblings().children().removeClass("underline");
 					$("#myModal .qr_code").html("<img src='data:image/png;base64," + code + "'>");
 					$("#paywaytip").text("使用手机微信扫描二维码支付");