upd

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/impl/PackageServiceImpl.java

@@ -1699,7 +1699,8 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
         }
 
         // 查询设备是否有有效的套餐
-        String sql = "SELECT COUNT(*) as count FROM usersuit WHERE packid!=1 and devid = '" + devid + "' AND invalid > " + DateTimeUtil.longtime();
+        String tm = DateTimeUtil.longtime();
+        String sql = "SELECT COUNT(*) as count FROM usersuit WHERE packid not IN (1,235,316,569,635,904) and devid = '" + devid + "' AND invalid > " + tm + " and effect < " + tm;
         logger.info(sql);
         List<Map<String, Object>> result = baseDao.getMapList(sql);
 

com.sharemao.web.manager/src/main/java/test/SMD.java

@@ -24,9 +24,9 @@ public class SMD
 {
 	public static void main(String[] args) throws Exception 
 	{
-        changesmd();
+//        changesmd();
 //        updrv();
-//        show();
+        show();
 
 
     }
@@ -121,14 +121,13 @@ public class SMD
 			public void execute(String line)
 			{
 //				String sqli="update devinit set showdialog=1 where devid ='"+line+"';";
-//                writer.println(sqli);
-//                writer.flush();
+//                RCPService.getBaseService().execSql(sqli);
 
-//                String sql="select * from device where sn='"+line+"'";
-//                List<Map<String, Object>> devices = DAOHelper.find("fcs", sql);
-//                if (devices!=null&&devices.size()>0){
-//                    System.out.println(line);
-//                }
+                String sql="select * from device where sn='"+line+"'";
+                List<Map<String, Object>> devices = DAOHelper.find("fcs", sql);
+                if (devices!=null&&devices.size()>0){
+                    System.out.println(line);
+                }
 
 //                String[] lines = line.split("\t");
 //                String iccid = lines[0];
@@ -139,11 +138,11 @@ public class SMD
 //                String sqli2="update device"+(Long.parseLong(line)%32)+" set devstat=0 where devid='"+line+"';";
 //                RCPService.getMifiService().execSql(sqli2);
 
-                String sql="select * from device"+(Long.parseLong(line)%32)+" where devid='"+line+"'";
-                List<Map<String, Object>> devices =RCPService.getMifiService().getMapList(sql);
-                if (devices == null) {
-                    System.out.println(line);
-                }
+//                String sql="select * from device"+(Long.parseLong(line)%32)+" where devid='"+line+"'";
+//                List<Map<String, Object>> devices =RCPService.getMifiService().getMapList(sql);
+//                if (devices == null) {
+//                    System.out.println(line);
+//                }
             }
 		});
 	}

com.sharemao.web.xw3/src/main/java/com/sharemao/web/wx/ctrl/PayCtrl.java

@@ -272,9 +272,7 @@ public class PayCtrl
 			JSONArray dataJson = resJson.getJSONArray("data");
 			context.getRequest().setAttribute("cons", dataJson);
 		}
