修改pay——way

src/jfw/front/dataExport.go

@@ -275,6 +275,7 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 	if orderDetail["order_money"] != nil {
 		orderDetail["order_money"] = float64(orderDetail["order_money"].(int64)) / 100
 	}
+
 	if orderDetail["filter"] != nil {
 		err := json.Unmarshal([]byte(orderDetail["filter"].(string)), &filter)
 		if err == nil {
@@ -313,12 +314,16 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 			table := ""
 			payway := util.ObjToString(orderDetail["pay_way"])
 			if strings.Contains(payway, "wx") {
+				payway = "微信"
 				table = "weixin_pay"
 			} else if strings.Contains(payway, "ali") {
+				payway = "支付宝"
 				table = "ali_pay"
 			} else {
 				return ""
 			}
+			orderDetail["pay_way"] = payway
+
 			wxPayMap := map[string]interface{}{}
 			wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
 			wxpay := public.Mysql.FindOne(table, wxPayMap, "", "")
@@ -770,6 +775,17 @@ func (d *DataExport) Paysuccess() error {
 			} else {
 				data["pay_money"] = util.Float64All(data["order_money"]) / 100
 			}
+
+			if data["pay_way"] != nil {
+				pay_way := util.ObjToString(data["pay_way"])
+				if strings.Contains(pay_way, "wx") {
+					pay_way = "微信"
+				} else if strings.Contains(pay_way, "ali") {
+					pay_way = "支付宝"
+				}
+				data["pay_way"] = pay_way
+			}
+
 		}
 	}
 	d.T["data"] = data

src/jfw/public/dataexport.go

@@ -238,9 +238,9 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 	data_count := util.IntAll((*order)["data_count"])
 	pay_way := util.ObjToString((*order)["pay_way"])
 
-	if pay_way == "wx_pc" {
+	if strings.Contains(pay_way, "wx") {
 		pay_way = "微信"
-	} else if pay_way == "ali_pc" {
+	} else if strings.Contains(pay_way, "ali") {
 		pay_way = "支付宝"
 	}