Merge branch 'dev2.9.0' of http://39.105.157.10:10080/qmx/jy into dev2.9.0

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

@@ -548,7 +548,7 @@
 				if (isVipOrder=="true"){
 					window.location.href="/jyapp/vipsubscribe/toOrderDetailPage?orderCode="+eid;
 				}else if(isent=="true"){
-					window.location.href="/jyapp/front/myorder/toEntnicheDetail?orderCode="+eid;
+					window.location.href="/jyapp/front/myorder/toEntnicheDetail?order_code="+eid;
 				}else if(courseOrder=="true"){
 					window.location.href="/jyapp/course/orderDetail?code="+vid;
 				}else{
@@ -722,13 +722,19 @@
 			                                   					 var self = $(obj).parent(".card-footer").prev(".card-content").prev(".card-header").children(".notpay");
 			                                   					 self.css("color","black");
 																 var isVipOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("isvipOrder");
+																 var isEntOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("isent");
 			                                   					 var courseOrder =$(obj).parent(".card-footer").prev(".card-content").children(".media").attr("courseOrder");
 			                                   					 var courseId = $(obj).parent(".card-footer").prev(".card-content").find("a").attr("eid");
 			                                   					 //vip订单取消了没有再次购买
 			                                   					if (isVipOrder!="true"){
 																	 if(courseOrder !== "true"){
-																		 self.text("已取消");
-																		 $(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
+																		if (isEntOrder=="true"){
+																			self.text("已取消");
+																			$(obj).parent(".card-footer").html(`<div></div>`)
+																		}else{
+																			self.text("已取消");
+																			$(obj).parent(".card-footer").html('<a  onclick="onceMore(this)" class="btn cancle">再次购买</a>')
+																		}
 																	 }else{
 																		 $(obj).parent(".card-footer").html(`<a href="/swordfish/course/detail/${courseId}" class="btn cancle">再次购买</a>`)
 																		 self.children().remove()

src/jfw/modules/app/src/web/templates/entniche/entniche_order_detail.html

@@ -426,7 +426,7 @@ body .loading_ p span {
 	$(function(){
 		$(".loading_").hide();
 		var pay_way="";
-    	var orderCode=decodeURIComponent(getParam("orderCode"));
+    	var orderCode=decodeURIComponent(getParam("order_code"));
 		$.post("/subscribepay/orderListDetails/entnicheDetails",{"order_code":orderCode},function(r){
 				console.log(r.data)
 				if (r.data){

src/jfw/modules/subscribepay/src/entity/entniche.go

@@ -27,12 +27,13 @@ func (e *entnicheStruct) PayCallBack(param *CallBackParam) bool {
 		nowFormat := qutil.FormatDate(&now, qutil.Date_Full_Layout)
 		var filter_id int64
 		var filter map[string]interface{}
+		var entname string
 		if err := json.Unmarshal([]byte(qutil.ObjToString((*orderdata)["filter"])), &filter); err != nil {
 			log.Println("企业商机管理支付成功json.Unmarshal出错", err)
 		} else {
 			cycle := qutil.IntAll(filter["cycle"])
 			adminname, _ := filter["adminname"].(string)
-			entname, _ := filter["entname"].(string)
+			entname, _ = filter["entname"].(string)
 			phone, _ := filter["phone"].(string)
 			industry, _ := filter["industry"].(string)
 			enddate := time.Date(now.Year()+cycle, now.Month(), now.Day(), 23, 59, 59, 0, time.Local)
@@ -95,7 +96,7 @@ func (e *entnicheStruct) PayCallBack(param *CallBackParam) bool {
 		if update {
 			//取消其他订单
 			userid := qutil.ObjToString((*orderdata)["user_id"])
-			go PayCancel(userid, "企业商机管理")
+			go PayCancel(userid, "企业商机管理", entname)
 		}
 	}
 	return true

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -142,7 +142,7 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 		//支付提醒
 		util.MsgRemind.PaySuccess(qutil.IntAll((*orderdata)["id"]), qutil.ObjToString((*orderdata)["order_code"]), qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["prepay_time"]), qutil.IntAllDef((*orderdata)["vip_type"], -1))
 		//其他未支付vip订阅订单 变为已取消
-		go PayCancel(userid, "VIP订阅")
+		go PayCancel(userid, "VIP订阅", "")
 	}
 	return flag
 }
@@ -616,21 +616,39 @@ func getSetMealPrice(c, iCount, u int) int {
 	}
 }
 
-//支付成功后，将该订单以外的所有订单状态改为已取消状态 已取消:-2  先关闭订单再改状态
-func PayCancel(userId, product_type string) bool {
+//支付成功后，将该订单以外的所有订单状态改为已取消状态 已取消:-2  先关闭订单再改状态  --entname 企业商机管理订单会用到该参数 其他取消订单不需要
+func PayCancel(userId, product_type, entname string) bool {
 	queryMap := map[string]interface{}{
 		"user_id":      userId,
 		"order_status": 0,
 		"product_type": product_type,
 	}
 	i, order_len := 0, 0
-	order := util.Mysql.Find("dataexport_order", queryMap, "id,pay_way,out_trade_no,prepay_time,order_status", "create_time desc", -1, 0)
+	order := util.Mysql.Find("dataexport_order", queryMap, "id,filter,pay_way,out_trade_no,prepay_time,order_status", "create_time desc", -1, 0)
 	if order != nil {
-		order_len = len(*order)
 		//遍历未支付订单
 		for _, v := range *order {
 			//关闭未支付订单
-			flag := pay.CloseDataExportOrder(qutil.ObjToString(v["pay_way"]), qutil.ObjToString(v["out_trade_no"]), qutil.ObjToString(v["prepay_time"]))
+			if product_type == "企业商机管理" { //企业商机管理取消的订单 公司名重复才取消
+				var filter map[string]interface{}
+				if err := json.Unmarshal([]byte(qutil.ObjToString(v["filter"])), &filter); err != nil {
+					log.Println("企业商机管理取消订单json.Unmarshal出错", err)
+				} else {
+					filter_entname, _ := filter["entname"].(string)
+					if entname != filter_entname {
+						continue
+					}
+				}
+			}
+			order_len++
+			flag := false
+			if qutil.ObjToString(v["out_trade_no"]) != "" {
+				flag = pay.CloseDataExportOrder(qutil.ObjToString(v["pay_way"]), qutil.ObjToString(v["out_trade_no"]), qutil.ObjToString(v["prepay_time"]))
+			} else {
+				if product_type == "企业商机管理" {
+					flag = true
+				}
+			}
 			if flag {
 				//更改未支付订单状态 -2  逐个取消订单
 				bl := util.Mysql.Update("dataexport_order", bson.M{

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

@@ -173,6 +173,7 @@ func (e *Entniche) BuyAgain() {
 	phone := e.GetString("phone")
 	userId, _ := e.GetSession("userId").(string)
 	renew, _ := e.GetInteger("renew") //1是续费 0再次购买
+	effective_cycle := 0
 	status, ordercode := func() (int, string) {
 		if renew == 1 {
 			ent := util.Mysql.FindOne("entniche_info", map[string]interface{}{
@@ -182,8 +183,8 @@ func (e *Entniche) BuyAgain() {
 			//计算周期
 			start_year := time.Unix(qutil.Int64All((*ent)["startdate"]), 0).Format("2006")
 			end_year := time.Unix(qutil.Int64All((*ent)["enddate"]), 0).Format("2006")
-			effective_cycle := qutil.IntAll(end_year) - qutil.IntAll(start_year) //生效周期
-			expect_cycle := effective_cycle + cycle                              //预计周期
+			effective_cycle = qutil.IntAll(end_year) - qutil.IntAll(start_year) //生效周期
+			expect_cycle := effective_cycle + cycle                             //预计周期
 			if effective_cycle > 3 || expect_cycle > 3 {
 				return -1, ""
 			}
@@ -222,8 +223,9 @@ func (e *Entniche) BuyAgain() {
 	e.ServeJson(map[string]interface{}{
 		"error_code": 0,
 		"data": map[string]interface{}{
-			"status":    status,
-			"ordercode": ordercode,
+			"status":          status,
+			"ordercode":       ordercode,
+			"effective_cycle": effective_cycle,
 		},
 	})
 }

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

@@ -212,7 +212,6 @@ func (o *OrderListDetails) DeleteOrder() error {
 		} else {
 			queryM["order_status"] = map[string]interface{}{"ne": orderStatus_deleted}
 		}
-		queryM["product_type"] = map[string]interface{}{"ne": "企业商机管理"}
 		haveNextPage, res, _ := o.Datas(queryM, pageNum, 10)
 		if len(res) > 0 {
 			res = res[0:1]
@@ -227,7 +226,7 @@ func (o *OrderListDetails) DeleteOrder() error {
 		//删除 取消前 先关闭订单
 		order := util.Mysql.FindOne(tableName_order, queryMap, "id,pay_way,out_trade_no,prepay_time,order_status", "")
 		if order != nil {
-			if qutil.IntAll((*order)["order_status"]) == 0 && qutil.ObjToString((*order)["pay_way"]) != "transferAccounts" { //未支付状态下 删除订单需要先关闭订单
+			if qutil.IntAll((*order)["order_status"]) == 0 && qutil.ObjToString((*order)["pay_way"]) != "transferAccounts" && qutil.ObjToString((*order)["out_trade_no"]) != "" { //未支付状态下 删除订单需要先关闭订单
 				flag = pay.CloseDataExportOrder(qutil.ObjToString((*order)["pay_way"]), qutil.ObjToString((*order)["out_trade_no"]), qutil.ObjToString((*order)["prepay_time"]))
 			} else {
 				flag = true