Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java

@@ -27,7 +27,7 @@ public class EncourageMoneyController {
     @Resource
     private EncourageService encourageService;
 
-    @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.PUT)
     public JSONObject takeEncourageMoney(@PathVariable String orderId,@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
         String user_id = "";
         if(wxUser==null){

src/main/ui/static/templates/payment/success.js

@@ -31,7 +31,6 @@ $(function () {
     });
 
     function loadEncourage() {
-
         $.ajax({
             url: '/act/encourage_money/orders/' + window.order_id,
             method: 'GET',