修改

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

@@ -340,15 +340,16 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 				}
 			}
 			//vip开发票内容
-			subscription_area, industry, subscription_cycle, effective_date := "", "", "", ""
+			subscription_area, industry, subscription_cycle, effective_date, payment_number := "", "", "", "", ""
 			city_count := 0
 			filter := qutil.ObjToString((*order)["filter"])
 			vip_starttime := qutil.ObjToString((*order)["vip_starttime"])
 			vip_endtime := qutil.ObjToString((*order)["vip_endtime"])
+			payment_number = getPayTransactionId(qutil.ObjToString((*order)["pay_way"]), qutil.ObjToString((*order)["out_trade_no"]))
+			vip_type := qutil.Int64All((*order)["vip_type"]) //判断 续费 升级订单
 			vf := new(VipFilter)
 			err := json.Unmarshal([]byte(filter), &vf)
 			if err == nil && vf != nil {
-				log.Println(vf.Area)
 				vip_area := vf.Area    //区域
 				vip_ind := vf.Industry //行业
 				nbs := JyVipSubStruct.NewBuySet(&vip_area, vip_ind)
@@ -409,19 +410,22 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 						} else if year > 0 && month == 0 {
 							subscription_cycle = fmt.Sprintf("%d年", year)
 						}
-						log.Println(subscription_cycle)
 						//有效日期
 						vip_starttime = strings.Replace(vip_starttime[0:10], "-", ".", -1)
 						vip_endtime = strings.Replace(vip_endtime[0:10], "-", ".", -1)
 						effective_date = fmt.Sprintf("%v-%v", vip_starttime, vip_endtime)
-						log.Println(effective_date)
 					}
 				}
 			}
-			//vip
-			product_type = "VIP订阅"
+			if vip_type == 1 {
+				product_type = "VIP订阅（续费）"
+			} else if vip_type == 2 {
+				product_type = "VIP订阅（升级）"
+			} else {
+				product_type = "VIP订阅"
+			}
 			mail_title = "电子发票申请-[剑鱼标讯]VIP订阅（" + order_code + "）"
-			mailcontent = fmt.Sprintf(ExConf.Mail_vip_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, user_email, order_code, create_time, pay_time, pay_way, product_type, pay_money, subscription_area, industry, subscription_cycle, effective_date)
+			mailcontent = fmt.Sprintf(ExConf.Mail_vip_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, user_email, order_code, create_time, payment_number, pay_time, pay_way, product_type, pay_money, subscription_area, industry, subscription_cycle, effective_date)
 		}
 	}
 	//发送邮件
@@ -762,3 +766,26 @@ func GetBrforeMsg(userId, openId string) (name, phone, company, email string) {
 	}
 	return
 }
+
+//获取支付单号
+func getPayTransactionId(payWay, tradeNo string) (transaction_id string) {
+	if payWay == "" || tradeNo == "" {
+		return
+	}
+	table := ""
+	if strings.HasPrefix(payWay, "wx") {
+		table = "weixin_pay"
+	} else if strings.HasPrefix(payWay, "ali") {
+		table = "ali_pay"
+	} else {
+		return
+	}
+	query := map[string]interface{}{
+		"out_trade_no": tradeNo,
+	}
+	r := util.Mysql.FindOne(table, query, "transaction_id", "")
+	if r != nil {
+		transaction_id = qutil.ObjToString((*r)["transaction_id"])
+	}
+	return
+}

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

@@ -52,7 +52,7 @@ func (d *CommonAction) ApplyInvoice() error {
 		go func() {
 			orderdata := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
 				"order_code": order_code,
-			}, "id,filter,user_mail,user_phone,product_type,data_spec,filter_id,order_code,data_count,order_status,order_money,out_trade_no,applybill_type,applybill_company,applybill_taxnum,user_openid,create_time,pay_time,pay_way,pay_money,vip_starttime,vip_endtime,user_id", "")
+			}, "id,filter,user_mail,user_phone,product_type,data_spec,filter_id,order_code,data_count,order_status,order_money,out_trade_no,applybill_type,applybill_company,applybill_taxnum,user_openid,create_time,pay_time,pay_way,pay_money,vip_starttime,vip_endtime,user_id,vip_type", "")
 			tt := time.Now()
 			pay_time := qutil.FormatDate(&tt, qutil.Date_Full_Layout)
 			entity.SendMailToBJFinance(orderdata, pay_time, "", 2, config.GmailAuth)

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

@@ -58,7 +58,6 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 			//"order_status": 1,
 		}
 		oData := util.Mysql.FindOne(tableName_order, query, "prepay_time,create_time,pay_time,pay_way,original_price,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type", "")