-		return new TextView("/pkgorderali.jsp");
-//		return new TextView("/pkgordersyb.jsp");
-//		return new TextView("/pkgorder.jsp");
+		return new TextView("/pkgorder.jsp");
 	}
 
 	/**
@@ -436,9 +434,7 @@ public class PayCtrl
 		}
 		context.getRequest().setAttribute("pkgInfo", pkgInfo);
 		context.getRequest().setAttribute("devid", devid);
-		return new TextView("/pkgorderali.jsp");
-//		return new TextView("/pkgordersyb.jsp");
-//		return new TextView("/pkgorder.jsp");
+		return new TextView("/pkgorder.jsp");
 	}
 	
 	/**
@@ -1629,9 +1625,7 @@ public class PayCtrl
 			context.getRequest().setAttribute("balance", "0.00");
 		}
 		para.forEach((k,v)->context.getRequest().setAttribute(k, v));
-		return new TextView("/benefitSubmitAli.jsp");
-//		return new TextView("/benefitSubmitSyb.jsp");
-//		return new TextView("/benefitSubmit.jsp");
+		return new TextView("/benefitSubmit.jsp");
 	}
 
     @Path(value="/submitorder.do")
@@ -2291,8 +2285,7 @@ public class PayCtrl
     //        String transactionId = paramMap.get("transaction_id").toString();
             log.info("处理订单：orderno:"+orderid);
             para.put("orderid", orderid);
-            para.put("transaction_id", "");
-    //        para.put("transaction_id", transactionId);
+            para.put("transaction_id", paramMap.get("chnltrxid")[0]);
             GzhUtil.toM3Sign(para);
             String result = GzhUtil.sendPost(Constants.m3IntAddr+"/payment/gzhRecharge.do", para);
             log.info("下单购买后回调结果："+result);
@@ -2323,7 +2316,7 @@ public class PayCtrl
             String orderid = paramMap.get("outtrxid")[0];
             log.info("处理订单：orderno:"+orderid);
             para.put("orderid", orderid);
-            para.put("transaction_id", "");
+            para.put("transaction_id", paramMap.get("chnltrxid")[0]);
             GzhUtil.toM3Sign(para);
             String result = GzhUtil.sendPost(Constants.m3IntAddr+"/payment/memRecharge.do", para);
             log.info("下单购买后回调结果："+result);
@@ -2354,7 +2347,7 @@ public class PayCtrl
             String orderid = paramMap.get("outtrxid")[0];
             log.info("处理加速包购买订单：orderno:"+orderid);
             para.put("orderid", orderid);
-            para.put("transaction_id", "");
+            para.put("transaction_id", paramMap.get("chnltrxid")[0]);
             GzhUtil.toM3Sign(para);
             String result = GzhUtil.sendPost(Constants.m3IntAddr+"/payment/speedPackRecharge.do", para);
             log.info("加速包购买后回调结果："+result);

com.sharemao.web.xw3/src/main/webapp/benefitSubmit.jsp

@@ -22,6 +22,7 @@
     <script language="javascript" type="text/javascript" src="/static/js/animate.min.js"></script>
     <script language="javascript" type="text/javascript" src="/static/js/main.js"></script>
 	<script language="javascript" type="text/javascript" src="/static/js/swiper-bundle.min.js"></script>
+    <script type="text/javascript" src="/static/js/ap.js"></script>
 </head>
 
 <body class="topbg">
@@ -44,13 +45,22 @@
             <input type="radio" name="pay" value="balance" class="redcheck" id="WalletPay">
         </div>
     </div>
+    <div class="form-item">
+        <div class="form-text">
+            <img src="/static/img/icon-pay-alipay.png" class="icon">
+            <span>支付宝支付支付</span>
+        </div>
+        <div class="select">
+            <input type="radio" name="pay" value="alipay" class="redcheck" checked="">
+        </div>
+    </div>
     <div class="form-item">
         <div class="form-text">
             <img src="/static/img/icon-pay-weixin.png" class="icon">
             <span>微信支付</span>
         </div>
         <div class="select">
-            <input type="radio" name="pay" value="wx" class="redcheck" id="pay" checked="">
+            <input type="radio" name="pay" value="wx" class="redcheck">
         </div>
     </div>
 </div>
@@ -86,12 +96,15 @@
         <div class="icon-close" onclick="CloseBox('PopCoupons')"></div>
     </div>
 </div>
-<form class="form_wrap">
+<form class="form_wrap" method="post" action="/mifi/tosybpay.do" accept-charset="utf-8">
 	<input  type="hidden" name="amount" id="trxamt" value="${amount }"/>
 	<input  type="hidden" name="devid" id="devid"  value="${devid}"/>
 	<input  type="hidden" name="type" id="type"  value="3"/>
 	<input 	type="hidden" name="paytype" id="paytype" value="0" />
 	<input  type="hidden" name="speedpackid" id="speedpackid"  value="${speedpackid }"/>
+
+	<input  type="hidden" id="notify" name="notify" value=""/>
+    <input  type="hidden" id="outTradeNo" name="outTradeNo" value=""/>
 </form>
 
 <div class="mask"></div>
@@ -111,7 +124,7 @@
         	if (isRequesting) return;
 			isRequesting = true;
 			$(".mask").show();
-			
+
         	var ubalance=parseFloat($("#ubalance").val());
         	var pkgprice=parseFloat($("#trxamt").val());
 			var input = $('.form_wrap').find('input,select'), param = {};
@@ -122,38 +135,40 @@
 				//alert(item);
             });
             var paytype = $(".redcheck:checked").val();
-    		if(paytype == "wx") {
-				$.post('/mifi/buyYLPdts.do',param,function(res){
+    		if(paytype == "alipay") {
+				$.post('/mifi/toalipay.do',param,function(res){
 	                $('.mask').hide();
 	                if(typeof(res) === 'string'){
 	                    res = JSON.parse(res);
 						//alert(res.pay_info);
 	                }
-					
+
 	                if(res.status !== "200"){
 	                    alert(res.msg);
 	                }else{
-	                    var payInfo = JSON.parse(res.pay_info);
-						WeixinJSBridge.invoke(
-								'getBrandWCPayRequest',{
-									"appId" : payInfo.appId, //公众号名称，由商户传入
-									"timeStamp": payInfo.timeStamp, //戳，自1970 年以来的秒数
-									"nonceStr" : payInfo.nonceStr, //随机串
-									"package" : payInfo.package,
-									"signType" : payInfo.signType, //微信签名方式:
-									"paySign" : payInfo.paySign  //微信签名,
-									
-								},function(res){
-									if(res.err_msg == "get_brand_wcpay_request:ok" ) {
-										// 此处可以使用此方式判断前端返回,微信团队郑重提示：res.err_msg 将在用户支付成功后返回ok，但并不保证它绝对可靠。
-										location.href = "/result.html";
-									}
-								}
-							);
+                   //     location.href = res.pay_info;
+                      _AP.pay(res.pay_info);
+                      return false;
 	                }
 					isRequesting = false;
 	            });
-    		} else {
+    		} else if(paytype == "wx") {
+                $.post('/mifi/submitorder.do',param,function(res){
+                       $('.mask').hide();
+                       if(typeof(res) === 'string'){
+                           res = JSON.parse(res);
+                       }
+
+                       if(res.status !== "200"){
+                           alert(res.msg);
+                       }else{
+                           $("#notify").val(res.notify);
+                           $("#outTradeNo").val(res.outTradeNo);
+                           $('.form_wrap').submit();
+                       }
+                       isRequesting = false;
+                   });
+            } else {
     			if(ubalance>=pkgprice) {
 					param['amount']=pkgprice;
 					$.post('/mifi/memPackRechargeToSpeedPack.do',param,function(res){

com.sharemao.web.xw3/src/main/webapp/benefitSubmitAli.jsp

@@ -1,175 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=yes" />
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <meta name="applicable-device" content="mobile">
-    <meta name="format-detection" content="telephone=no" />
-    <meta http-equiv="title" content="" />
-    <title>会员权益</title>
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    <link rel="stylesheet" href="/static/css/animate.min.css" type="text/css" media="all" />
-	<link rel="stylesheet" href="/static/css/style.css?v=1" type="text/css" media="all" />
-	<link rel="stylesheet" href="/static/css/swiper-bundle.min.css" type="text/css" media="all" />
-    <script language="javascript" type="text/javascript" src="/static/js/jquery-3.6.0.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/animate.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/main.js"></script>
-	<script language="javascript" type="text/javascript" src="/static/js/swiper-bundle.min.js"></script>
-</head>
-
-<body class="topbg">
-<div class="box">
-    <div class="form-item">
-        <label>权益卡价格</label>
-        <div class="form-text">￥${amount }</div>
-    </div>
-<!--     <div class="form-item">
-        <label>优惠券选择</label>
-        <div class="form-text" onclick="ShowBox('PopCoupons')" id="coupons">暂无可用优惠券</div>
-    </div> -->
-    <div class="form-item">
-        <div class="form-text">
-            <img src="/static/img/icon-wallet.png" class="icon">
-            <span>钱包特惠支付(余额:￥${balance })</span>
-			<input id="ubalance" value="${balance }" type="hidden">
-        </div>
-        <div class="select">
-            <input type="radio" name="pay" value="balance" class="redcheck" id="WalletPay">
-        </div>
-    </div>
-    <div class="form-item">
-        <div class="form-text">
-            <img src="/static/img/icon-pay-alipay.png" class="icon">
-            <span>支付宝支付支付</span>
-        </div>
-        <div class="select">
-            <input type="radio" name="pay" value="alipay" class="redcheck" checked="">
-        </div>
-    </div>
-    <div class="form-item">
-        <div class="form-text">
-            <img src="/static/img/icon-pay-weixin.png" class="icon">
-            <span>微信支付，请联系在线客服充值</span>
-        </div>
-        <div class="select">
-
-        </div>
-    </div>
-</div>
-<div class="apply-btn">
-    <button class="btn" id="pay-btn">立即支付 ￥${amount }</button>
-</div>
-<!--弹层-优惠券-->
-<div class='menu-mask' id="PopCoupons">
-    <div class="popbox animated fadeInUp">
-        <h2 class="tcenter">选择优惠券</h2>
-        <div class="popbox-con">
-            <div class="lite-card-select btn-coupons">
-                <div class="list">
-                    <div class="item">
-                        <div class="name" data="满1500减100" data-getprice="1500" data-price="100">满1500减100</div>
-                        <div class="allow"></div>
-                    </div>
-                    <div class="item">
-                        <div class="name" data="满500减50" data-getprice="500" data-price="50">满500减50</div>
-                        <div class="allow"></div>
-                    </div>
-                    <div class="item">
-                        <div class="name" data="满200减30" data-getprice="200" data-price="30">满200减30</div>
-                        <div class="allow"></div>
-                    </div>
-                    <div class="item">
-                        <div class="name" data="满100减10" data-getprice="100" data-price="10">满100减10</div>
-                        <div class="allow"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="icon-close" onclick="CloseBox('PopCoupons')"></div>
-    </div>
-</div>
-<form class="form_wrap">
-	<input  type="hidden" name="amount" id="trxamt" value="${amount }"/>
-	<input  type="hidden" name="devid" id="devid"  value="${devid}"/>
-	<input  type="hidden" name="type" id="type"  value="3"/>
-	<input 	type="hidden" name="paytype" id="paytype" value="0" />
-	<input  type="hidden" name="speedpackid" id="speedpackid"  value="${speedpackid }"/>
-</form>
-
-<div class="mask"></div>
-<script>
-	var thumbSwiper = new Swiper(".benefit-list", {
-	    spaceBetween: 10,
-	    slidesPerView: "auto",
-	    freeMode: true,
-	    watchSlidesProgress: true,
-	});
-    document.addEventListener('DOMContentLoaded', function() {
-        const payButton = document.getElementById('pay-btn');
-
-        // 提交订单按钮事件
-        var isRequesting = false;
-        payButton.addEventListener('click', function(e) {
-        	if (isRequesting) return;
-			isRequesting = true;
-			$(".mask").show();
-			
-        	var ubalance=parseFloat($("#ubalance").val());
-        	var pkgprice=parseFloat($("#trxamt").val());
-			var input = $('.form_wrap').find('input,select'), param = {};
-            input.each(function(i,item){
-                item = $(item);
-                var vType = item.attr('vtype'), ind = 0;
-                param[item.attr('name')] = item.val();
-				//alert(item);
-            });
-            var paytype = $(".redcheck:checked").val();
-    		if(paytype == "alipay") {
-				$.post('/mifi/toalipay.do',param,function(res){
-	                $('.mask').hide();
-	                if(typeof(res) === 'string'){
-	                    res = JSON.parse(res);
-						//alert(res.pay_info);
-	                }
-					
-	                if(res.status !== "200"){
-	                    alert(res.msg);
-	                }else{
-                        location.href = res.pay_info;
-	                }
-					isRequesting = false;
-	            });
-    		} else {
-    			if(ubalance>=pkgprice) {
-					param['amount']=pkgprice;
-					$.post('/mifi/memPackRechargeToSpeedPack.do',param,function(res){
-					    $('.mask').hide();
-					    if(res == 'OK'){
-							alert("支付成功");
-							location.href = "/device/getDevInfo.do?sn="+$("#devid").val();
-					    } else {
-							alert(res);
-							if(res == '用户余额不足！'){
-								location.href = "/mifi/getMember.do";
-							}
-						}
-						isRequesting = false;
-					},'json');
-				} else {
-					alert("您的余额不足，请使用微信支付");
-					$('.mask').hide();
-					isRequesting = false;
-				}
-    		}
-        });
-    });
-</script>
-</body>
-</html>

com.sharemao.web.xw3/src/main/webapp/benefitSubmitSyb.jsp

@@ -1,171 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=yes" />
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <meta name="applicable-device" content="mobile">
-    <meta name="format-detection" content="telephone=no" />
-    <meta http-equiv="title" content="" />
-    <title>会员权益</title>
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    <link rel="stylesheet" href="/static/css/animate.min.css" type="text/css" media="all" />
-	<link rel="stylesheet" href="/static/css/style.css?v=1" type="text/css" media="all" />
-	<link rel="stylesheet" href="/static/css/swiper-bundle.min.css" type="text/css" media="all" />
-    <script language="javascript" type="text/javascript" src="/static/js/jquery-3.6.0.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/animate.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/main.js"></script>
-	<script language="javascript" type="text/javascript" src="/static/js/swiper-bundle.min.js"></script>
-</head>
-
-<body class="topbg">
-<div class="box">
-    <div class="form-item">
-        <label>权益卡价格</label>
-        <div class="form-text">￥${amount }</div>
-    </div>
-<!--     <div class="form-item">
-        <label>优惠券选择</label>
-        <div class="form-text" onclick="ShowBox('PopCoupons')" id="coupons">暂无可用优惠券</div>
-    </div> -->
-    <div class="form-item">
-        <div class="form-text">
-            <img src="/static/img/icon-wallet.png" class="icon">
-            <span>钱包特惠支付(余额:￥${balance })</span>
-			<input id="ubalance" value="${balance }" type="hidden">
-        </div>
-        <div class="select">
-            <input type="radio" name="pay" value="balance" class="redcheck" id="WalletPay">
-        </div>
-    </div>
-    <div class="form-item">
-        <div class="form-text">
-            <img src="/static/img/icon-pay-weixin.png" class="icon">
-            <span>微信支付</span>
-        </div>
-        <div class="select">
-            <input type="radio" name="pay" value="wx" class="redcheck" id="pay" checked="">
-        </div>
-    </div>
-</div>
-<div class="apply-btn">
-    <button class="btn" id="pay-btn">立即支付 ￥${amount }</button>
-</div>
-<!--弹层-优惠券-->
-<div class='menu-mask' id="PopCoupons">
-    <div class="popbox animated fadeInUp">
-        <h2 class="tcenter">选择优惠券</h2>
-        <div class="popbox-con">
-            <div class="lite-card-select btn-coupons">
-                <div class="list">
-                    <div class="item">
-                        <div class="name" data="满1500减100" data-getprice="1500" data-price="100">满1500减100</div>
-                        <div class="allow"></div>
-                    </div>
-                    <div class="item">
-                        <div class="name" data="满500减50" data-getprice="500" data-price="50">满500减50</div>
-                        <div class="allow"></div>
-                    </div>
-                    <div class="item">
-                        <div class="name" data="满200减30" data-getprice="200" data-price="30">满200减30</div>
-                        <div class="allow"></div>
-                    </div>
-                    <div class="item">
-                        <div class="name" data="满100减10" data-getprice="100" data-price="10">满100减10</div>
-                        <div class="allow"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="icon-close" onclick="CloseBox('PopCoupons')"></div>
-    </div>
-</div>
-<form class="form_wrap" method="post" action="/mifi/tosybpay.do" accept-charset="utf-8">
-	<input  type="hidden" name="amount" id="trxamt" value="${amount }"/>
-	<input  type="hidden" name="devid" id="devid"  value="${devid}"/>
-	<input  type="hidden" name="type" id="type"  value="3"/>
-	<input 	type="hidden" name="paytype" id="paytype" value="0" />
-	<input  type="hidden" name="speedpackid" id="speedpackid"  value="${speedpackid }"/>
-
-	<input  type="hidden" id="notify" name="notify" value=""/>
-    <input  type="hidden" id="outTradeNo" name="outTradeNo" value=""/>
-
-</form>
-
-<div class="mask"></div>
-<script>
-	var thumbSwiper = new Swiper(".benefit-list", {
-	    spaceBetween: 10,
-	    slidesPerView: "auto",
-	    freeMode: true,
-	    watchSlidesProgress: true,
-	});
-    document.addEventListener('DOMContentLoaded', function() {
-        const payButton = document.getElementById('pay-btn');
-
-        // 提交订单按钮事件
-        var isRequesting = false;
-        payButton.addEventListener('click', function(e) {
-        	if (isRequesting) return;
-			isRequesting = true;
-			$(".mask").show();
-			
-        	var ubalance=parseFloat($("#ubalance").val());
-        	var pkgprice=parseFloat($("#trxamt").val());
-			var input = $('.form_wrap').find('input,select'), param = {};
-            input.each(function(i,item){
-                item = $(item);
-                var vType = item.attr('vtype'), ind = 0;
-                param[item.attr('name')] = item.val();
-				//alert(item);
-            });
-            var paytype = $(".redcheck:checked").val();
-    		if(paytype == "wx") {
-				$.post('/mifi/submitorder.do',param,function(res){
-                    $('.mask').hide();
-                    if(typeof(res) === 'string'){
-                        res = JSON.parse(res);
-                    }
-
-                    if(res.status !== "200"){
-                        alert(res.msg);
-                    }else{
-                        $("#notify").val(res.notify);
-                        $("#outTradeNo").val(res.outTradeNo);
-                        $('.form_wrap').submit();
-                    }
-                    isRequesting = false;
-                });
-    		} else {
-    			if(ubalance>=pkgprice) {
-					param['amount']=pkgprice;
-					$.post('/mifi/memPackRechargeToSpeedPack.do',param,function(res){
-					    $('.mask').hide();
-					    if(res == 'OK'){
-							alert("支付成功");
-							location.href = "/device/getDevInfo.do?sn="+$("#devid").val();
-					    } else {
-							alert(res);
-							if(res == '用户余额不足！'){
-								location.href = "/mifi/getMember.do";
-							}
-						}
-						isRequesting = false;
-					},'json');
-				} else {
-					alert("您的余额不足，请使用微信支付");
-					$('.mask').hide();
-					isRequesting = false;
-				}
-    		}
-        });
-    });
-</script>
-</body>
-</html>

com.sharemao.web.xw3/src/main/webapp/memberali.jsp

@@ -22,6 +22,7 @@
     <script language="javascript" type="text/javascript" src="/static/js/animate.min.js"></script>
     <script language="javascript" type="text/javascript" src="/static/js/main.js"></script>
 	<script language="javascript" type="text/javascript" src="/static/js/swiper-bundle.min.js"></script>
+    <script type="text/javascript" src="/static/js/ap.js"></script>
 </head>
 
 <body class="topbg">
@@ -244,7 +245,9 @@
                 if(res.status !== "200"){
                     alert(res.msg);
                 }else{
-                   location.href = res.pay_info;
+//                   location.href = res.pay_info;
+                   _AP.pay(res.pay_info);
+                   return false;
                 }
 
                 

com.sharemao.web.xw3/src/main/webapp/pkgorder.jsp

@@ -22,6 +22,7 @@
     <script language="javascript" type="text/javascript" src="/static/js/animate.min.js"></script>
     <script language="javascript" type="text/javascript" src="/static/js/main.js"></script>
 	<script language="javascript" type="text/javascript" src="/static/js/swiper-bundle.min.js"></script>
+    <script type="text/javascript" src="/static/js/ap.js"></script>
 	<style>
 	.form-wallet{
         border-bottom: 1px solid #f0f0f0;
@@ -121,6 +122,54 @@
     }
     .swiper-button-next:hover:after,.swiper-button-prev:hover:after{
         color: #FF6600;
+    }
+    .cert-con{
+        padding-bottom: 45px;
+        margin-top: -5px;
+    }
+    .cert-title{
+        width: 100%;
+        text-align: center;
+        font-size: 16px;
+        color: #6160d7;
+        font-weight: bold;
+        padding-bottom: 20px;
+    }
+    .cert-desc{
+        font-size: 12px;
+        line-height: 2;
+        padding-bottom: 10px;
+    }
+    .cert-desc em{
+        color: #519fea;
+    }
+    .cert-desc span{
+        color: #ffc801;
+    }
+    .cert-desc strong{
+        font-size: 14px;
+        color: #db0a05;
+    }
+    .cert-btn{
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        display: flex;
+        width: 100%;
+        justify-content: space-between;
+    }
+    .cert-btn a{
+        width: 50%;
+        height: 45px;
+        font-size: 14px;
+        line-height: 45px;
+        text-align: center;
+        border-right: 1px solid #e5e5e5;
+        border-top: 1px solid #e5e5e5;
+    }
+    .cert-btn a:last-child{
+        border-right: none;
+        color: #1987e8;
     }
 	</style>
 </head>
@@ -173,7 +222,7 @@
 		                <div class="select"><i></i></div>
 		            </div>
 		        </div>
-		      </c:forEach> 
+		      </c:forEach>
 		  </div>
     </div>
 </div>
@@ -228,7 +277,7 @@
 	            <span>钱包特惠支付(余额:￥${balance})</span>
 	        </div>
 	        <div class="select">
-	            <input type="radio" name="pay" value="balance" class="redcheck" id="pay">
+	            <input type="radio" name="pay" value="balance" class="redcheck" checked="checked">
 	        </div>
 	    </div>
 		<div class="wallet-money show">
@@ -241,30 +290,49 @@
                                 <span>${item.jine}</span>
                             </div>
 	                    </div>
-				    </c:forEach> 
+				    </c:forEach>
                 </div>
             </div>
             <div class="swiper-button-next"></div>
             <div class="swiper-button-prev"></div>
+            <div style=" color: red;font-family: bold;display: none;" id="tips">当前余额不足支付购买，推荐勾选当前储值金额购买！</div>
         </div>
+	    <div class="form-item">
+	        <div class="form-text">
+	            <img src="/static/img/icon-pay-alipay.png" class="icon">
+	            <span>支付宝支付</span>
+	        </div>
+	        <div class="select">
+	            <input type="radio" name="pay" value="alipay" class="redcheck">
+	        </div>
+	    </div>
 	    <div class="form-item">
 	        <div class="form-text">
 	            <img src="/static/img/icon-pay-weixin.png" class="icon">
 	            <span>微信支付</span>
 	        </div>
 	        <div class="select">
-	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
+                <input type="radio" name="pay" value="wx" class="redcheck">
 	        </div>
 	    </div>
 	</c:if>
 	<c:if test="${pkgInfo.paytype == 2}">
+	    <div class="form-item">
+	        <div class="form-text">
+	            <img src="/static/img/icon-pay-alipay.png" class="icon">
+	            <span>支付宝支付</span>
+	        </div>
+	        <div class="select">
+	            <input type="radio" name="pay" value="alipay" class="redcheck" checked>
+	        </div>
+	    </div>
 	    <div class="form-item">
 	        <div class="form-text">
 	            <img src="/static/img/icon-pay-weixin.png" class="icon">
 	            <span>微信支付</span>
 	        </div>
 	        <div class="select">
-	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
+                <input type="radio" name="pay" value="wx" class="redcheck">
 	        </div>
 	    </div>
 	</c:if>
@@ -275,7 +343,7 @@
 	            <span>钱包特惠支付(余额:￥${balance})</span>
 	        </div>
 	        <div class="select">
-	            <input type="radio" name="pay" value="balance" class="redcheck" id="pay">
+	            <input type="radio" name="pay" value="balance" class="redcheck" checked="checked">
 	        </div>
 	    </div>
 		<div class="wallet-money show">
@@ -288,7 +356,7 @@
                                 <span>${item.jine}</span>
                             </div>
 		                </div>
-				    </c:forEach> 
+				    </c:forEach>
 		        </div>
 		    </div>
 		    <div class="swiper-button-next"></div>
@@ -299,7 +367,7 @@
 
 <input  type="hidden" id="usertotalbalance"  value="${balance}"/>
 
-<form class="form_wrap" method="post" accept-charset="utf-8">
+<form class="form_wrap" method="post" accept-charset="utf-8" action="/mifi/tosybpay.do">
 <div class="bottom-paybox">
     <div class="price">￥<strong id="total-price">${pkgInfo.price}</strong></div>
     <input  type="hidden" name="pkgid" id="pkgid" value="${pkgInfo.pkgid}"/>
@@ -308,10 +376,13 @@
 	<input  type="hidden" name="type" id="type"  value="1"/>
 	<input type="hidden" name="paytype" id="paytype" value="0" />
 	<input  type="hidden" name="speedpackid" id="speedpackid"  value="${!empty spkgs?spkgs[0].id:''}"/>
-	
+
 	<input  type="hidden" id="pkgprice" name="pkgprice" value=""/>
 	<input  type="hidden" id="memberid" name="memberid" value=""/>
 	<input  type="hidden" id="opt" name="opt" value="${opt }"/>
+
+    <input  type="hidden" id="notify" name="notify" value=""/>
+    <input  type="hidden" id="outTradeNo" name="outTradeNo" value=""/>
     <div class="pay-btn">
         <input type="button" class="btn" value="支付" />
     </div>
@@ -337,12 +408,29 @@
     </div>
 </div>
 <div class="mask"></div>
+<!--当前卡未实名认证 弹层-->
+<div class='menu-mask' id="PopCertification" style="display: none;">
+    <div class="popbox animated fadeInUp">
+        <div class="popbox-con cert-con">
+            <div class="cert-title">当前卡未实名认证</div>
+            <div class="cert-desc">
+                根据工信部《入网用户真实身份信息登记规定》，您当前使用的流量卡或设备<em>需实名认证才可正常使用。</em><br>
+                <span>实名认证开放时间:每日7:30-22:00<br>温馨提醒:实名认证需年满18周岁。请寻求监护人帮助或成年后再来哦!如已实名，可能会存在同步延时，请稍后再查看。</span><br>
+                <strong>点击继续购买进入套餐充值页面，返回首页点击更多套餐，即可查看已购套餐。</strong>
+            </div>
+            <div class="cert-btn">
+                <a href="javascript:" onclick="CloseBox('PopCertification');pay()">继续购买</a>
+                <a href="/user/checksm.do">立即认证</a>
+            </div>
+        </div>
+    </div>
+</div>
 <script>
 
 	var mprice=888;
 	var pkgprice=888;
 	var ubalance;
-	
+
 	var thumbSwiper = new Swiper(".benefit-list", {
 	    spaceBetween: 10,
 	    slidesPerView: "auto",
@@ -376,7 +464,7 @@
 			mprice=0;
 			$("#total-price").html(pkgprice);
 	   }
-	   
+
     });
     $(".benefit-list .item").click(function() {
         var obj = $(this);
@@ -386,7 +474,7 @@
         calculateTotal(); // 统一调用计算总价函数
 		$("#speedpackid").val(obj.hasClass("cur")?obj.data("speedpackid"):'');
     });
-    
+
     $(".btn-coupons .item").click(function() {
         var obj = $(this);
         var isClicked = obj.hasClass("active") ? true : false;
@@ -405,10 +493,10 @@
         }, 500);
         calculateTotal(); // 统一调用计算总价函数
     });
-	    
+
     $(".redcheck").click(function() {
         var ptype = $(this).val();
-		if(ptype == 'wx'){
+		if(ptype == 'wx' || ptype == 'alipay'){
 			$("#total-price").html(pkgprice);
 			$(".wallet-money").hide();
 		} else if(ptype == 'balance') {
@@ -416,39 +504,39 @@
 			$(".wallet-money").show();
 		}
     });
-	
-    
+
+
     // 统一的总价计算函数
     function calculateTotal() {
         var productPrice = parseFloat($("#price").text()); // 商品价格
         var speedPackagePrice = 0; // 加速套餐价格
         var couponPrice = 0; // 优惠券金额
         var getPrice = 0; // 优惠券使用门槛
-        
+
         // 获取选中的加速套餐价格
         if ($(".benefit-list .item.cur").length > 0) {
             speedPackagePrice = parseFloat($(".benefit-list .item.cur").attr("data-price"))||0;
         }
-        
+
         // 获取选中的优惠券金额
         if ($("#PopCoupons .item.active").length > 0) {
             getPrice = parseFloat($("#PopCoupons .item.active .name").attr("data-getprice"))||0;
             couponPrice = parseFloat($("#PopCoupons .item.active .name").attr("data-price"))||0;
-            
+
             // 检查是否满足优惠券使用条件
             var totalPriceBeforeCoupon = productPrice + speedPackagePrice;
             if (getPrice > totalPriceBeforeCoupon) {
                 couponPrice = 0;
             }
         }
-        
+
         // 计算总价：商品价格 + 加速套餐价格 - 优惠券金额
         var totalPrice = productPrice + speedPackagePrice - couponPrice;
 		pkgprice=totalPrice;
 		mprice=totalPrice;
         $("#total-price").html(totalPrice.toFixed(2));
         $("#trxamt").val(totalPrice.toFixed(2));
-		
+
 		if($(".redcheck:checked").val() == 'balance') {
 			var usertotalbalance = parseFloat($("#usertotalbalance").val());
 			ubalance=usertotalbalance;
@@ -462,31 +550,86 @@
 					if(fmjine>=pkgprice) {
 						$(this).trigger("click");
 						swiper.slideTo(i);
+						$("#tips").show();
 					}
 				});
 			}
 		}
     }
-    
+
     // 页面加载完成后初始化计算一次总价
     $(document).ready(function() {
         calculateTotal();
-		
+
 		var isRequesting = false;
 		$(".pay-btn").click(function(e){
 			if (isRequesting) return;
 			isRequesting = true;
 			$(".mask").show();
-			
-			var input = $('.form_wrap').find('input,select'), param = {};
-            input.each(function(i,item){
-                item = $(item);
-                var vType = item.attr('vtype'), ind = 0;
-                param[item.attr('name')] = item.val();
-				//alert(item);
+
+			var param = {};
+            param['devid'] = $('#devid').val();
+
+		    $.post('/device/getDevSMInfo.do',param,function(res){
+                $('.mask').hide();
+
+		        if(typeof(res) === 'string'){
+                    res = JSON.parse(res);
+                }
+		        var isrealname = false;
+		        for (var key in res) {
+                    if (res[key] === "已实名") {
+                        isrealname = true;
+                    }
+                }
+
+                if(!isrealname){
+                    ShowBox('PopCertification');
+                } else {
+                    pay(param);
+                }
             });
-			var paytype = $(".redcheck:checked").val();
-			if(paytype == "wx") {
+		});
+    });
+
+    function pay() {
+        if (isRequesting) return;
+		var isRequesting = true;
+		$(".mask").show();
+
+		var input = $('.form_wrap').find('input,select'), param = {};
+        input.each(function(i,item){
+            item = $(item);
+            var vType = item.attr('vtype'), ind = 0;
+            param[item.attr('name')] = item.val();
+            //alert(item);
+        });
+
+        var paytype = $(".redcheck:checked").val();
+        if(paytype == "alipay") {
+            if (!navigator.userAgent.match(/MicroMessenger/i)) {
+                alert("请使用微信访问！");
+                $('.mask').hide();
+                isRequesting = false;
+                return;
+            }
+            param['amount']=pkgprice;
+            $.post('/mifi/toalipay.do',param,function(res){
+                $('.mask').hide();
+                if(typeof(res) === 'string'){
+                    res = JSON.parse(res);
+                }
+
+                if(res.status !== "200"){
+                    alert(res.msg);
+                }else{
+ //                   location.href = res.pay_info;
+                    _AP.pay(res.pay_info);
+                    return false;
+                }
+                isRequesting = false;
+            });
+        } else if(paytype == "wx") {
 				if (!navigator.userAgent.match(/MicroMessenger/i)) {
 					alert("请使用微信访问！");
 					$('.mask').hide();
@@ -494,127 +637,93 @@
 					return;
 				}
 				param['amount']=pkgprice;
-				$.post('/mifi/buyYLPdts.do',param,function(res){
+				$("#trxamt").val(pkgprice);
+                $("#type").val("1");
+			//	$('.form_wrap').submit();
+
+                param['amount']=pkgprice;
+                param['type']="1";
+				$.post('/mifi/submitorder.do',param,function(res){
 				    $('.mask').hide();
 				    if(typeof(res) === 'string'){
 				        res = JSON.parse(res);
-						if(res.pay_info !== undefined) {
-							var payInfo = JSON.parse(res.pay_info);
-						}
-						
-						//alert(res.pay_info);
 				    }
-					
+
 				    if(res.status !== "200"){
 				        alert(res.msg);
 				    }else{
-				        var payInfo = JSON.parse(res.pay_info);
-						WeixinJSBridge.invoke(
-								'getBrandWCPayRequest',{
-									"appId" : payInfo.appId, //公众号名称，由商户传入
-									"timeStamp": payInfo.timeStamp, //戳，自1970 年以来的秒数
-									"nonceStr" : payInfo.nonceStr, //随机串
-									"package" : payInfo.package,
-									"signType" : payInfo.signType, //微信签名方式:
-									"paySign" : payInfo.paySign  //微信签名,
-									
-								},function(res){
-									if(res.err_msg == "get_brand_wcpay_request:ok" ) {
-										// 此处可以使用此方式判断前端返回,微信团队郑重提示：res.err_msg 将在用户支付成功后返回ok，但并不保证它绝对可靠。
-										location.href = "/result.html";
-									}
-								}
-							);
+                        $("#notify").val(res.notify);
+                        $("#outTradeNo").val(res.outTradeNo);
+				        $('.form_wrap').submit();
 				    }
-					isRequesting = false;			    
+					isRequesting = false;
 				});
-			} else if(paytype == "balance") {
-				if(ubalance>=pkgprice) {
-					param['amount']=pkgprice;
-					$.post('/mifi/buyBalance.do',param,function(res){
-					    $('.mask').hide();
-					    if(res == 'OK'){
-							alert("支付成功");
-							location.href = "/device/getDevInfo.do?sn="+$("#devid").val();
-					    } else {
-							alert(res);
-							if(res == '用户余额不足！'){
-								location.href = "/mifi/getMember.do";
-							}
-						}
-						isRequesting = false;
-					},'json');
-				} else {
-					if (!navigator.userAgent.match(/MicroMessenger/i)) {
-						alert("请使用微信访问！");
-						$('.mask').hide();
-						isRequesting = false;
-						return;
-					}
-					param['amount']=mprice;
-					param['pkgprice']=pkgprice;
-					if(isNaN(pkgprice)){
-						location.reload();
-					}
-					param['type']=2;
-					var memberid = $("#memberid").val();
-					if(memberid==''||mprice==0){
-						alert("请选择金额！");
-						$('.mask').hide();
-						isRequesting = false;
-						return;
-					} else if(mprice<pkgprice){
-						alert("金额不足，请重新选择金额！");
-						$('.mask').hide();
-						isRequesting = false;
-						return;
-					} else {
-						$.post('/mifi/buyYLPdts.do',param,function(res){
-						    $('.mask').hide();
-						    if(typeof(res) === 'string'){
-						        res = JSON.parse(res);
-								if(res.pay_info !== undefined) {
-									var payInfo = JSON.parse(res.pay_info);
-								}
-								
-								//alert(res.pay_info);
-						    }
-							
-						    if(res.status !== "200"){
-						        alert(res.msg);
-						    }else{
-						        var payInfo = JSON.parse(res.pay_info);
-								WeixinJSBridge.invoke(
-										'getBrandWCPayRequest',{
-											"appId" : payInfo.appId, //公众号名称，由商户传入
-											"timeStamp": payInfo.timeStamp, //戳，自1970 年以来的秒数
-											"nonceStr" : payInfo.nonceStr, //随机串
-											"package" : payInfo.package,
-											"signType" : payInfo.signType, //微信签名方式:
-											"paySign" : payInfo.paySign  //微信签名,
-											
-										},function(res){
-											if(res.err_msg == "get_brand_wcpay_request:ok" ) {
-												// 此处可以使用此方式判断前端返回,微信团队郑重提示：res.err_msg 将在用户支付成功后返回ok，但并不保证它绝对可靠。
-												location.href = "/result.html";
-											}
-										}
-									);
-						    }
-							isRequesting = false;			    
-						});
-					}
-				}
-			} else {
-                alert("请选择支付方式！");
-                $('.mask').hide();
-                isRequesting = false;
-                return;
-            }
 
-			
-		});
-    });
+		} else if(paytype == "balance") {
+            if(ubalance>=pkgprice) {
+                param['amount']=pkgprice;
+                $.post('/mifi/buyBalance.do',param,function(res){
+                    $('.mask').hide();
+                    if(res == 'OK'){
+                        alert("支付成功");
+                        location.href = "/device/getDevInfo.do?sn="+$("#devid").val();
+                    } else {
+                        alert(res);
+                        if(res == '用户余额不足！'){
+                            location.href = "/mifi/getMember.do";
+                        }
+                    }
+                    isRequesting = false;
+                },'json');
+            } else {
+                if (!navigator.userAgent.match(/MicroMessenger/i)) {
+                    alert("请使用微信访问！");
+                    $('.mask').hide();
+                    isRequesting = false;
+                    return;
+                }
+                param['amount']=mprice;
+                param['pkgprice']=pkgprice;
+                if(isNaN(pkgprice)){
+                    location.reload();
+                }
+                param['type']=2;
+                var memberid = $("#memberid").val();
+                if(memberid==''||mprice==0){
+                    alert("请选择金额！");
+                    $('.mask').hide();
+                    isRequesting = false;
+                    return;
+                } else if(mprice<pkgprice){
+                    alert("金额不足，请重新选择金额！");
+                    $('.mask').hide();
+                    isRequesting = false;
+                    return;
+                } else {
+                    $.post('/mifi/toalipay.do',param,function(res){
+                        $('.mask').hide();
+                        if(typeof(res) === 'string'){
+                            res = JSON.parse(res);
+                        }
+
+                        if(res.status !== "200"){
+                            alert(res.msg);
+                        }else{
+                        //    location.href = res.pay_info;
+                            _AP.pay(res.pay_info);
+                            return false;
+                        }
+                        isRequesting = false;
+                    });
+                }
+            }
+        } else {
+            alert("请选择支付方式！");
+            $('.mask').hide();
+            isRequesting = false;
+            return;
+        }
+    }
 </script>
 
 </body>

com.sharemao.web.xw3/src/main/webapp/pkgorderali.jsp

@@ -1,633 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=yes" />
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <meta name="applicable-device" content="mobile">
-    <meta name="format-detection" content="telephone=no" />
-    <meta http-equiv="title" content="" />
-    <title>购买套餐</title>
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    <link rel="stylesheet" href="/static/css/animate.min.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="/static/css/style.css" type="text/css" media="all" />
-	<link rel="stylesheet" href="/static/css/swiper-bundle.min.css" type="text/css" media="all" />
-    <script language="javascript" type="text/javascript" src="/static/js/jquery-3.6.0.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/animate.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/main.js"></script>
-	<script language="javascript" type="text/javascript" src="/static/js/swiper-bundle.min.js"></script>
-	<style>
-	.form-wallet{
-        border-bottom: 1px solid #f0f0f0;
-    }
-    .form-wallet .form-item{
-        border-bottom: none;
-    }
-    .wallet-money{
-        display: none;
-        width: 100%;
-        padding: 2px 25px;
-        height:65px;
-        position: relative;
-    }
-    .wallet-money.show{
-        display: block;
-    }
-    .wallet-container{
-        display: block;
-        width: 100%;
-        min-height:45px;
-        position: relative;
-        list-style: none;
-        overflow: hidden;
-        z-index: 1;
-    }
-    .wallet-container .swiper-slide{
-        display: block;
-        width: 33.33%;
-        height: 45px;
-        position: relative;
-        border-radius: 8px;
-        overflow: hidden;
-        background-color: #FFFFFF;
-        border: 1px solid #e8e8e8;
-    }
-    .wallet-container .swiper-slide.cur{
-        border: 1px solid #cb5f1f;
-    }
-    .wallet-container .swiper-slide img{
-        display: block;
-        width: 100%;
-        max-height: auto;
-    }
-    .wallet-container .swiper-slide .sum{
-        position: relative;
-        display: block;
-        justify-content: center;
-        align-items: center;
-        width: 100%;
-        height: 100%;
-        font-size: 14px;
-        line-height: 2;
-        font-family: Arial;
-        font-weight: bold;
-        text-align: center;
-        padding-top: 0;
-    }
-    .wallet-container .swiper-slide .sum i{
-        display: block;
-        width: 100%;
-        font-size: 9px;
-        height: 15px;
-        line-height: 16px;
-        color: #FFF;
-        background-color: #dd170e;
-    }
-    .wallet-container .swiper-slide .sum::after{
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        display: none;
-        width: 100%;
-        height: 10px;
-        background-color: #dd170e;
-    }
-    .swiper-button-prev{
-        left: 0;
-    }
-    .swiper-button-next{
-        right: 0;
-    }
-    .swiper-button-prev,.swiper-button-next{
-        top: 17px;
-        margin-top: 0;
-        width: 15px;
-        height: 15px;
-        opacity: 0.6;
-    }
-    .swiper-button-disabled{
-        opacity: 0.2;
-    }
-    .swiper-button-next:after,.swiper-button-prev:after{
-        color: #929292;
-        font-size: 18px;
-    }
-    .swiper-button-next:hover:after,.swiper-button-prev:hover:after{
-        color: #FF6600;
-    }
-	</style>
-</head>
-
-<body>
-<div class="box">
-    <div class="recharge-top">
-        <div class="pic">
-            <img src="/static/img/img-recharge.png" alt="">
-        </div>
-        <div class="text">
-            <div class="title">${pkgInfo.pkgName}</div>
-            <div class="desc"></div>
-            <div class="price">￥<strong id="price">${pkgInfo.price}</strong></div>
-        </div>
-    </div>
-</div>
-<div class="box benefit-box">
-    <div class="benefit-list swiper">
-		<div class="swiper-wrapper">
-			<c:forEach var="item" items="${spkgs}" varStatus="loop">
-		        <div class="item swiper-slide ${loop.index==0?' cur':''}" data-price="${item.price}" data-speedpackid="${item.id}">
-		            <div class="wrap">
-		                <i class="icon"><img src="/static/img/icon-diamond${item.id%2+1}.png"></i>
-		                <div class="title">${item.name}</div>
-		                <div class="desc">${item.desc}</div>
-		                <div class="price">￥<strong>${item.price}</strong></div>
-		                <div class="valid">有效期:
-							<c:choose>
-				                <c:when test="${item.expiryDay == 0 }">1天</c:when>
-				                <c:when test="${item.expiryDay == 1 }">30天</c:when>
-				                <c:when test="${item.expiryDay == 2 }">90天</c:when>
-				                <c:when test="${item.expiryDay == 3 }">半年</c:when>
-				                <c:when test="${item.expiryDay == 4 }">1年</c:when>
-				                <c:when test="${item.expiryDay == 5 }">两年</c:when>
-				                <c:when test="${item.expiryDay == 6 }">7天</c:when>
-				                <c:when test="${item.expiryDay == 7 }">3年</c:when>
-				                <c:when test="${item.expiryDay == 8 }">3天</c:when>
-				                <c:when test="${item.expiryDay == 9 }">两天</c:when>
-				                <c:when test="${item.expiryDay == 11 }">7个月</c:when>
-				                <c:when test="${item.expiryDay == 12 }">14个月</c:when>
-				                <c:when test="${item.expiryDay == 18 }">15个月</c:when>
-				                <c:when test="${item.expiryDay == 13 }">两年半</c:when>
-				                <c:when test="${item.expiryDay == 14 }">3年8个月</c:when>
-				                <c:when test="${item.expiryDay == 15 }">4年 </c:when>
-				                <c:when test="${item.expiryDay == 16 }">5年</c:when>
-				                <c:when test="${item.expiryDay == 17 }">6年</c:when>
-				            </c:choose>
-						</div>
-		                <div class="select"><i></i></div>
-		            </div>
-		        </div>
-		      </c:forEach>
-		  </div>
-    </div>
-</div>
-<div class="box">
-    <div class="form-item">
-        <label>充值设备号</label>
-        <div class="form-text">${devid}</div>
-    </div>
-    <div class="form-item">
-        <label>套餐有效期</label>
-        <div class="form-text">
-            <c:choose>
-                <c:when test="${pkgInfo.expiryDay == 0 }">1天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 1 }">30天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 2 }">90天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 3 }">半年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 4 }">1年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 5 }">两年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 6 }">7天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 7 }">3年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 8 }">3天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 9 }">两天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 11 }">7个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 12 }">14个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 18 }">15个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 13 }">两年半</c:when>
-                <c:when test="${pkgInfo.expiryDay == 14 }">3年8个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 15 }">4年 </c:when>
-                <c:when test="${pkgInfo.expiryDay == 16 }">5年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 17 }">6年</c:when>
-            </c:choose>
-        </div>
-    </div>
-    <div class="form-item">
-        <label>全国通用</label>
-        <div class="form-text">移动、联通、电信三网合一自由切换</div>
-    </div>
-    <div class="form-item">
-        <label>套餐价格</label>
-        <div class="form-text">￥${pkgInfo.price}</div>
-    </div>
-    <div class="form-item" onclick="ShowBox('PopCoupons')">
-        <label>优惠券</label>
-        <div class="form-text" id="coupons">选择优惠券</div>
-    </div>
-</div>
-<div class="box mb70">
-	<c:if test="${pkgInfo.paytype == 1}">
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-wallet.png" class="icon">
-	            <span>钱包特惠支付(余额:￥${balance})</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="balance" class="redcheck">
-	        </div>
-	    </div>
-		<div class="wallet-money show">
-            <div class="swiper-container wallet-container">
-                <div class="swiper-wrapper">
-					<c:forEach var="item" items="${cons}">
-						<div class="swiper-slide" data-id="${item.id}" data-jine="${item.jine}">
-                            <div class="sum">
-                                <i class="bar">赠送${item.zsong}元</i>
-                                <span>${item.jine}</span>
-                            </div>
-	                    </div>
-				    </c:forEach>
-                </div>
-            </div>
-            <div class="swiper-button-next"></div>
-            <div class="swiper-button-prev"></div>
-        </div>
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-pay-alipay.png" class="icon">
-	            <span>支付宝支付</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="alipay" class="redcheck" checked>
-	        </div>
-	    </div>
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-pay-weixin.png" class="icon">
-	            <span>微信支付，请联系在线客服充值</span>
-	        </div>
-	        <div class="select">
-
-	        </div>
-	    </div>
-	</c:if>
-	<c:if test="${pkgInfo.paytype == 2}">
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-pay-alipay.png" class="icon">
-	            <span>支付宝支付</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="alipay" class="redcheck" checked>
-	        </div>
-	    </div>
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-pay-weixin.png" class="icon">
-	            <span>微信支付，请联系在线客服充值</span>
-	        </div>
-	        <div class="select">
-
-	        </div>
-	    </div>
-	</c:if>
-	<c:if test="${pkgInfo.paytype == 3}">
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-wallet.png" class="icon">
-	            <span>钱包特惠支付(余额:￥${balance})</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="balance" class="redcheck">
-	        </div>
-	    </div>
-		<div class="wallet-money show">
-		    <div class="swiper-container wallet-container">
-		        <div class="swiper-wrapper">
-					<c:forEach var="item" items="${cons}">
-						<div class="swiper-slide" data-id="${item.id}" data-jine="${item.jine}">
-                            <div class="sum">
-                                <i class="bar">赠送${item.zsong}元</i>
-                                <span>${item.jine}</span>
-                            </div>
-		                </div>
-				    </c:forEach>
-		        </div>
-		    </div>
-		    <div class="swiper-button-next"></div>
-		    <div class="swiper-button-prev"></div>
-		</div>
-	</c:if>
-</div>
-
-<input  type="hidden" id="usertotalbalance"  value="${balance}"/>
-
-<form class="form_wrap" method="post" accept-charset="utf-8">
-<div class="bottom-paybox">
-    <div class="price">￥<strong id="total-price">${pkgInfo.price}</strong></div>
-    <input  type="hidden" name="pkgid" id="pkgid" value="${pkgInfo.pkgid}"/>
-    <input  type="hidden" name="amount" id="trxamt" value="${pkgInfo.price}"/>
-    <input  type="hidden" name="devid" id="devid"  value="${devid}"/>
-	<input  type="hidden" name="type" id="type"  value="1"/>
-	<input type="hidden" name="paytype" id="paytype" value="0" />
-	<input  type="hidden" name="speedpackid" id="speedpackid"  value="${!empty spkgs?spkgs[0].id:''}"/>
-
-	<input  type="hidden" id="pkgprice" name="pkgprice" value=""/>
-	<input  type="hidden" id="memberid" name="memberid" value=""/>
-	<input  type="hidden" id="opt" name="opt" value="${opt }"/>
-    <div class="pay-btn">
-        <input type="button" class="btn" value="支付" />
-    </div>
-</div>
-</form>
-<!--弹层-优惠券-->
-<div class='menu-mask' id="PopCoupons">
-    <div class="popbox animated fadeInUp">
-        <h2 class="tcenter">选择优惠券</h2>
-        <div class="popbox-con">
-            <div class="lite-card-select btn-coupons">
-                <div class="list">
-                <c:forEach var="item" items="${cons}">
-                    <div class="item">
-                        <div class="name" data="满${item.coupon}减${item.discount}" data-getprice="${item.coupon}" data-price="${item.discount}">满${item.coupon}减${item.discount}</div>
-                        <div class="allow"></div>
-                    </div>
-				</c:forEach>
-                </div>
-            </div>
-        </div>
-        <div class="icon-close" onclick="CloseBox('PopCoupons')"></div>
-    </div>
-</div>
-<div class="mask"></div>
-<script>
-
-	var mprice=888;
-	var pkgprice=888;
-	var ubalance;
-
-	var thumbSwiper = new Swiper(".benefit-list", {
-	    spaceBetween: 10,
-	    slidesPerView: "auto",
-	    freeMode: true,
-	    watchSlidesProgress: true,
-	});
-	//钱包滑动
-    var swiper = new Swiper(".wallet-container", {
-       slidesPerGroup: 1,
-       slidesPerView: 3,
-       spaceBetween: 12,
-       navigation: {
-           nextEl: ".swiper-button-next",
-           prevEl: ".swiper-button-prev",
-       },
-    });
-    //选中
-    $(".wallet-container .swiper-slide").click(function() {
-       var obj = $(this);
-       var isClicked = obj.hasClass("cur") ? true : false;
-           $('.wallet-container .swiper-slide').removeClass('cur');
-       isClicked ? null : obj.addClass("cur");
-	   if(obj.hasClass("cur")) {
-			var mid = $(this).data("id");
-			var mjine = $(this).data("jine");
-			$("#memberid").val(mid);
-			mprice=parseFloat(mjine).toFixed(2)||0;
-			$("#total-price").html(mprice);
-	   } else {
-			$("#memberid").val('');
-			mprice=0;
-			$("#total-price").html(pkgprice);
-	   }
-
-    });
-    $(".benefit-list .item").click(function() {
-        var obj = $(this);
-        var isClicked = obj.hasClass("cur") ? true : false;
-        $(".benefit-list .item").removeClass("cur");
-        isClicked ? null : obj.addClass("cur");
-        calculateTotal(); // 统一调用计算总价函数
-		$("#speedpackid").val(obj.hasClass("cur")?obj.data("speedpackid"):'');
-    });
-
-    $(".btn-coupons .item").click(function() {
-        var obj = $(this);
-        var isClicked = obj.hasClass("active") ? true : false;
-        $(".btn-coupons .item").removeClass("active");
-        isClicked ? null : obj.addClass("active");
-        if (isClicked) {
-            $("#coupons").text('选择优惠券');
-        } else {
-            $("#coupons").text($(this).find(".name").attr("data"));
-        }
-        var popCouponsElement = document.getElementById('PopCoupons');
-        setTimeout(function() {
-            if (popCouponsElement) {
-              popCouponsElement.style.display = "none";
-            }
-        }, 500);
-        calculateTotal(); // 统一调用计算总价函数
-    });
-
-    $(".redcheck").click(function() {
-        var ptype = $(this).val();
-		if(ptype == 'wx'){
-			$("#total-price").html(pkgprice);
-			$(".wallet-money").hide();
-		} else if(ptype == 'balance') {
-			$("#total-price").html(mprice);
-			$(".wallet-money").show();
-		}
-    });
-
-
-    // 统一的总价计算函数
-    function calculateTotal() {
-        var productPrice = parseFloat($("#price").text()); // 商品价格
-        var speedPackagePrice = 0; // 加速套餐价格
-        var couponPrice = 0; // 优惠券金额
-        var getPrice = 0; // 优惠券使用门槛
-
-        // 获取选中的加速套餐价格
-        if ($(".benefit-list .item.cur").length > 0) {
-            speedPackagePrice = parseFloat($(".benefit-list .item.cur").attr("data-price"))||0;
-        }
-
-        // 获取选中的优惠券金额
-        if ($("#PopCoupons .item.active").length > 0) {
-            getPrice = parseFloat($("#PopCoupons .item.active .name").attr("data-getprice"))||0;
-            couponPrice = parseFloat($("#PopCoupons .item.active .name").attr("data-price"))||0;
-
-            // 检查是否满足优惠券使用条件
-            var totalPriceBeforeCoupon = productPrice + speedPackagePrice;
-            if (getPrice > totalPriceBeforeCoupon) {
-                couponPrice = 0;
-            }
-        }
-
-        // 计算总价：商品价格 + 加速套餐价格 - 优惠券金额
-        var totalPrice = productPrice + speedPackagePrice - couponPrice;
-		pkgprice=totalPrice;
-		mprice=totalPrice;
-        $("#total-price").html(totalPrice.toFixed(2));
-        $("#trxamt").val(totalPrice.toFixed(2));
-
-		if($(".redcheck:checked").val() == 'balance') {
-			var usertotalbalance = parseFloat($("#usertotalbalance").val());
-			ubalance=usertotalbalance;
-			if(usertotalbalance >= pkgprice) {
-				$(".wallet-money").hide();
-			} else {
-				$(".wallet-money").show();
-				$(".wallet-container .swiper-slide").each(function(i) {
-					var mjine = $(this).data("jine");
-					var fmjine = parseFloat(mjine);
-					if(fmjine>=pkgprice) {
-						$(this).trigger("click");
-						swiper.slideTo(i);
-					}
-				});
-			}
-		}
-    }
-
-    // 页面加载完成后初始化计算一次总价
-    $(document).ready(function() {
-        calculateTotal();
-
-		var isRequesting = false;
-		$(".pay-btn").click(function(e){
-			if (isRequesting) return;
-			isRequesting = true;
-			$(".mask").show();
-
-			var input = $('.form_wrap').find('input,select'), param = {};
-            input.each(function(i,item){
-                item = $(item);
-                var vType = item.attr('vtype'), ind = 0;
-                param[item.attr('name')] = item.val();
-				//alert(item);
-            });
-
-
-		    $.post('/device/getDevSMInfo.do',param,function(res){
-                $('.mask').hide();
-
-		        if(typeof(res) === 'string'){
-                    res = JSON.parse(res);
-                }
-		        var isrealname = false;
-		        for (var key in res) {
-                    if (res[key] === "已实名") {
-                        isrealname = true;
-                    }
-                }
-
-                if(!isrealname){
-                  if(confirm("您目前还未实名认证，为保障您的权益，实名后才可使用，确认先购买套餐吗？")){
-                        pay(param);
-                  } else {
-                    isRequesting = false;
-                    return;
-                }
-                } else {
-                    pay(param);
-                }
-            });
-		});
-    });
-
-    function pay(param) {
-        if (isRequesting) return;
-		var isRequesting = true;
-		$(".mask").show();
-
-        var paytype = $(".redcheck:checked").val();
-        if(paytype == "alipay") {
-            if (!navigator.userAgent.match(/MicroMessenger/i)) {
-                alert("请使用微信访问！");
-                $('.mask').hide();
-                isRequesting = false;
-                return;
-            }
-            param['amount']=pkgprice;
-            $.post('/mifi/toalipay.do',param,function(res){
-                $('.mask').hide();
-                if(typeof(res) === 'string'){
-                    res = JSON.parse(res);
-                }
-
-                if(res.status !== "200"){
-                    alert(res.msg);
-                }else{
-                    location.href = res.pay_info;
-                }
-                isRequesting = false;
-            });
-        } else if(paytype == "balance") {
-            if(ubalance>=pkgprice) {
-                param['amount']=pkgprice;
-                $.post('/mifi/buyBalance.do',param,function(res){
-                    $('.mask').hide();
-                    if(res == 'OK'){
-                        alert("支付成功");
-                        location.href = "/device/getDevInfo.do?sn="+$("#devid").val();
-                    } else {
-                        alert(res);
-                        if(res == '用户余额不足！'){
-                            location.href = "/mifi/getMember.do";
-                        }
-                    }
-                    isRequesting = false;
-                },'json');
-            } else {
-                if (!navigator.userAgent.match(/MicroMessenger/i)) {
-                    alert("请使用微信访问！");
-                    $('.mask').hide();
-                    isRequesting = false;
-                    return;
-                }
-                param['amount']=mprice;
-                param['pkgprice']=pkgprice;
-                if(isNaN(pkgprice)){
-                    location.reload();
-                }
-                param['type']=2;
-                var memberid = $("#memberid").val();
-                if(memberid==''||mprice==0){
-                    alert("请选择金额！");
-                    $('.mask').hide();
-                    isRequesting = false;
-                    return;
-                } else if(mprice<pkgprice){
-                    alert("金额不足，请重新选择金额！");
-                    $('.mask').hide();
-                    isRequesting = false;
-                    return;
-                } else {
-                    $.post('/mifi/toalipay.do',param,function(res){
-                        $('.mask').hide();
-                        if(typeof(res) === 'string'){
-                            res = JSON.parse(res);
-                        }
-
-                        if(res.status !== "200"){
-                            alert(res.msg);
-                        }else{
-                            location.href = res.pay_info;
-                        }
-                        isRequesting = false;
-                    });
-                }
-            }
-        } else if(paytype == "wx"){
-            alert("请联系在线客服充值！");
-            $('.mask').hide();
-            isRequesting = false;
-            return;
-        } else {
-            alert("请选择支付方式！");
-            $('.mask').hide();
-            isRequesting = false;
-            return;
-        }
-    }
-</script>
-
-</body>
-</html>

com.sharemao.web.xw3/src/main/webapp/pkgordersyb.jsp

@@ -1,603 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=yes" />
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <meta name="applicable-device" content="mobile">
-    <meta name="format-detection" content="telephone=no" />
-    <meta http-equiv="title" content="" />
-    <title>购买套餐</title>
-    <meta name="description" content="" />
-    <meta name="keywords" content="" />
-    <link rel="stylesheet" href="/static/css/animate.min.css" type="text/css" media="all" />
-    <link rel="stylesheet" href="/static/css/style.css" type="text/css" media="all" />
-	<link rel="stylesheet" href="/static/css/swiper-bundle.min.css" type="text/css" media="all" />
-    <script language="javascript" type="text/javascript" src="/static/js/jquery-3.6.0.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/animate.min.js"></script>
-    <script language="javascript" type="text/javascript" src="/static/js/main.js"></script>
-	<script language="javascript" type="text/javascript" src="/static/js/swiper-bundle.min.js"></script>
-	<style>
-	.form-wallet{
-        border-bottom: 1px solid #f0f0f0;
-    }
-    .form-wallet .form-item{
-        border-bottom: none;
-    }
-    .wallet-money{
-        display: none;
-        width: 100%;
-        padding: 2px 25px;
-        height:65px;
-        position: relative;
-    }
-    .wallet-money.show{
-        display: block;
-    }
-    .wallet-container{
-        display: block;
-        width: 100%;
-        min-height:45px;
-        position: relative;
-        list-style: none;
-        overflow: hidden;
-        z-index: 1;
-    }
-    .wallet-container .swiper-slide{
-        display: block;
-        width: 33.33%;
-        height: 45px;
-        position: relative;
-        border-radius: 8px;
-        overflow: hidden;
-        background-color: #FFFFFF;
-        border: 1px solid #e8e8e8;
-    }
-    .wallet-container .swiper-slide.cur{
-        border: 1px solid #cb5f1f;
-    }
-    .wallet-container .swiper-slide img{
-        display: block;
-        width: 100%;
-        max-height: auto;
-    }
-    .wallet-container .swiper-slide .sum{
-        position: relative;
-        display: block;
-        justify-content: center;
-        align-items: center;
-        width: 100%;
-        height: 100%;
-        font-size: 14px;
-        line-height: 2;
-        font-family: Arial;
-        font-weight: bold;
-        text-align: center;
-        padding-top: 0;
-    }
-    .wallet-container .swiper-slide .sum i{
-        display: block;
-        width: 100%;
-        font-size: 9px;
-        height: 15px;
-        line-height: 16px;
-        color: #FFF;
-        background-color: #dd170e;
-    }
-    .wallet-container .swiper-slide .sum::after{
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        display: none;
-        width: 100%;
-        height: 10px;
-        background-color: #dd170e;
-    }
-    .swiper-button-prev{
-        left: 0;
-    }
-    .swiper-button-next{
-        right: 0;
-    }
-    .swiper-button-prev,.swiper-button-next{
-        top: 17px;
-        margin-top: 0;
-        width: 15px;
-        height: 15px;
-        opacity: 0.6;
-    }
-    .swiper-button-disabled{
-        opacity: 0.2;
-    }
-    .swiper-button-next:after,.swiper-button-prev:after{
-        color: #929292;
-        font-size: 18px;
-    }
-    .swiper-button-next:hover:after,.swiper-button-prev:hover:after{
-        color: #FF6600;
-    }
-	</style>
-</head>
-
-<body>
-<div class="box">
-    <div class="recharge-top">
-        <div class="pic">
-            <img src="/static/img/img-recharge.png" alt="">
-        </div>
-        <div class="text">
-            <div class="title">${pkgInfo.pkgName}</div>
-            <div class="desc"></div>
-            <div class="price">￥<strong id="price">${pkgInfo.price}</strong></div>
-        </div>
-    </div>
-</div>
-<div class="box benefit-box">
-    <div class="benefit-list swiper">
-		<div class="swiper-wrapper">
-			<c:forEach var="item" items="${spkgs}" varStatus="loop">
-		        <div class="item swiper-slide ${loop.index==0?' cur':''}" data-price="${item.price}" data-speedpackid="${item.id}">
-		            <div class="wrap">
-		                <i class="icon"><img src="/static/img/icon-diamond${item.id%2+1}.png"></i>
-		                <div class="title">${item.name}</div>
-		                <div class="desc">${item.desc}</div>
-		                <div class="price">￥<strong>${item.price}</strong></div>
-		                <div class="valid">有效期:
-							<c:choose>
-				                <c:when test="${item.expiryDay == 0 }">1天</c:when>
-				                <c:when test="${item.expiryDay == 1 }">30天</c:when>
-				                <c:when test="${item.expiryDay == 2 }">90天</c:when>
-				                <c:when test="${item.expiryDay == 3 }">半年</c:when>
-				                <c:when test="${item.expiryDay == 4 }">1年</c:when>
-				                <c:when test="${item.expiryDay == 5 }">两年</c:when>
-				                <c:when test="${item.expiryDay == 6 }">7天</c:when>
-				                <c:when test="${item.expiryDay == 7 }">3年</c:when>
-				                <c:when test="${item.expiryDay == 8 }">3天</c:when>
-				                <c:when test="${item.expiryDay == 9 }">两天</c:when>
-				                <c:when test="${item.expiryDay == 11 }">7个月</c:when>
-				                <c:when test="${item.expiryDay == 12 }">14个月</c:when>
-				                <c:when test="${item.expiryDay == 18 }">15个月</c:when>
-				                <c:when test="${item.expiryDay == 13 }">两年半</c:when>
-				                <c:when test="${item.expiryDay == 14 }">3年8个月</c:when>
-				                <c:when test="${item.expiryDay == 15 }">4年 </c:when>
-				                <c:when test="${item.expiryDay == 16 }">5年</c:when>
-				                <c:when test="${item.expiryDay == 17 }">6年</c:when>
-				            </c:choose>
-						</div>
-		                <div class="select"><i></i></div>
-		            </div>
-		        </div>
-		      </c:forEach> 
-		  </div>
-    </div>
-</div>
-<div class="box">
-    <div class="form-item">
-        <label>充值设备号</label>
-        <div class="form-text">${devid}</div>
-    </div>
-    <div class="form-item">
-        <label>套餐有效期</label>
-        <div class="form-text">
-            <c:choose>
-                <c:when test="${pkgInfo.expiryDay == 0 }">1天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 1 }">30天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 2 }">90天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 3 }">半年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 4 }">1年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 5 }">两年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 6 }">7天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 7 }">3年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 8 }">3天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 9 }">两天</c:when>
-                <c:when test="${pkgInfo.expiryDay == 11 }">7个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 12 }">14个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 18 }">15个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 13 }">两年半</c:when>
-                <c:when test="${pkgInfo.expiryDay == 14 }">3年8个月</c:when>
-                <c:when test="${pkgInfo.expiryDay == 15 }">4年 </c:when>
-                <c:when test="${pkgInfo.expiryDay == 16 }">5年</c:when>
-                <c:when test="${pkgInfo.expiryDay == 17 }">6年</c:when>
-            </c:choose>
-        </div>
-    </div>
-    <div class="form-item">
-        <label>全国通用</label>
-        <div class="form-text">移动、联通、电信三网合一自由切换</div>
-    </div>
-    <div class="form-item">
-        <label>套餐价格</label>
-        <div class="form-text">￥${pkgInfo.price}</div>
-    </div>
-    <div class="form-item" onclick="ShowBox('PopCoupons')">
-        <label>优惠券</label>
-        <div class="form-text" id="coupons">选择优惠券</div>
-    </div>
-</div>
-<div class="box mb70">
-	<c:if test="${pkgInfo.paytype == 1}">
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-wallet.png" class="icon">
-	            <span>钱包特惠支付(余额:￥${balance})</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="balance" class="redcheck" id="pay">
-	        </div>
-	    </div>
-		<div class="wallet-money show">
-            <div class="swiper-container wallet-container">
-                <div class="swiper-wrapper">
-					<c:forEach var="item" items="${cons}">
-						<div class="swiper-slide" data-id="${item.id}" data-jine="${item.jine}">
-	                        <div class="sum">
-                                <i class="bar">赠送${item.zsong}元</i>
-	                            <span>${item.jine}</span>
-	                        </div>
-	                    </div>
-				    </c:forEach> 
-                </div>
-            </div>
-            <div class="swiper-button-next"></div>
-            <div class="swiper-button-prev"></div>
-        </div>
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-pay-weixin.png" class="icon">
-	            <span>微信支付</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
-	        </div>
-	    </div>
-	</c:if>
-	<c:if test="${pkgInfo.paytype == 2}">
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-pay-weixin.png" class="icon">
-	            <span>微信支付</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="wx" class="redcheck" id="pay">
-	        </div>
-	    </div>
-	</c:if>
-	<c:if test="${pkgInfo.paytype == 3}">
-	    <div class="form-item">
-	        <div class="form-text">
-	            <img src="/static/img/icon-wallet.png" class="icon">
-	            <span>钱包特惠支付(余额:￥${balance})</span>
-	        </div>
-	        <div class="select">
-	            <input type="radio" name="pay" value="balance" class="redcheck" id="pay">
-	        </div>
-	    </div>
-		<div class="wallet-money show">
-		    <div class="swiper-container wallet-container">
-		        <div class="swiper-wrapper">
-					<c:forEach var="item" items="${cons}">
-						<div class="swiper-slide" data-id="${item.id}" data-jine="${item.jine}">
-                            <div class="sum">
-                                <i class="bar">赠送${item.zsong}元</i>
-                                <span>${item.jine}</span>
-                            </div>
-		                </div>
-				    </c:forEach> 
-		        </div>
-		    </div>
-		    <div class="swiper-button-next"></div>
-		    <div class="swiper-button-prev"></div>
-		</div>
-	</c:if>
-</div>
-
-<input  type="hidden" id="usertotalbalance"  value="${balance}"/>
-
-<form class="form_wrap" method="post" accept-charset="utf-8" action="/mifi/tosybpay.do">
-<div class="bottom-paybox">
-    <div class="price">￥<strong id="total-price">${pkgInfo.price}</strong></div>
-    <input  type="hidden" name="pkgid" id="pkgid" value="${pkgInfo.pkgid}"/>
-    <input  type="hidden" name="amount" id="trxamt" value="${pkgInfo.price}"/>
-    <input  type="hidden" name="devid" id="devid"  value="${devid}"/>
-	<input  type="hidden" name="type" id="type"  value="1"/>
-	<input type="hidden" name="paytype" id="paytype" value="0" />
-	<input  type="hidden" name="speedpackid" id="speedpackid"  value="${!empty spkgs?spkgs[0].id:''}"/>
-
-	<input  type="hidden" id="pkgprice" name="pkgprice" value=""/>
-	<input  type="hidden" id="memberid" name="memberid" value=""/>
-	<input  type="hidden" id="opt" name="opt" value="${opt }"/>
-
-	<input  type="hidden" id="notify" name="notify" value=""/>
-	<input  type="hidden" id="outTradeNo" name="outTradeNo" value=""/>
-
-    <div class="pay-btn">
-        <input type="button" class="btn" value="支付" />
-    </div>
-</div>
-</form>
-<!--弹层-优惠券-->
-<div class='menu-mask' id="PopCoupons">
-    <div class="popbox animated fadeInUp">
-        <h2 class="tcenter">选择优惠券</h2>
-        <div class="popbox-con">
-            <div class="lite-card-select btn-coupons">
-                <div class="list">
-                <c:forEach var="item" items="${cons}">
-                    <div class="item">
-                        <div class="name" data="满${item.coupon}减${item.discount}" data-getprice="${item.coupon}" data-price="${item.discount}">满${item.coupon}减${item.discount}</div>
-                        <div class="allow"></div>
-                    </div>
-				</c:forEach>
-                </div>
-            </div>
-        </div>
-        <div class="icon-close" onclick="CloseBox('PopCoupons')"></div>
-    </div>
-</div>
-<div class="mask"></div>
-<script>
-
-	var mprice=888;
-	var pkgprice=888;
-	var ubalance;
-
-	var thumbSwiper = new Swiper(".benefit-list", {
-	    spaceBetween: 10,
-	    slidesPerView: "auto",
-	    freeMode: true,
-	    watchSlidesProgress: true,
-	});
-	//钱包滑动
-    var swiper = new Swiper(".wallet-container", {
-       slidesPerGroup: 1,
-       slidesPerView: 3,
-       spaceBetween: 12,
-       navigation: {
-           nextEl: ".swiper-button-next",
-           prevEl: ".swiper-button-prev",
-       },
-    });
-    //选中
-    $(".wallet-container .swiper-slide").click(function() {
-       var obj = $(this);
-       var isClicked = obj.hasClass("cur") ? true : false;
-           $('.wallet-container .swiper-slide').removeClass('cur');
-       isClicked ? null : obj.addClass("cur");
-	   if(obj.hasClass("cur")) {
-			var mid = $(this).data("id");
-			var mjine = $(this).data("jine");
-			$("#memberid").val(mid);
-			mprice=parseFloat(mjine).toFixed(2)||0;
-			$("#total-price").html(mprice);
-	   } else {
-			$("#memberid").val('');
-			mprice=0;
-			$("#total-price").html(pkgprice);
-	   }
-
-    });
-    $(".benefit-list .item").click(function() {
-        var obj = $(this);
-        var isClicked = obj.hasClass("cur") ? true : false;
-        $(".benefit-list .item").removeClass("cur");
-        isClicked ? null : obj.addClass("cur");
-        calculateTotal(); // 统一调用计算总价函数
-		$("#speedpackid").val(obj.hasClass("cur")?obj.data("speedpackid"):'');
-    });
-
-    $(".btn-coupons .item").click(function() {
-        var obj = $(this);
-        var isClicked = obj.hasClass("active") ? true : false;
-        $(".btn-coupons .item").removeClass("active");
-        isClicked ? null : obj.addClass("active");
-        if (isClicked) {
-            $("#coupons").text('选择优惠券');
-        } else {
-            $("#coupons").text($(this).find(".name").attr("data"));
-        }
-        var popCouponsElement = document.getElementById('PopCoupons');
-        setTimeout(function() {
-            if (popCouponsElement) {
-              popCouponsElement.style.display = "none";
-            }
-        }, 500);
-        calculateTotal(); // 统一调用计算总价函数
-    });
-
-    $(".redcheck").click(function() {
-        var ptype = $(this).val();
-		if(ptype == 'wx'){
-			$("#total-price").html(pkgprice);
-			$(".wallet-money").hide();
-		} else if(ptype == 'balance') {
-			$("#total-price").html(mprice);
-			$(".wallet-money").show();
-		}
-    });
-
-
-    // 统一的总价计算函数
-    function calculateTotal() {
-        var productPrice = parseFloat($("#price").text()); // 商品价格
-        var speedPackagePrice = 0; // 加速套餐价格
-        var couponPrice = 0; // 优惠券金额
-        var getPrice = 0; // 优惠券使用门槛
-
-        // 获取选中的加速套餐价格
-        if ($(".benefit-list .item.cur").length > 0) {
-            speedPackagePrice = parseFloat($(".benefit-list .item.cur").attr("data-price"))||0;
-        }
-
-        // 获取选中的优惠券金额
-        if ($("#PopCoupons .item.active").length > 0) {
-            getPrice = parseFloat($("#PopCoupons .item.active .name").attr("data-getprice"))||0;
-            couponPrice = parseFloat($("#PopCoupons .item.active .name").attr("data-price"))||0;
-
-            // 检查是否满足优惠券使用条件
-            var totalPriceBeforeCoupon = productPrice + speedPackagePrice;
-            if (getPrice > totalPriceBeforeCoupon) {
-                couponPrice = 0;
-            }
-        }
-
-        // 计算总价：商品价格 + 加速套餐价格 - 优惠券金额
-        var totalPrice = productPrice + speedPackagePrice - couponPrice;
-		pkgprice=totalPrice;
-		mprice=totalPrice;
-        $("#total-price").html(totalPrice.toFixed(2));
-        $("#trxamt").val(totalPrice.toFixed(2));
-
-		if($(".redcheck:checked").val() == 'balance') {
-			var usertotalbalance = parseFloat($("#usertotalbalance").val());
-			ubalance=usertotalbalance;
-			if(usertotalbalance >= pkgprice) {
-				$(".wallet-money").hide();
-			} else {
-				$(".wallet-money").show();
-				$(".wallet-container .swiper-slide").each(function(i) {
-					var mjine = $(this).data("jine");
-					var fmjine = parseFloat(mjine);
-					if(fmjine>=pkgprice) {
-						$(this).trigger("click");
-						swiper.slideTo(i);
-					}
-				});
-			}
-		}
-    }
-
-    // 页面加载完成后初始化计算一次总价
-    $(document).ready(function() {
-        calculateTotal();
-
-		var isRequesting = false;
-		$(".pay-btn").click(function(e){
-			if (isRequesting) return;
-			isRequesting = true;
-			$(".mask").show();
-
-			var input = $('.form_wrap').find('input,select'), param = {};
-            input.each(function(i,item){
-                item = $(item);
-                var vType = item.attr('vtype'), ind = 0;
-                param[item.attr('name')] = item.val();
-				//alert(item);
-            });
-			var paytype = $(".redcheck:checked").val();
-			if(paytype == "wx") {
-				if (!navigator.userAgent.match(/MicroMessenger/i)) {
-					alert("请使用微信访问！");
-					$('.mask').hide();
-					isRequesting = false;
-					return;
-				}
-				param['amount']=pkgprice;
-				$("#trxamt").val(pkgprice);
-                $("#type").val("1");
-			//	$('.form_wrap').submit();
-
-                param['amount']=pkgprice;
-                param['type']="1";
-				$.post('/mifi/submitorder.do',param,function(res){
-				    $('.mask').hide();
-				    if(typeof(res) === 'string'){
-				        res = JSON.parse(res);
-				    }
-
-				    if(res.status !== "200"){
-				        alert(res.msg);
-				    }else{
-                        $("#notify").val(res.notify);
-                        $("#outTradeNo").val(res.outTradeNo);
-				        $('.form_wrap').submit();
-				    }
-					isRequesting = false;
-				});
-
-			} else if(paytype == "balance") {
-				if(ubalance>=pkgprice) {
-					param['amount']=pkgprice;
-					$.post('/mifi/buyBalance.do',param,function(res){
-					    $('.mask').hide();
-					    if(res == 'OK'){
-							alert("支付成功");
-							location.href = "/device/getDevInfo.do?sn="+$("#devid").val();
-					    } else {
-							alert(res);
-							if(res == '用户余额不足！'){
-								location.href = "/mifi/getMember.do";
-							}
-						}
-						isRequesting = false;
-					},'json');
-				} else {
-					if (!navigator.userAgent.match(/MicroMessenger/i)) {
-						alert("请使用微信访问！");
-						$('.mask').hide();
-						isRequesting = false;
-						return;
-					}
-					param['amount']=mprice;
-					param['pkgprice']=pkgprice;
-					if(isNaN(pkgprice)){
-						location.reload();
-					}
-					param['type']=2;
-					var memberid = $("#memberid").val();
-					if(memberid==''||mprice==0){
-						alert("请选择金额！");
-						$('.mask').hide();
-						isRequesting = false;
-						return;
-					} else if(mprice<pkgprice){
-						alert("金额不足，请重新选择金额！");
-						$('.mask').hide();
-						isRequesting = false;
-						return;
-					} else {
-                        $("#type").val("2");
-                        $("#trxamt").val(mprice);
-                        $("#pkgprice").val(pkgprice);
-
-
-                        $.post('/mifi/submitorder.do',param,function(res){
-                            $('.mask').hide();
-                            if(typeof(res) === 'string'){
-                                res = JSON.parse(res);
-                                if(res.pay_info !== undefined) {
-                                    var payInfo = JSON.parse(res.pay_info);
-                                }
-
-                                //alert(res.pay_info);
-                            }
-
-                            if(res.status !== "200"){
-                                alert(res.msg);
-                            }else{
-                                $("#notify").val(res.notify);
-                                $("#outTradeNo").val(res.outTradeNo);
-                                $('.form_wrap').submit();
-                            }
-                            isRequesting = false;
-                        });
-
-					}
-				}
-			} else {
-                alert("请选择支付方式！");
-                $('.mask').hide();
-                isRequesting = false;
-                return;
-            }
-		});
-    });
-</script>
-
-</body>
-</html>

com.shuhaiwifi.task/src/main/java/com/shuhaiwifi/task/HN.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import com.nianzai.util.DateTimeUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -58,7 +59,7 @@ public class HN
 				i++;
 				String smdsql = "SELECT sn FROM smd where iccid='"+iccid+"'";
 				List<Map<String,Object>> smdlist=RCPService.getBaseService().getMapList(smdsql);
-				if (smdlist!=null&smdlist.size()>0) {
+				if (smdlist!=null&&smdlist.size()>0) {
 					Long sn=Long.parseLong(String.valueOf(smdlist.get(0).get("sn")));
 					String updevicesql="update device"+(sn%32)+" set devstat=1,devgrpid=3 where devid='"+sn+"'";
 					logger.info(updevicesql);
@@ -80,7 +81,30 @@ public class HN
 //				c=Utils.getContentByPost(url,para, tenantId, getAuthorization());
 //				logger.info(url+"===>"+para);
 //				logger.info(c);
-			}
+			} else {
+                String smdsql = "SELECT sn FROM smd where iccid='"+iccid+"'";
+                List<Map<String,Object>> smdlist=RCPService.getBaseService().getMapList(smdsql);
+                if (smdlist!=null&&!smdlist.isEmpty()) {
+                    String snstr = String.valueOf(smdlist.get(0).get("sn"));
+                    Long sn=Long.parseLong(snstr);
+                    String devsql = "SELECT * from device"+(sn%32)+" where devid="+snstr;
+                    List<Map<String, Object>> devList = RCPService.getMifiService().getMapList(devsql);
+                    if (devList!=null&&!devList.isEmpty()) {
+                        Map<String, Object> m = devList.get(0);
+                        String devstat = String.valueOf(m.get("devstat"));
+                        String devgrpid = String.valueOf(m.get("devgrpid"));
+                        if (!"4".equals(devstat)&&"1".equals(devgrpid)) {
+                            logger.info(devsql+"============"+devstat);
+                            String updevicesql = "update device" + (sn % 32) + " set devstat=4 where devid='" + sn + "' and devgrpid=1";
+                            logger.info(updevicesql);
+                            RCPService.getMifiService().execSql(updevicesql);
+                            String insdevcr = "INSERT INTO `devcrond` (`devid`, `operate`, `assist`, `state`, `crttm`) VALUES ('" + sn + "', 1, '', 0, '" + DateTimeUtil.longtime() + "');";
+                            logger.info(insdevcr);
+                            RCPService.getBaseService().execSql(insdevcr);
+                        }
+                    }
+                }
+            }
 		}
 		logger.info(i);
 	}