upd

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

@@ -1828,7 +1828,7 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
             return record;
         }
 
-        String uusql = "SELECT ust.effect,ust.invalid,pkg.pkname"
+        String uusql = "SELECT ust.effect,ust.invalid,pkg.price,pkg.pkname"
                 + "	 FROM usersuit ust left join packageview pkg on ust.packid=pkg.pkid"
                 + "	WHERE ust.packid>1 and ust.devid = '"+devid+"'"
                 + " ORDER BY ust.invalid  ";
@@ -1837,9 +1837,11 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
         if (pkgLst==null){
             pkgLst= new ArrayList<Map<String, Object>>();
         }
+        DecimalFormat df = new DecimalFormat("#.##");
         for (Map<String, Object> map : pkgLst) {
             map.put("effectDate", ProjectTools.timeInt2Date(String.valueOf(map.get("effect"))));
             map.put("invalidDate", ProjectTools.timeInt2Date(String.valueOf(map.get("invalid"))));
+            map.put("price", df.format(Double.parseDouble(String.valueOf(map.get("price")))/1000));
         }
         record.put("msg", "OK");
         record.put("pkgs", pkgLst);
@@ -1880,8 +1882,8 @@ public class PackageServiceImpl extends AppBaseService implements PackageService
             sql += " ORDER BY pkv.reorder ASC";
             logger.info(sql);
             List<Map<String, Object>> pkgLst = baseDao.getMapList(sql);
+            DecimalFormat df = new DecimalFormat("#.##");
             for (Map<String, Object> map : pkgLst) {
-                DecimalFormat df = new DecimalFormat("#.##");
                 map.put("price", df.format(Double.parseDouble(String.valueOf(map.get("price")))/1000));
                 map.put("ts", CodecUtil.str2md5("zengnz"+map.get("price").toString()));
                 String expiryDay = String.valueOf(map.get("expiryDay"));

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

@@ -60,9 +60,6 @@ public class ConsumerCtrl
 		
 		GzhUtil.toM3Sign(para);
 		
-		String result = GzhUtil.sendPost(Constants.m3IntAddr + "/package/getPkgsByDevId.do", para);
-		//log.info(result);
-		
 
 		HttpSession session = context.getRequest().getSession();
 		String cursn = (String) session.getAttribute("cursn");
@@ -71,14 +68,11 @@ public class ConsumerCtrl
 			cursn=devid;
 			session.setAttribute("cursn", cursn);//当前扫描设备编号
 		}
-		JSONObject resJson = JSONObject.parseObject(result);
-		JSONArray dataJson = resJson.getJSONArray("data");
-		context.getRequest().setAttribute("cons", dataJson);
 		context.getRequest().setAttribute("cursn", cursn);
-		
-		result = GzhUtil.sendPost(Constants.m3IntAddr + "/package/getPkgsByDevId3.do", para);
+
+        String result = GzhUtil.sendPost(Constants.m3IntAddr + "/package/getPkgsByDevId3.do", para);
 //		log.info("getPkgsByDevId2:"+result);
-		resJson = JSONObject.parseObject(result);
+        JSONObject resJson = JSONObject.parseObject(result);
 		JSONObject listJson = JSONObject.parseObject(resJson.getString("data"));
         JSONArray listJson2 = JSONArray.parseArray(listJson.getString("list"));
 		//log.info(listJson);

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

@@ -31,13 +31,13 @@
             <div class="info">
                 <p>状态:
                 <c:choose>
-                <c:when test="${devs.devInfo.realstate =='已实名' }">
-                <span class="status green">已激活</span>
-                </c:when>
-                <c:when test="${devs.devInfo.realstate =='未实名' or devs.devInfo.realstate == null}">
-                <span class="status red">未激活</span>
-                </c:when>
-            </c:choose>
+                    <c:when test="${devs.devInfo.realstate =='已实名' }">
+                    <span class="status green">已激活</span>
+                    </c:when>
+                    <c:when test="${devs.devInfo.realstate =='未实名' or devs.devInfo.realstate == null}">
+                    <span class="status red">未激活</span>
+                    </c:when>
+                </c:choose>
 
                     <span class="refresh-btn" onclick="shuxindq()">
                     <img src="/static/img/cq.png"></span>
@@ -204,9 +204,27 @@
         <div class="diagnosis animated fadeIn">
             <div class="title">诊断结果</div>
             <div class="state">
-                <p><span>卡状态:</span><span id="bckd1" class="green">已激活</span></p>
-                <p><span>实名状态:</span><span id="bckd2" class="green">已实名</span></p>
-                <p><span>在用套餐剩余:</span><span id="bckd3">9999</span>G</p>
+                <p><span>卡状态:</span><span id="bckd1" class="green">
+                <c:choose>
+                    <c:when test="${devs.devInfo.realstate =='已实名' }">
+                    <span class="status green">已激活</span>
+                    </c:when>
+                    <c:when test="${devs.devInfo.realstate =='未实名' or devs.devInfo.realstate == null}">
+                    <span class="status red">未激活</span>
+                    </c:when>
+                </c:choose>
+                </span></p>
+                <p><span>实名状态:</span>
+                <c:choose>
+                    <c:when test="${devs.devInfo.realstate =='已实名' }">
+                    <span id="bckd2" class="green">${devs.devInfo.realstate}</span>
+                    </c:when>
+                    <c:when test="${devs.devInfo.realstate =='未实名' or devs.devInfo.realstate == null}">
+                    <span id="bckd2" class="red">${devs.devInfo.realstate}</span>
+                    </c:when>
+                </c:choose>
+                </p>
+                <p><span>在用套餐剩余:</span><span id="bckd3">${ust.remainvalue}</span></p>
             </div>
             <div class="desc">
                 <p style="font-weight: 800">温馨提示:</p>

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

@@ -69,7 +69,7 @@
                     <div>失效时间：<span>${item.invalidDate}</span></div>
                 </div>
                 <div class="price">
-                    ¥<strong>79.00</strong>
+                    ¥<strong>${item.price}</strong>
                 </div>
             </div>
 	        </c:forEach>