zouyuxuan 5 tahun lalu
induk
melakukan
86055ec5b9

+ 7 - 3
core/src/qfw/manage/dataReportOrder.go

@@ -338,10 +338,14 @@ func (d *DataReportOrder)OrderDetailData()error{
 		if original_price != 0 {
 			wxPayMap := map[string]interface{}{}
 			wxPayMap["out_trade_no"] = (*res)["out_trade_no"]
-			wxpay := util.Mysql.FindOne(table, wxPayMap, "transaction_id", "create_time desc")
-			if wxpay != nil {
-				d.T["transaction_id"] = qutil.ObjToString((*wxpay)["transaction_id"])
+			if (table!=""){
+				wxpay := util.Mysql.FindOne(table, wxPayMap, "transaction_id", "create_time desc")
+				log.Println("wxpay",wxpay)
+				if wxpay != nil {
+					d.T["transaction_id"] = qutil.ObjToString((*wxpay)["transaction_id"])
+				}
 			}
+
 		}
 		//申请发票
 		applybill_status := qutil.IntAll((*res)["applybill_status"])

+ 1 - 1
core/src/web/templates/manage/datareport/orderdetail.html

@@ -64,7 +64,7 @@
         float: right;
         width: calc(100% - 220px);
         border: 1px solid #ddd;
-        min-height: 910px;
+        min-height: 960px;
         /* background-color: #fff; */
     }
 </style>