xiugai

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -2117,11 +2117,11 @@
 						orderHtml+="<a class=\"shanchu iconfont  icon-shanchu\" title=\"删除订单\" onclick=\"deleteOrder(" + id_ent +",this)\"></a>";
 						iconHtml=""
 						//最后一次购买完 1:试用 2:正式 -1:试用到期 -2:正式到期
-						if(true){
+						if((vip_status=="-2")&&(obj.lastbuy_code_ent!=undefined)){
 							iconHtml+='<div class="card-footer">'
 									+'<a  onclick="renewalOrBuyAgain_ent(2,this)" class="btn cancle">再次购买</a>'
 								+'</div>'
-						}else if(false){
+						}else if((vip_status=="1")&&(obj.lastbuy_code_ent!=undefined)){
 							iconHtml+='<div class="card-footer">'
 									+'<a  onclick="renewalOrBuyAgain_ent(1,this)" class="btn cancle">续费</a>'
 								+'</div>'

src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -509,15 +509,22 @@ func (o *OrderListDetails) GetEntnicheDetails() {
 }
 
 func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[string]interface{}) {
+	var create_time_stamp int64 = 0
 	//获取最后一次购买的vip订单
 	queryM["product_type"] = "VIP订阅"
 	lastbuy := *util.Mysql.Find(tableName_order, queryM, "order_code,pay_time", "pay_time desc", -1, 0)
 	lastbuy_code := ""
-	var create_time_stamp int64 = 0
 	if len(lastbuy) > 0 && lastbuy != nil {
 		lastbuy_code = qutil.ObjToString(lastbuy[0]["order_code"])
 	}
 	delete(queryM, "product_type")
+	queryM["product_type"] = "企业商机管理"
+	lastbuy_ent := *util.Mysql.Find(tableName_order, queryM, "order_code,pay_time", "pay_time desc", -1, 0)
+	lastbuy_code_ent := ""
+	if len(lastbuy_ent) > 0 && lastbuy_ent != nil {
+		lastbuy_code_ent = qutil.ObjToString(lastbuy_ent[0]["order_code"])
+	}
+	delete(queryM, "product_type")
 	for _, v := range res {
 		//获取单号 如果是vip xx小时取消
 		order_code := qutil.ObjToString(v["order_code"])
@@ -572,6 +579,10 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 		if lastbuy_code == v["order_code"] {
 			v["lastbuy_code"] = lastbuy_code
 		}
+		//最后一次购买的ent订单
+		if lastbuy_code_ent == v["order_code"] {
+			v["lastbuy_code_ent"] = lastbuy_code_ent
+		}
 		//
 		if v["pay_time"] != nil && ((v["product_type"] == "VIP订阅") || (v["product_type"] == "VIP订阅")) {
 			data, err := util.MQFW.FindOne("user", bson.M{"_id": bson.ObjectIdHex(qutil.ObjToString(o.GetSession("userId")))})