Home Explore Help
Sign In
qmx
/
qfw
7
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev2.6.4' of http://39.105.157.10:10080/qmx/qfw into dev2.6.4

wcj 5 years ago
parent
0ec2d42b0a 70a98417a9
commit
0b01b684d0
2 changed files with 10 additions and 6 deletions
Split View Show Diff Stats
  1. 2 3
      core/src/qfw/manage/entnicheOrder.go
  2. 8 3
      core/src/web/templates/manage/entniche_order/entorderdetail.html

+ 2 - 3
core/src/qfw/manage/entnicheOrder.go
View File 

@@ -106,10 +106,9 @@ func (v *EntnicheOrder) EntnicheOrderDetail(order_code string) error {
 
 		orderMoney := util.Float64All((*res)["order_money"]) / 100
 
 		order_status := util.IntAll((*res)["order_status"])
 
 		payway := util.ObjToString((*res)["pay_way"])
 
-		prepay_id := util.ObjToString((*res)["prepay_id"])
 
 		//
 
 		pay_money := util.Float64All((*res)["pay_money"])
 
-		if pay_money != 0 && prepay_id != "" && pay_time != "" {
 
+		if pay_money != 0 && pay_time != "" {
 
 			(*res)["order_status"] = "已支付"
 
 		} else {
 
 			if order_status == -2 {
 
@@ -128,7 +127,7 @@ func (v *EntnicheOrder) EntnicheOrderDetail(order_code string) error {
 
 			(*res)["pay_way"] = "支付宝"
 
 			table = "ali_pay"
 
 		}
 
-		if prepay_id != "" {
 
+		if pay_time != "" {
 
 			wxPayMap := map[string]interface{}{}
 
 			wxPayMap["out_trade_no"] = (*res)["out_trade_no"]
 
 			wxpay := cutil.Mysql.FindOne(table, wxPayMap, "", "create_time desc")

+ 8 - 3
core/src/web/templates/manage/entniche_order/entorderdetail.html
View File 

@@ -3,7 +3,7 @@
 
 	<head>
 
 		<meta charset="utf-8" />
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 
-		<title>VIP订阅订单详情</title>
 
+		<title>企业商机管理订单详情</title>
 
 		{{include "/common/inc.html"}}
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/dataexport/base.css"/>
 
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/dataexport/dataExport.css"/>
 
@@ -105,7 +105,6 @@
 
 				</div>
 
 				<script>
 
 					var order_status={{.T.res.order_status}};
 
-					console.log(order_status)
 
 					if (order_status=="已取消"){
 
 						$(".orderstatus").css("color","orange")
 
 					}else if (order_status=="已支付"){
 
@@ -148,6 +147,7 @@
 
 						</ul>
 
 						<div class="line"></div>
 
 						<ul class="row third"  style="margin-top:20px  !important;padding-right: 0px; margin-left:20px ">	
+							<li class="row-list nofloat">支付金额：{{.T.res.order_money}}元</li>
 
 							<li class="row-list nofloat">支付方式：{{.T.res.pay_way}}</li>
 
 							<li class="row-list nofloat">支付单号：{{.T.transaction_id}}</li>
 
 						</ul>
 
@@ -159,11 +159,16 @@
 
 					<div class="hd">发票信息</div>
 
 					<div class="bd clearfix" style="padding-right: 65px;">
 
 						<ul class="row first"  style="margin-top:20px  !important;">
 
+							<li class="row-list nofloat">发票状态：{{.T.res.applybill_status}}</li>
 
 							<li class="row-list nofloat">发票类型：普通发票（电子发票）</li>
 
 							{{if eq .T.res.order_status "未支付"}}
 
 							<li class="row-list nofloat">发票抬头：-</li>
 
 							{{else}}
 
-							<li class="row-list nofloat">发票抬头：{{.T.res.applybill_type}}</li>
 
+							{{if eq .T.res.applybill_status "未申请"}}
 
+							<li class="row-list nofloat" style="display:none">发票抬头：{{.T.res.applybill_type}}</li>
 
+							{{else}}
 
+							<li class="row-list nofloat" >发票抬头：{{.T.res.applybill_type}}</li>
 
+							{{end}}
 
 							{{end}}
 
 							{{if .T.res.applybill_type}}
 
 							{{if eq .T.res.applybill_type "个人"}}