修改缺陷

src/jfw/front/dataExport.go

@@ -210,7 +210,7 @@ func (d *DataExport) QueryOrder() error {
 				v["order_money"] = float64(orderMoney.(int64)) / 100
 			}
 			if v["id"] != nil && orderMoney != nil && v["order_code"] != nil {
-				v["token"] = public.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), v["pay_way"].(string), query["user_openid"].(string))
+				v["token"] = public.GetWaitPayToken(v["id"].(int64), int(orderMoney.(int64)), v["order_code"].(string), util.ObjToString(v["pay_way"]), query["user_openid"].(string))
 			}
 		}
 	}
@@ -297,12 +297,21 @@ func (d *DataExport) ToOrderDetail(orderCode string) error {
 		orderDetail["applybill_status"] = "F" //未申请
 	}
 	orderStatus := util.IntAll((orderDetail)["order_status"])
-	if orderStatus == 1 && util.ObjToString(orderDetail["pay_way"]) == "微信" {
-		//微信订单编号
-		wxPayMap := map[string]interface{}{}
-		wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
-		wxpay := public.Mysql.FindOne("weixin_pay", wxPayMap, "", "")
-		orderDetail["transaction_id"] = (*wxpay)["transaction_id"]
+	if orderStatus == 1 {
+		orderDetail["transaction_id"] = func() string {
+			table := ""
+			if util.ObjToString(orderDetail["pay_way"]) == "微信" {
+				table = "weixin_pay"
+			} else if util.ObjToString(orderDetail["pay_way"]) == "支付宝" {
+				table = "ali_pay"
+			} else {
+				return ""
+			}
+			wxPayMap := map[string]interface{}{}
+			wxPayMap["out_trade_no"] = orderDetail["out_trade_no"]
+			wxpay := public.Mysql.FindOne(table, wxPayMap, "", "")
+			return util.ObjToString((*wxpay)["transaction_id"])
+		}()
 	}
 	d.T["o"] = orderDetail
 	d.T["logid"] = config.Seoconfig["dataexport"].(string)

src/jfw/modules/app/src/web/staticres/jyapp/js/wxSupersearch.js

@@ -488,6 +488,12 @@ var SuperSearch = {
 	        $("#supersearchPage #endtime").mobiscroll('show');
 		});
 		SuperSearch.initMobiscroll();
+		//返回时 是否显示table的查看更多
+		if($(".showlist").hasClass("on")){
+			SuperSearch.isTable(false);
+		}else{
+			SuperSearch.isTable(true);
+		}
 	},
 	recoveryPage: function(){
 		$("#supersearchPage .inputDiv").addClass("hidden")
@@ -641,10 +647,12 @@ var SuperSearch = {
 			}
 		});
 		//判断是否是table  (2.7.5table只显示20条数据)
-		if($(".showlist").hasClass("on")){
-			SuperSearch.isTable(false);
-		}else{
-			SuperSearch.isTable(true);
+		if(!sessionStorage.superSearch_showType){
+			if($(".showlist").hasClass("on")){
+				SuperSearch.isTable(false);
+			}else{
+				SuperSearch.isTable(true);
+			}
 		}
 		if(!hasNextPage){
 			SuperSearch.noMoreData();

src/jfw/pay/aliPay.go

@@ -219,7 +219,7 @@ func (a *AliPayAction) PayCallback() {
 	orderdata := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
 		"out_trade_no": out_trade_no,
 		"order_money":  total_amount * 100,
-	}, "id,filter,user_mail,product_type,data_spec,user_phone,filter_id,order_code,data_count,order_status,order_money,out_trade_no,create_time", "")
+	}, "id,filter,user_mail,product_type,data_spec,user_phone,filter_id,order_code,data_count,order_status,order_money,out_trade_no,create_time,pay_way", "")
 	pay_time := util.FormatDate(&now, util.Date_Full_Layout)
 	filename := fmt.Sprintf("%s.xlsx", fmt.Sprintf("%s_%s_%s", time.Now().Format("20060102150405"), util.ObjToString((*orderdata)["order_code"]), util.GetLetterRandom(5)))
 	download_url := fmt.Sprintf("/res/dataexport/%s", filename)
@@ -239,6 +239,7 @@ func (a *AliPayAction) PayCallback() {
 				"download_url": download_url,
 			})
 			if changeOrderStatus {
+				log.Println("pay_way----------------", (*orderdata)["pay_way"])
 				//先发个通知
 				go public.SendNotice(orderdata, total_amount, pay_time, download_url, config.GmailAuth)
 				go public.SendMailToPayUser(orderdata, total_amount, pay_time, filename, download_url, config.GmailAuth)

src/jfw/pay/dataExportPay.go

@@ -228,8 +228,8 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
 	}
 	order_money := int(order_money_ * 100)
 	original_price := int(original_price_ * 100)
-	//order_money = 1
-	//original_price = 1
+	order_money = 1
+	original_price = 1
 	filter_keys, filter_publishtime, filter := "", "", ""
 	//
 	isPass := func() bool {

src/jfw/pay/weixin.go

@@ -206,7 +206,7 @@ func (p *WxPayAction) PayCallback() {
 				orderdata := public.Mysql.FindOne("dataexport_order", map[string]interface{}{
 					"out_trade_no": ret["out_trade_no"],
 					"order_money":  util.IntAll(ret["total_fee"]),
-				}, "id,filter,user_mail,product_type,data_spec,user_phone,filter_id,order_code,data_count,order_status,order_money,out_trade_no,create_time", "")
+				}, "id,filter,user_mail,product_type,data_spec,user_phone,filter_id,order_code,data_count,order_status,order_money,out_trade_no,create_time,pay_way", "")
 				order_money := util.IntAll(ret["total_fee"])
 				pay_time := util.FormatDate(&now, util.Date_Full_Layout)
 				filename := fmt.Sprintf("%s.xlsx", fmt.Sprintf("%s_%s_%s", time.Now().Format("20060102150405"), util.ObjToString((*orderdata)["order_code"]), util.GetLetterRandom(5)))

