完善小程序继续下单接口

src/main/java/com/ctrip/fun/golf/api/order/AbstractOrderController.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Request;
 import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseMp;
 import com.ctrip.fun.common.vo.ResponseStatusEnum;
 import com.ctrip.fun.common.vo.order.AbstractOrderBean;
 import com.ctrip.fun.common.vo.order.AbstractOrderListItemBean;
@@ -55,13 +56,9 @@ public abstract class AbstractOrderController<H extends AbstractOrderBean<T>, T,
     @SuppressWarnings("unchecked")
     @ResponseBody
     @RequestMapping(value = "/continueWeiXinPay", method = RequestMethod.POST)
-    public Response<JSONObject> continueWeiXinPay(@RequestBody Request<H> request) {
-        Response<JSONObject> response = new Response<JSONObject>();
-        try {
-			response = this.getOrderService().continueWeiXinPay(request.getBody());
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+    public ResponseMp<JSONObject> continueWeiXinPay(@RequestBody Request<H> request) {
+    	ResponseMp<JSONObject> response = new ResponseMp<JSONObject>();
+        response = this.getOrderService().continueWeiXinPay(request.getBody());
         return response;
     }
     

src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java

@@ -23,6 +23,7 @@ import com.ctrip.fun.common.core.util.JsonUtil;
 import com.ctrip.fun.common.core.util.RSA;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseMp;
 import com.ctrip.fun.common.vo.ResponseStatusEnum;
 import com.ctrip.fun.common.vo.basic.AbstractRuleConditionBean;
 import com.ctrip.fun.common.vo.basic.MultipleCourseConditionBean;
@@ -245,23 +246,31 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
     
     protected void checkContinuePayParameters(H abstractOrderBean) {
         if (null == abstractOrderBean.getOrderNo()) {
-        	 throw new OrderException(-11, "订单参数有误");
+        	 throw new OrderException(-666, "订单参数有误");
         }
         if (abstractOrderBean.getUid()==null||"".equals(abstractOrderBean.getUid())) {
-        	throw new OrderException(-11, "订单参数有误");
+        	throw new OrderException(-666, "订单参数有误");
         }
+        Order order = this.getOrderDao().getOrderByOrderNo(abstractOrderBean.getOrderNo());
+        if ((order.getProcessStatus()&OrderStatusBitEnum.DEDUCTED.getValue())==16) {
+        	throw new OrderException(-666, "该订单已付款");
+        }
+        if ((order.getProcessStatus()&OrderStatusBitEnum.CANCELED.getValue())==64) {
+        	throw new OrderException(-666, "该订单已取消");
+        }        
     }
     
-    public Response<JSONObject> continueWeiXinPay(H abstractOrderBean) throws Exception{
+    public ResponseMp<JSONObject> continueWeiXinPay(H abstractOrderBean){
     	this.checkContinuePayParameters(abstractOrderBean);
         UserExt userExt = getUserExtDao().getByUid(abstractOrderBean.getUid());
         Order order = this.getOrderDao().getOrderByOrderNo(abstractOrderBean.getOrderNo());
-        Response<JSONObject>  response = new Response<JSONObject>();
+        ResponseMp<JSONObject>  response = new ResponseMp<JSONObject>();
         JSONObject jSONObject = new JSONObject();
-        response.setBody(jSONObject);
         try {
         	jSONObject = WeiXinAtcion.weixinPlay(userExt.getMiniAppOpenId(),order.getAmount().multiply(new BigDecimal("100")).intValue(), order.getOrderNo()+"", this.getNotifyUrlForWeiXinPay(order), "dingqiu");
-		} catch (Exception e) {
+            response.setBody(jSONObject);
+        } catch (Exception e) {
+	        response.setBody(jSONObject);
 		    e.printStackTrace();
 		}
         return response;

src/main/resources/base.spring.xml

@@ -262,6 +262,8 @@
 			<tx:method name="getSyncCourseDateRunning" propagation="NEVER" />
 			<tx:method name="placeOrder" propagation="REQUIRED"
 				read-only="false" />
+			<tx:method name="placeOrderWeiXinPay" propagation="REQUIRED"
+				read-only="false" />
 			<tx:method name="cancel" propagation="REQUIRED" read-only="false" />
 			<tx:method name="repay" propagation="REQUIRED" read-only="false" />
 			<tx:method name="refund" propagation="REQUIRED" read-only="false" />