xg

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

@@ -456,12 +456,23 @@ func SendMailToBJFinance(order *map[string]interface{}, pay_time, transaction_id
 					} 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)
+					if vip_type != 2 {
+						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)
+						}
+					} else {
+						log.Println(vf.Cyclecount, "---", vf.Cycleunit)
+						if vf.Cycleunit == 1 {
+							subscription_cycle = fmt.Sprintf("%d年", vf.Cyclecount)
+						} else if vf.Cycleunit == 2 {
+							subscription_cycle = fmt.Sprintf("%d个月", vf.Cyclecount)
+						} else if vf.Cycleunit == -1 {
+							subscription_cycle = "不延期"
+						}
 					}
 					//有效日期
 					vip_starttime = strings.Replace(vip_starttime[0:10], "-", ".", -1)

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

@@ -286,7 +286,6 @@ try{
          		$(".areaNum").text("全国");
          	}
          	//行业
-         	
          	if(filterObj.addindustry[0]=="no"){
          		$(".industryNum").text("无");
          	}else{
@@ -296,7 +295,16 @@ try{
          			$(".industryNum").text(filterObj.addindustry.length+"个行业");
          		}
          	}
-         	
+
+//			if(filterObj.addindustry.length==0){
+//       		$(".industryNum").text("全行业");
+//          }else{
+//          	if(filterObj.addindustry[0]=="no"){
+//          		$(".industryNum").text("无");
+//          	}else{
+//          		$(".industryNum").text(filterObj.addindustry.length+"个行业");
+//          	}
+//          }
          }