upd

com.sharemao.web.appserver/src/main/java/com/sharemao/app/ctrl/DeviceCtrl.java

@@ -367,7 +367,21 @@ public class DeviceCtrl {
 		result.remove("code");
 		return new JsonView(result, msg, code);
 	}
-	
+
+	@Path("/getDevGrp.do")
+	public JsonView getDevGrp(Context context) {
+		String lastAccessUrl = context.getRequest().getRequestURL() + "?" + context.getRequest().getQueryString();
+		log.info("请求地址：>>{" + lastAccessUrl + "}");
+		Map<String, String> para = context.getParas();
+		// 获取返回结果
+		Map<String, Object> result = service.getDevGrp(para.get("devid"));
+		String msg = result.get("msg").toString();
+		int code = Integer.parseInt(String.valueOf(result.get("code")));
+		result.remove("msg");
+		result.remove("code");
+		return new JsonView(result, msg, code);
+	}
+
 	/**
 	 * 获取设备实名信息
 	 * @param devid

com.sharemao.web.appserver/src/main/java/com/sharemao/app/service/DeviceService.java

@@ -122,7 +122,14 @@ public interface DeviceService {
 	 * @return
 	 */
 	public Map<String, Object> getDevRunMode(String devid);
-	
+
+    /**
+     * 获取设备分组
+     * @param devid
+     * @return
+     */
+	public Map<String, Object> getDevGrp(String devid);
+
 	/**
 	 * 获取设备实名信息
 	 * @param devid

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

@@ -1522,6 +1522,30 @@ public class DeviceServiceImpl extends AppBaseService implements DeviceService
 		return record;
 	}
 
+	@Override
+	public Map<String, Object> getDevGrp(String devid)
+	{
+		Map<String, Object> record = new HashMap<String, Object>();
+		record.put("code", 0);
+
+		String sql = "SELECT devgrpid FROM "+ProjectTools.getTableNameBySN(devid)+" WHERE devid = '"+devid+"'";
+		List<Integer> uList =RCPService.getMifiService().getFields(sql);
+		if(uList == null || uList.size() == 0)
+		{
+			record.put("code", 5);
+			record.put("msg", "设备编号不存在");
+			return record;
+		}
+		int devgrpid=0;
+		if(uList.get(0)==null)
+			devgrpid=0;
+		else
+			devgrpid=uList.get(0);
+		record.put("msg", "OK");
+		record.put("devgrpid", devgrpid);
+		return record;
+	}
+
 	@Override
 	public Map<String, Object> getDevSMInfo(String devid) 
 	{

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

@@ -1421,12 +1421,13 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
 				result.add(record);
 				return result;
 			}
-			String devgrpid=getDevGrpId(devid);
+//			String devgrpid=getDevGrpId(devid);
 			
 			if(Tools.isEmpty(areaid))
 				areaid="100000";
 			
-			int packType=getPKTypeByDevid(devid,devgrpid);
+//			int packType=getPKTypeByDevid(devid,devgrpid);
+            int packType=getDevTypeId(devid);
 			
 			String saled = para.get("saled");
 			List<Map<String, Object>> pkgLst=null;

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

@@ -425,13 +425,27 @@ public class PayCtrl
 			log.info(dataJson);
 			context.getRequest().setAttribute("spkgs", dataJson);
 		}
-		result = GzhUtil.sendPost(Constants.m3IntAddr + "/packkey/getMember.do", para);
+        result = GzhUtil.sendPost(Constants.m3IntAddr + "/packkey/getMember.do", para);
+        if(!Tools.isEmpty(result))
+        {
+            resJson = JSONObject.parseObject(result);
+            JSONArray dataJson = resJson.getJSONArray("data");
+            context.getRequest().setAttribute("cons", dataJson);
+        }
+        result = GzhUtil.sendPost(Constants.m3IntAddr + "/device/getDevGrp.do?devid="+devid, para);
 		if(!Tools.isEmpty(result))
 		{
 			resJson = JSONObject.parseObject(result);
-			JSONArray dataJson = resJson.getJSONArray("data");
-			context.getRequest().setAttribute("cons", dataJson);
+            int resCode2 = resJson.getIntValue("code");
+            if(resCode2 == 0){
+                JSONObject dataJson = resJson.getJSONObject("data");
+                int devgrpid=dataJson.getIntValue("devgrpid");
+                if (devgrpid==299) {    //易联随身WiFi
+                    context.getRequest().setAttribute("noSupportWechatPay", 1);
+                }
+            }
 		}
+        context.getRequest().setAttribute("noSupportWechatPay", 1);
 		context.getRequest().setAttribute("pkgInfo", pkgInfo);
 		context.getRequest().setAttribute("devid", devid);
 		return new TextView("/pkgorder.jsp");

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

@@ -306,15 +306,29 @@
 	            <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>微信支付，请联系客服充值（08:00-凌晨02:00）</span>
-	        </div>
-	        <div class="select">
-<%--                <input type="radio" name="pay" value="wx" class="redcheck">--%>
-	        </div>
-	    </div>
+	    <c:if test="${noSupportWechatPay == 1}">
+	        <div class="form-item">
+                <div class="form-text">
+                    <img src="/static/img/icon-pay-weixin.png" class="icon">
+                    <span>微信支付，请联系客服充值（08:00-凌晨02:00）</span>
+                </div>
+                <div class="select">
+    <%--                <input type="radio" name="pay" value="wx" class="redcheck">--%>
+                </div>
+            </div>
+	    </c:if>
+	    <c:if test="${empty noSupportWechatPay or noSupportWechatPay != 1}">
+	        <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">
+                </div>
+            </div>
+	    </c:if>
+
 	</c:if>
 	<c:if test="${pkgInfo.paytype == 2}">
 	    <div class="form-item">
@@ -326,15 +340,28 @@
 	            <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>微信支付，请联系客服充值（08:00-凌晨02:00）</span>
-	        </div>
-	        <div class="select">
-<%--                <input type="radio" name="pay" value="wx" class="redcheck">--%>
-	        </div>
-	    </div>
+	    <c:if test="${noSupportWechatPay == 1}">
+            <div class="form-item">
+                <div class="form-text">
+                    <img src="/static/img/icon-pay-weixin.png" class="icon">
+                    <span>微信支付，请联系客服充值（08:00-凌晨02:00）</span>
+                </div>
+                <div class="select">
+    <%--                <input type="radio" name="pay" value="wx" class="redcheck">--%>
+                </div>
+            </div>
+	    </c:if>
+	    <c:if test="${empty noSupportWechatPay or noSupportWechatPay != 1}">
+            <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">
+                </div>
+            </div>
+	    </c:if>
 	</c:if>
 	<c:if test="${pkgInfo.paytype == 3}">
 	    <div class="form-item">