Home Explore Help
Sign In
qmx
/
jy
14
0
Fork 0
Files Issues 2 Pull Requests 0 Wiki
Browse Source

冲突

wangshan 5 years ago
parent
3d391f126e 016e7c852c
commit
85f6f08391
8 changed files with 40 additions and 46 deletions
Split View Show Diff Stats
  1. 4 2
      src/jfw/modules/subscribepay/src/entity/subscribeVip.go
  2. 12 10
      src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go
  3. 3 2
      src/jfw/modules/subscribepay/src/service/vipSubscribePay.go
  4. 2 2
      src/jfw/modules/subscribepay/src/util/vrew.go
  5. 5 4
      src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html
  6. 5 2
      src/web/templates/weixin/vipsubscribe/choose_industry_upgrade.html
  7. 4 2
      src/web/templates/weixin/vipsubscribe/renew_notice.html
  8. 5 22
      src/web/templates/weixin/vipsubscribe/renew_pay.html

+ 4 - 2
src/jfw/modules/subscribepay/src/entity/subscribeVip.go
View File 

@@ -73,11 +73,13 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 
 	var endTime time.Time
 
 	if vmsg.OrderType == 1 { //新订单 计算开始时间 结束时间
 
 		startTime := time.Now()
 
-		if vmsg.Cycleunit == 1 { //年
 
+		/*if vmsg.Cycleunit == 1 { //年
 
 			endTime = startTime.AddDate(vmsg.Cyclecount, 0, 0)
 
 		} else if vmsg.Cycleunit == 2 { //月
 
 			endTime = startTime.AddDate(0, vmsg.Cyclecount, 0)
 
-		}
 
+		}*/
 
+		endTime := util.GetDATE(vmsg.Cycleunit, vmsg.Cyclecount, startTime.Unix())
 
+
 
 		updateMap["vip_starttime"] = qutil.FormatDate(&startTime, qutil.Date_Full_Layout)
 
 		updateMap["vip_endtime"] = qutil.FormatDate(&endTime, qutil.Date_Full_Layout)
 
 	}

+ 12 - 10
src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go
View File 

@@ -127,18 +127,20 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 
 			orderType = 2 //续费操作
 
 			startTime = endTime
 
 		}
 
-		if date_unit == 1 { ///延长时间
 
-			endTime = endTime.AddDate(date_count, 0, 0)
 
-		} else if date_unit == 2 { //月
 
-			endTime = endTime.AddDate(0, date_count, 0)
 
-		}
 
+		//		if date_unit == 1 { ///延长时间
 
+		//			endTime = endTime.AddDate(date_count, 0, 0)
 
+		//		} else if date_unit == 2 { //月
 
+		//			endTime = endTime.AddDate(0, date_count, 0)
 
+		//		}
 
