周琦

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

@@ -334,8 +334,8 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 			subscription_area, industry, subscription_cycle, effective_date := "", "", "", ""
 			city_count := 0
 			filter := qutil.ObjToString((*order)["filter"])
-			vip_starttime := qutil.ObjToString((*order)["vip_starttime"])[0:10]
-			vip_endtime := qutil.ObjToString((*order)["vip_endtime"])[0:10]
+			vip_starttime := qutil.ObjToString((*order)["vip_starttime"])
+			vip_endtime := qutil.ObjToString((*order)["vip_endtime"])
 			vf := new(VipFilter)
 			err := json.Unmarshal([]byte(filter), &vf)
 			if err == nil && vf != nil {
@@ -366,27 +366,48 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 					} else {
 						industry = "全行业"
 					}
-
 					// 订阅周期 有效日期
 					if vip_endtime != "" && vip_starttime != "" {
+						year := 0
+						month := 0
 						//订阅周期
-
+						vip_starttime_stamp, _ := time.ParseInLocation(qutil.Date_Full_Layout, vip_starttime, time.Local)
+						vip_endtime_stamp, _ := time.ParseInLocation(qutil.Date_Full_Layout, vip_endtime, time.Local)
+						start_year := time.Unix(qutil.Int64All(vip_starttime_stamp.Unix()), 0).Year()
+						end_year := time.Unix(qutil.Int64All(vip_endtime_stamp.Unix()), 0).Year()
+						start_month := int(time.Unix(qutil.Int64All(vip_starttime_stamp.Unix()), 0).Month())
+						end_month := int(time.Unix(qutil.Int64All(vip_endtime_stamp.Unix()), 0).Month())
+						if end_year > start_year {
+							if end_month > start_month {
+								year = end_year - start_year
+								month = end_month - start_month
+							} else {
+								year = end_year - start_year - 1
+								month = 12 + end_month - start_month
+							}
+						} else if end_year == start_year {
+							month = end_month - start_month
+						}
+						if year == 0 && month > 0 {
+							subscription_cycle = fmt.Sprintf("%d个月", month)
+						} else if year > 0 && month > 0 {
+							subscription_cycle = fmt.Sprintf("%d年%d个月", year, month)
+						} else if year > 0 && month == 0 {
+							subscription_cycle = fmt.Sprintf("%d年", year)
+						}
 						log.Println(subscription_cycle)
 						//有效日期
-						vip_starttime = strings.Replace(vip_starttime, "-", ".", -1)
-						vip_endtime = strings.Replace(vip_endtime, "-", ".", -1)
+						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订阅"
 			mail_title = "电子发票申请-[剑鱼标讯]VIP订阅（" + order_code + "）"
-
-			mailcontent = fmt.Sprintf(ExConf.Mail_vip_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, order_code, create_time, pay_time, pay_way, product_type, pay_money, subscription_area, industry, "订阅周期", effective_date)
+			mailcontent = fmt.Sprintf(ExConf.Mail_vip_invoice_finance_content, bill_title, company_flag, bill_company, taxnum_flag, bill_taxnum, order_code, create_time, pay_time, pay_way, product_type, pay_money, subscription_area, industry, subscription_cycle, effective_date)
 		}
 	}
 	//发送邮件

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -696,7 +696,6 @@
 					var psss = 0;
 					for(var index in object){
 					    var obj=object[index];
-					    console.log(obj)
 					    if(obj.product_type=="历史数据"){
 				    		count++;
 							var id = obj.id;
@@ -878,16 +877,53 @@
 	                        	industry_vip=industry_vip+"个";
 	                        }
 	                        var cyclecount_vip = filter_vip.cyclecount;	//时长
-	                        var cycleunit_vip = filter_vip.cycleunit;		//单位 1:年 2:月 3:天
+	                        var cycleunit_vip = filter_vip.cycleunit;//单位 1:年 2:月 3:天
 	                        //订阅周期
 	                        var effectiveduration_vip=""
-	                        if(cycleunit_vip==1){
+	                        if((obj.vip_starttime!=undefined)&&(obj.vip_endtime!=undefined)){
+					       		var start_time_vip = obj.vip_starttime;
+					       		var end_time_vip = obj.vip_endtime;
+					       		var start_time_arr = start_time_vip.split(" ")[0].split("-")
+					       		var end_time_arr = end_time_vip.split(" ")[0].split("-")
+					       		var start_year=start_time_arr[0];
+					       		var start_month=start_time_arr[1];
+					       		var end_year=end_time_arr[0];
+					       		var end_month=end_time_arr[1];
+					       		
+					       		var year = 0;
+								var month = 0;
+								if(end_year > start_year){
+						    		if(end_month > start_month){
+					    				year = enend_yeardYear - start_year;
+					    				month = end_month - start_month;
+						    		}else{
+					    				year = end_year - start_year-1;
+					    				month = 12+Number(end_month)-start_month;
+						    		}
+						    	}else if(end_year == start_year){
+					    			month = end_month - start_month;
+						    	}
+						    	
+						    	if(year != 0 && month !=0){
+						    		effectiveduration_vip=year+"年"+month+"个月";
+						    	}else if(year !== 0&& month ===0){
+						    		effectiveduration_vip=year+"年";
+						    	}else if(year === 0&& month !==0){
+						    		effectiveduration_vip=month+"个月";
+						    	}
+						    	if(cycleunit_vip==3){
+						    		effectiveduration_vip=cyclecount_vip+"天";	 
+						    	}
+					      }else{
+					       	if(cycleunit_vip==1){
 	                        	effectiveduration_vip=cyclecount_vip+"年";
 	                        }else if(cycleunit_vip==2){
 	                        	effectiveduration_vip=cyclecount_vip+"个月"
 	                        }else if(cycleunit_vip==3){
 	                        	effectiveduration_vip=cyclecount_vip+"天";	                    
 	                        }
+					      }
+	                        
 	                        var vip_status =obj.i_vip_status;	// 1:试用 2:正式 -1:试用到期 -2:正式到期
 	                        //订单状态 0待支付 1已完成 -1删除  
 	                        var orderStatus_vip =  obj.order_status;

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

@@ -142,7 +142,7 @@
                         <div class="item-list">
                             <label>订阅周期：</label>
                             <ul class="item-list-parents">
-                                <li><span class="cyclecount"></span><span class="cycleunit">个月</span></li>
+                                <li><span class="cyclecount"></li>
                             </ul>
                         </div>
                         <div class="item-list line_cycle" style="display:none">
@@ -255,19 +255,51 @@ try{
             $(".industryNum").text("全行业");
           }
           
-          //周期数
-          $(".cyclecount").text(filterObj.cyclecount);
-          //周期单位
-          if(filterObj.cycleunit==1){
-            $(".cycleunit").text("年")
-          }else if(filterObj.cycleunit==2){
-            $(".cycleunit").text("个月")
-          }else if(filterObj.cycleunit==3){
-          	 $(".cycleunit").text("天")
-          }
-
         }
         
+        //周期
+       if((r.data.order.vip_starttime!=undefined)&&(r.data.order.vip_endtime!=undefined)){
+       		var start_time_vip = r.data.order.vip_starttime;
+       		var end_time_vip = r.data.order.vip_endtime;
+       		var start_time_arr = start_time_vip.split(" ")[0].split("-")
+       		var end_time_arr = end_time_vip.split(" ")[0].split("-")
+       		var start_year=start_time_arr[0];
+       		var start_month=start_time_arr[1];
+       		var end_year=end_time_arr[0];
+       		var end_month=end_time_arr[1];
+       		
+       		var year = 0;
+			var month = 0;
+			if(end_year > start_year){
+	    		if(end_month > start_month){
+    				year = enend_yeardYear - start_year;
+    				month = end_month - start_month;
+	    		}else{
+    				year = end_year - start_year-1;
+    				month = 12+Number(end_month)-start_month;
+	    		}
+	    	}else if(end_year === start_year){
+    			month = end_month - start_month;
+	    	}
+	    	
+	    	if(year != 0 && month !=0){
+	    		$(".cyclecount").text(year+"年"+month+"个月");
+	    	}else if(year !== 0&& month ===0){
+	    		$(".cyclecount").text(year+"年");
+	    	}else if(year === 0&& month !==0){
+	    		$(".cyclecount").text(month+"个月");
+	    	}
+       }else{
+       		//未支付
+	      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+"天")
+	      }
+       }
+        
         if(r.data.order.order_status==0){
           //未支付
           $("#pageTitle").text("待付款");