-		log.Println("odata:", oData)
 		//查询订单信息
 		if oData == nil || len(*oData) == 0 {
 			return &entity.FuncResult{false, errors.New("未找到此订单"), nil}
@@ -68,12 +67,6 @@ func (this *OrderListDetails) GetOrderPayAllMsg() {
 		if uData == nil || len(*uData) == 0 {
 			return &entity.FuncResult{false, errors.New("数据库查询异常"), nil}
 		}
-		//		//判断用户状态
-		//		uStatus, ok := util.MQFW.FindById("user", userId, `{"i_vip_status":1}`)
-		//		if uStatus == nil || len(*uStatus) == 0 || !ok {
-		//			return &entity.FuncResult{false, errors.New("数据库查询异常"), nil}
-		//		}
-		//		log.Println("udata:", uData)
 		if qutil.IntAll((*oData)["order_status"]) != 1 {
 			return &entity.FuncResult{true, nil, map[string]interface{}{
 				"order": oData,
@@ -433,7 +426,10 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 		//创建时间戳
 		create_time, _ := time.ParseInLocation(qutil.Date_Full_Layout, create_time_str, time.Local)
 		//48小时后的时间戳
-		create_time_stamp := create_time.AddDate(0, 0, 2).Unix()
+		//create_time_stamp_48 := create_time.AddDate(0, 0, 2).Unix()
+		//测试暂时改成1h
+		onehour, _ := time.ParseDuration("1h")
+		create_time_stamp := create_time.Add(onehour).Unix()
 		//当前时间时间戳
 		now_time_stamp := time.Now().Unix()
 		if create_time_stamp < now_time_stamp && qutil.ObjToString(v["product_type"]) == "VIP订阅" {

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -132,19 +132,19 @@
                     </div>
                     <div class="card-content">
                         <div class="item-list">
-                            <label>订阅区域：</label>
+                            <label class="dyqy">订阅区域：</label>
                             <ul class="item-list-parents">
                                 <li class="areaNum"></li>
                             </ul>
                         </div>
                         <div class="item-list">
-                            <label>订阅行业：</label>
+                            <label class="dyhy">订阅行业：</label>
                             <ul class="item-list-parents">
                                 <li><span class="industryNum"></span></li>
                             </ul>
                         </div>
                         <div class="item-list">
-                            <label>订阅周期：</label>
+                            <label class="dyzq">订阅周期：</label>
                             <ul class="item-list-parents">
                                 <li><span class="cyclecount"></li>
                             </ul>
@@ -224,11 +224,7 @@ try{
         	$(".productType").text(r.data.order.product_type+"（试用）");
         }
         //1 续费 2升级
-        if(r.data.order.vip_type==1){
-        	$(".productType").text(r.data.order.product_type+"（续费）");
-        }else if(r.data.order.vip_type==2){
-        	$(".productType").text(r.data.order.product_type+"（升级）");
-        }
+
         //价格
         $(".price").text(r.data.order.original_price/100);
         
@@ -316,6 +312,27 @@ try{
 	           $(".cyclecount").text(filterObj.cyclecount+"天")
 	      }
        }
+       
+        if(r.data.order.vip_type==1){
+        	$(".productType").text(r.data.order.product_type+"（续费）");
+        	$(".dyqy").text("续费区域：");
+        	$(".dyhy").text("续费行业：");
+        	$(".dyzq").text("续费周期：");
+        }else if(r.data.order.vip_type==2){
+        	$(".productType").text(r.data.order.product_type+"（升级）");
+        	if(filterObj.cycleunit==1){
+		        $(".cyclecount").text(filterObj.cyclecount+"年")
+		    }else if(filterObj.cycleunit==2){
+		        $(".cyclecount").text(filterObj.cyclecount+"个月")
+		    }else if(filterObj.cycleunit==3){
+		        $(".cyclecount").text(filterObj.cyclecount+"天")
+		    }else if (filterObj.cycleunit==-1){
+		        $(".cyclecount").text("不延期");
+		    }
+        	$(".dyqy").text("升级区域：");
+        	$(".dyhy").text("升级行业：");
+        	$(".dyzq").text("延长周期：");
+        }
         
         if(r.data.order.order_status==0){       	
           //未支付
@@ -412,7 +429,8 @@ try{
 	    	//倒计时 未购买
 			var create_time=r.data.order.create_time;
 			create_time=create_time.replace(/-/g,'/')
-			var clock_end = +new Date(create_time) + 172800000;
+			//var clock_end = +new Date(create_time) + 172800000;
+			var clock_end = +new Date(create_time) + 3600000;
 			setTimeFunc(clock_end); 
 			setInterval(function(){
 				setTimeFunc(clock_end);

src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -383,13 +383,13 @@
                             } else {
                                 purchase.industrySelect = ["全部行业"]
                             }
-                            if (r.timeSelect!=undefined&&r.company!=undefined){
-                           		purchase.timeSelect=[r.timeSelect,r.company];
-                            }
+//                          if (r.timeSelect!=undefined&&r.company!=undefined){
+//                         		purchase.timeSelect=[r.timeSelect,r.company];
+//                          }
                             $(".weui-icon-checked").click();
                             sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
                             sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
-                            sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
+                            //sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
                           
                         }, false)
                     }