src/jfw/public/dataexport.go

@@ -211,6 +211,7 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 	user_phone := util.ObjToString((*order)["user_phone"])
 	data_spec := util.ObjToString((*order)["data_spec"])
 	data_count := util.IntAll((*order)["data_count"])
+	pay_way := util.ObjToString((*order)["pay_way"])
 	//
 	create_time := util.ObjToString((*order)["create_time"])
 	if create_time != "" {
@@ -221,15 +222,28 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 	product_type := util.ObjToString((*order)["product_type"]) + "导出"
 	//
 	order_money := float64(util.IntAll((*order)["order_money"])) / 100
-	if transaction_id == "" && util.ObjToString((*order)["pay_way"]) == "微信" { //线下支付没有微信订单编号
-		out_trade_no := util.ObjToString((*order)["out_trade_no"])
-		wxpaydata := Mysql.FindOne("weixin_pay", map[string]interface{}{
-			"out_trade_no": out_trade_no,
-		}, "transaction_id", "")
-		if wxpaydata != nil && len(*wxpaydata) > 0 {
-			transaction_id = util.ObjToString((*wxpaydata)["transaction_id"])
-		}
+
+	if transaction_id == "" {
+		transaction_id = func() string {
+			table := ""
+			if util.ObjToString((*order)["pay_way"]) == "微信" {
+				table = "weixin_pay"
+			} else if util.ObjToString((*order)["pay_way"]) == "支付宝" {
+				table = "ali_pay"
+			} else {
+				return ""
+			}
+			out_trade_no := util.ObjToString((*order)["out_trade_no"])
+			wxpaydata := Mysql.FindOne(table, map[string]interface{}{
+				"out_trade_no": out_trade_no,
+			}, "transaction_id", "")
+			if wxpaydata != nil && len(*wxpaydata) > 0 { //线下支付没有微信订单编号
+				return util.ObjToString((*wxpaydata)["transaction_id"])
+			}
+			return ""
+		}()
 	}
+
 	mailcontent := ""
 	var mail_title = ""
 	if mailType == 1 { //支付完成后给北京财务发送导出数据接口信息的邮件
@@ -277,7 +291,7 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			log.Println("用户筛选条件错误", err, sc)
 		}
 		mail_title = "剑鱼标讯历史数据订单【" + order_code + "】，请查收"
-		mailcontent = fmt.Sprintf(ExConf.Mail_order_finance_content, order_code, create_time, pay_time, product_type, transaction_id, data_spec, data_count, order_money, user_mail, user_phone, publishtime, region, industry, keys, sc_money, subtype, buyer, winner)
+		mailcontent = fmt.Sprintf(ExConf.Mail_order_finance_content, order_code, create_time, pay_time, product_type, pay_way, transaction_id, data_spec, data_count, order_money, user_mail, user_phone, publishtime, region, industry, keys, sc_money, subtype, buyer, winner)
 	} else {
 		//申请发票
 		pay_time = util.ObjToString((*order)["pay_time"])
@@ -318,7 +332,7 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			}
 		}
 		mail_title = "电子发票申请，剑鱼标讯历史数据订单【" + order_code + "】，请查收"
-		mailcontent = fmt.Sprintf(ExConf.Mail_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, order_code, create_time, pay_time, product_type, transaction_id, offlineImgSrc, data_spec, data_count, order_money, user_mail, user_phone)
+		mailcontent = fmt.Sprintf(ExConf.Mail_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, order_code, create_time, pay_time, product_type, pay_way, transaction_id, offlineImgSrc, data_spec, data_count, order_money, user_mail, user_phone)
 	}
 	//发送邮件
 	for _, finance_mail := range ExConf.Finance_emails {

src/web/staticres/js/wxSupersearch.js

@@ -461,6 +461,12 @@ var SuperSearch = {
 	        $("#supersearchPage #endtime").mobiscroll('show');
 		});
 		SuperSearch.initMobiscroll();
+		//返回时 是否显示table的查看更多
+		if($(".showlist").hasClass("on")){
+			SuperSearch.isTable(false);
+		}else{
+			SuperSearch.isTable(true);
+		}
 	},
 	recoveryPage: function(){
 		$("#supersearchPage .inputDiv").addClass("hidden")
@@ -615,11 +621,14 @@ var SuperSearch = {
 			}
 		});
 		//判断是否是table  (2.7.5table只显示20条数据)
-		if($(".showlist").hasClass("on")){
-			SuperSearch.isTable(false);
-		}else{
-			SuperSearch.isTable(true);
+		if(!sessionStorage.superSearch_showType){
+			if($(".showlist").hasClass("on")){
+				SuperSearch.isTable(false);
+			}else{
+				SuperSearch.isTable(true);
+			}
 		}
+		
 		if(!hasNextPage){
 			SuperSearch.noMoreData();
 			return;

src/web/templates/pc/orderDetail.html

@@ -89,7 +89,7 @@
                 <p>支付时间：{{.T.o.pay_time}}</p>
                 <p>产品类型：{{.T.o.product_type}}导出</p>
         {{if .T.o.transaction_id}}        
-				<p>微信支付单号：{{.T.o.transaction_id}}</p>
+				<p>{{.T.o.pay_way}}支付单号：{{.T.o.transaction_id}}</p>
         {{end}}
             </div>
             <div class="item">