From f52f59f4c6d2dbc1b64f02a869d7736cafca50ad Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 16 Jul 2018 17:37:29 +0800
Subject: [PATCH] update

---
 .../manage/customers/web/EncourageMoneyController.java       | 5 ++---
 src/main/ui/static/templates/payment/success.js              | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
index f94a5d7e1..8a753f4e4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
@@ -2,7 +2,6 @@ package au.com.royalpay.payment.manage.customers.web;
 
 import au.com.royalpay.payment.manage.customers.core.EncourageService;
 import au.com.royalpay.payment.tools.CommonConsts;
-import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
 
 import com.alibaba.fastjson.JSONObject;
 
@@ -29,7 +28,7 @@ public class EncourageMoneyController {
     private EncourageService encourageService;
 
 
-    @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.GET)
     public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
             @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
         String user_id = "";
@@ -50,7 +49,7 @@ public class EncourageMoneyController {
         return encourageService.doubleEncourageMoney(orderId);
     }
 
-    @WechatMapping(value = "/my", method = RequestMethod.GET)
+    @RequestMapping(value = "/my", method = RequestMethod.GET)
     public ModelAndView encourageLogs(@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser, @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
         ModelAndView mav = new ModelAndView("activity/encourage_money/my");
         JSONObject user = new JSONObject();
diff --git a/src/main/ui/static/templates/payment/success.js b/src/main/ui/static/templates/payment/success.js
index 0f4a38459..526e2751d 100644
--- a/src/main/ui/static/templates/payment/success.js
+++ b/src/main/ui/static/templates/payment/success.js
@@ -34,7 +34,7 @@ $(function () {
         $.ajax({
 
             url: '/act/encourage_money/orders/' + window.order_id,
-            method: 'PUT',
+            method: 'GET',
             dataType: 'json',
             success: function (encourage) {
                 if (encourage.access_amount) {