1

howe · Sep 17, 2012 · ea6f228 · ea6f228
1 parent f5a0f00
commit ea6f228
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git a/WebContent/WEB-INF/lib/taobao-sdk-java-online_standard-20120914.jar b/WebContent/WEB-INF/lib/taobao-sdk-java-online_standard-20120914.jar
diff --git a/WebContent/WEB-INF/lib/taobao-sdk-java-online_standard-20120917.jar b/WebContent/WEB-INF/lib/taobao-sdk-java-online_standard-20120917.jar
diff --git a/WebContent/query.jsp b/WebContent/query.jsp
@@ -1,7 +1,4 @@
 <%@ page contentType="text/html; charset=utf-8" language="java" %>
-<%
-	String cardNO=request.getParameter("cardno")==null?"":request.getParameter("cardno");  
-%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -16,10 +13,16 @@
   <legend>自主提卡</legend>
   <div class="well" style="max-width: 70%; margin: 0 auto 10px;">
     <div class="control-group">
-      <label class="control-label" for="inputEmail">充值卡号</label>
+      <label class="control-label" for="inputEmail">订单编号</label>
       <div class="controls">
-        <input type="text" id="inputEmail" placeholder="充值卡号" value="<%=cardNO%>">
-        &nbsp;<span class="label label-important">请输入充值卡号</span></div>
+        <input type="text" id="inputEmail" placeholder="淘宝或拍拍订单编号">
+        &nbsp;<span class="label label-important">请输入订单编号</span></div>
+    </div>
+    <div class="control-group">
+      <label class="control-label" for="inputEmail">支付流水号</label>
+      <div class="controls">
+        <input type="text" id="inputEmail" placeholder="支付宝交易号或财付通订单号">
+        &nbsp;<span class="label label-important">请输入支付流水号</span></div>
     </div>
     <div class="control-group">
       <div class="controls">
@@ -28,26 +31,32 @@
     </div>
     <div class="alert alert-error">
       <button type="button" class="close" data-dismiss="alert">×</button>
-      充值卡号<strong>不正确！</strong>
+      订单编号或支付流水号<strong>不正确！</strong>
+    </div>
+    <div class="alert alert-info">
+      <button type="button" class="close" data-dismiss="alert">×</button>
+      <strong>无此订单！</strong>有疑问请联系客服。
     </div>
     <div class="control-group">
       <table class="table table-bordered"  style="background-color:#FFF">
         <thead>
           <tr>
-            <th>充值卡号</th>
-            <th>充值游戏</th>
-            <th>充值面值</th>
-            <th>充值时间</th>
-            <th>充值帐号</th>
+            <th>订单编号</th>
+            <th>卡号</th>
+            <th>密码</th>
+            <th>充值链接</th>
+            <th>过期时间</th>
+            <th>名称</th>
           </tr>
         </thead>
         <tbody>
           <tr>
-            <td>DNW7HGDFHJH3GA</td>
-            <td>斗牛棋牌银子</td>
-            <td>1000</td>
-            <td>2012-08-23 17:04:50</td>
-            <td>a***s</td>
+            <td title="85500561220120724855729115">85500561220...</td>
+            <td>HSEKLFHKJSDE83</td>
+            <td>DSF43VGSF3</td>
+            <td><a href="#" target="_blank">http://chong.esup.cn</a></td>
+            <td>2013-09-17 15:55:45</td>
+            <td>心动游戏10元充值礼券</td>
           </tr>
         </tbody>
       </table>

diff --git a/src/com/esup/faka/bean/Order.java b/src/com/esup/faka/bean/Order.java
@@ -21,7 +21,7 @@ public class Order {
 	@Column("orderNO")
 	private String orderNo;
 	/**
-	 * 支付交易号（支付宝或财付通交易号）
+	 * 支付交易号（支付宝交易号、财付通订单号）
 	 */
 	@Column("paymentNO")
 	private String paymentNo;
@@ -46,13 +46,13 @@ public String getOrderNo() {
 		return orderNo;
 	}
 	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
+		this.orderNo = orderNo.replace("-", "");
 	}
 	public String getPaymentNo() {
 		return paymentNo;
 	}
 	public void setPaymentNo(String paymentNo) {
-		this.paymentNo = paymentNo;
+		this.paymentNo = paymentNo.replace("-", "");
 	}
 	public java.util.Date getOrderTime() {
 		return orderTime;

diff --git a/src/com/esup/faka/module/StocksModule.java b/src/com/esup/faka/module/StocksModule.java
@@ -145,7 +145,7 @@ private String rtnNumber(String num) {
 	/**
 	 * 通过订单号与支付流水号提取卡密
 	 * @param orderNO 订单号(淘宝订单号、拍拍订单号)
-	 * @param paymentNO 支付流水号(支付宝流水号、财付通流水号)
+	 * @param paymentNO 支付流水号(支付宝交易号、财付通订单号)
 	 * @return
 	 */
 	@At("/stocks/querycardbyorder")