Merge branch 'dev4.6.11' of http://192.168.3.207:8080/qmx/jy into dev4.6.11

src/jfw/modules/datareport/src/service/reportOrder.go

@@ -133,14 +133,14 @@ func (this *ReportOrder) OrderDetail() {
 		ordercode := this.GetString("ordercode")
 		allMsg := this.GetString("all")
 		r := util.Mysql.FindOne("dataexport_order", M{"order_code": ordercode, "user_id": this.GetSession("userId")},
-			"pay_way,order_money,user_mail,filter,pay_time,order_status,product_type,create_time,order_code,out_trade_no,prepay_time,applybill_status", "")
+			"pay_way,order_money,user_mail,filter,pay_time,order_status,product_type,create_time,order_code,out_trade_no,prepay_time,applybill_status,discount_price", "")
 		if r == nil || len(*r) == 0 {
 			return "未知订单", nil
 		}
 		payWay := qutil.ObjToString((*r)["pay_way"])
 		orderStatus := qutil.IntAll((*r)["order_status"])
-		if orderStatus == -1{
-			return "订单已删除",nil
+		if orderStatus == -1 {
+			return "订单已删除", nil
 		}
 		baseMap := map[string]interface{}{
 			"state":           orderStatus,

src/jfw/modules/subscribepay/src/pay/util.go

@@ -238,9 +238,6 @@ func CreateOrderPay(price int, productSign, ip, openid, payWay string) (tradeno,
 	switch payWay {
 	case "wx_js", "wx_app", "wx_pc": //微信公众号支付，微信app支付,微信扫码支付
 		var ret *map[string]string
-		log.Println("--", productSign)
-		log.Println("--", ip)
-		log.Println("--", openid)
 		tradeno, ret = WxStruct.CreatePrepayOrder(productSign, ip, openid, "", price)
 		log.Println(tradeno, ret)
 		if ret == nil {