+		endTime = util.GetDATE(date_unit, date_count, end)
 
 		if pay_source == "Renew" && now.Unix() > end { //到期后的续费从当前时间往后延长
 
 			startTime = now
 
-			if date_unit == 1 { ///延长时间
 
-				endTime = startTime.AddDate(date_count, 0, 0)
 
-			} else if date_unit == 2 { //月
 
-				endTime = startTime.AddDate(0, date_count, 0)
 
-			}
 
+			//			if date_unit == 1 { ///延长时间
 
+			//				endTime = startTime.AddDate(date_count, 0, 0)
 
+			//			} else if date_unit == 2 { //月
 
+			//				endTime = startTime.AddDate(0, date_count, 0)
 
+			//			}
 
+			endTime = util.GetDATE(date_unit, date_count, startTime.Unix())
 
 		}
 
 		filter := entity.VipSimpleMsg{
 
 			area,

+ 3 - 2
src/jfw/modules/subscribepay/src/service/vipSubscribePay.go
View File 

@@ -124,12 +124,13 @@ func (this *SubVipPayOrder) CreateOrder() {
 
 		if orderType == 5 { //插入生效时间和结束时间
 
 			timeStamp := qutil.Int64All((*userData)["l_vip_endtime"])
 
 			startTime := time.Unix(timeStamp, 0)
 
-			var endTime time.Time
 
+			/*var endTime time.Time
 
 			if filter.Cycleunit == 1 { //年
 
 				endTime = startTime.AddDate(filter.Cyclecount, 0, 0)
 
 			} else if filter.Cycleunit == 2 { //月
 
 				endTime = startTime.AddDate(0, filter.Cyclecount, 0)
 
-			}
 
+			}*/
 
+			endTime := util.GetDATE(filter.Cycleunit, filter.Cycleunit, timeStamp)
 
 			insertMap["vip_starttime"] = qutil.FormatDate(&startTime, qutil.Date_Full_Layout)
 
 			insertMap["vip_endtime"] = qutil.FormatDate(&endTime, qutil.Date_Full_Layout)
 
 		}

+ 2 - 2
src/jfw/modules/subscribepay/src/util/vrew.go
View File 

@@ -266,7 +266,7 @@ func MergeKws(userId string) {
 
 }
 
 
 //m 月 超过一年传12+n月 如14; endtime 当前周期结束时间戳 int64 ;val -1:年 2:月
 
-func GetDATE(val int, m int, endtime int64) (_endtime int64) {
 
+func GetDATE(val int, m int, endtime int64) (_endtime time.Time) {
 
 	if val == 1 {
 
 		m = m * 12
 
 	}
 
@@ -294,5 +294,5 @@ func GetDATE(val int, m int, endtime int64) (_endtime int64) {
 
 		_date = strconv.Itoa(date_y) + "-" + mstr + "-" + strconv.Itoa(date_d)
 
 	}
 
 	lastDate, _ := time.ParseInLocation(qutil.Date_Short_Layout, _date, time.Local)
 
-	return lastDate.Unix()
 
+	return lastDate
 
 }

+ 5 - 4
src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html
View File 

@@ -13,13 +13,17 @@
 
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="/vipsubscribe/css/choose_area.css?v={{Msg "seo" "version"}}4">
 
+	{{include "/common/weixin.html"}}
 
 </head>
 
 <style type="text/css">
 
 	body,html {
 
-		/*height: 100%;*/
 
+		height: 100%;
 
 	}
 
 </style>
 
 <body>
 
+	<script type="text/javascript">
 
+		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 
+	</script>
 
     <div id="choose_area" >
 
         <div class="result">
 
             <!-- 首次购买 显示"已选择" -----  升级订阅显示"已新增" -->
 
@@ -389,10 +393,7 @@
 
     <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 
     <script src="/vipsubscribe/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
 
     <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 
-    {{include "/common/weixin.html"}}
 
     <script>
 
-  		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 
-  		//
 
     	//已购买
 
     	var buystr = "";
 
         $DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {

+ 5 - 2
src/web/templates/weixin/vipsubscribe/choose_industry_upgrade.html
View File 

@@ -11,6 +11,8 @@
 
         <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
 
         <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 
         <link rel="stylesheet" href="/vipsubscribe/css/choose_industry.css?v={{Msg "seo" "version"}}">
 
+        {{include "/common/weixin.html"}}
 
+        
     </head>
 
     <style type="text/css">
 
     	body,html {
 
@@ -18,6 +20,9 @@
 
 		}
 
     </style>
 
     <body>
 
+    	<script type="text/javascript">
 
+    		initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 
+    	</script>
 
         <main class="choose_industry main">
 
             <div class="result">
 
                 <span class="label">已新增：</span>
 
@@ -249,9 +254,7 @@
 
         <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 
         <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 
         <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 
-        {{include "/common/weixin.html"}}
 
         <script>
 
-           initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 
            //
 
            // 点击导航跳转
 
             $("body").on('click','.slide a',function(){

+ 4 - 2
src/web/templates/weixin/vipsubscribe/renew_notice.html
View File 

@@ -9,6 +9,7 @@
 
 		<link rel="stylesheet" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
 
 		<link rel="stylesheet" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
 		<link rel="stylesheet" href="/vipsubscribe/css/vip_service_expire.css?v={{Msg "seo" "version"}}">
 
+		{{include "/common/weixin.html"}}
 
 	</head>
 
 	<style type="text/css">
 
 		body,html {
 
@@ -16,6 +17,9 @@
 
 		}
 
 	</style>
 
 	<body>
 
+		<script type="text/javascript">
 
+			initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 
+		</script>
 
 		<div class="vip_service_expire layout_top-bottom">
 
 			<div class="service_expire_tip layou_top">
 
                 <div class="tip_title_box">
 
@@ -54,9 +58,7 @@
 
     	<script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 
     	<script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 
     	<script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 
-		{{include "/common/weixin.html"}}
 
 		<script type="text/javascript">
 
-			initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
 
 			//
 
 			$DoPost("/subscribepay/renewUpgrade/getBuyMsg", {}, function (data) {
 
 				var area = data.area;

+ 5 - 22
src/web/templates/weixin/vipsubscribe/renew_pay.html
View File 

@@ -461,7 +461,6 @@
 
             if (data) {
 
                 area = data.area;
 
 			    buyerclass = data.buyerclass;
 
-			    cycleunit = data.cycleunit;
 
 			    cyclecount = data.cyclecount;
 
 			    startTime = data.start;
 
 			    starts = data.starttime;
 
@@ -532,41 +531,25 @@
 
 			    	let endtime = end.split("/");
 
 			    	let endYear = Number(endtime[0]);
 
 			    	let endMonth = Number(endtime[1]);
 
-			    	let endDay = Number(endtime[2]);
 
 			    	let start = new Date(starts*1000).toLocaleDateString();
 
 			    	let starttime = start.split("/");
 
 			    	let startYear = Number(starttime[0]);
 
 			    	let startMonth = Number(starttime[1]);
 
-			    	let startDay = Number(starttime[2]);
 
 			    	let year = "";
 
 			    	let month = "";
 
 			    	if(endYear > startYear){
 
 			    		if(endMonth > startMonth){
 
-			    			if(endDay < startDay){
 
-			    				year = endYear - startYear;
 
-			    				month = endMonth - startMonth -1;
 
-			    			}else{
 
-			    				year = endYear - startYear;
 
-			    				month = endMonth - startMonth;
 
-			    			}
 
+		    				year = endYear - startYear;
 
+		    				month = endMonth - startMonth;
 
 			    		}else{
 
-			    			if(endDay < startDay){
 
-			    				year = endYear - startYear-1;
 
-			    				month = 12+Number(endMonth)-startMonth -1;
 
-			    			}else{
 
-			    				year = endYear - startYear-1;
 
-			    				month = 12+Number(endMonth)-startMonth;
 
-			    			}
 
+		    				year = endYear - startYear-1;
 
+		    				month = 12+Number(endMonth)-startMonth;
 
 			    			if(year === 0){
 
 			    				year = "";
 
 			    			}
 
 			    		}
 
 			    	}else if(endYear === startYear){
 
-			    		if(endDay < startDay){
 
-		    				month = endMonth - startMonth -1;
 
-		    			}else{
 
-		    				month = endMonth - startMonth;
 
-		    			}
 
+		    			month = endMonth - startMonth;
 
 			    	}
 
 			    	//
 
 			    	if(year !== "" && month !==""){