Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java

@@ -555,13 +555,13 @@ public class RetailAppController {
     }
 
     @RequestMapping(value = "/ctrip/check",method = RequestMethod.GET)
-    public void ctripCheck(@ModelAttribute(RETAIL_DEVICE) JSONObject device) {
-        retailAppService.ctripCheck(device);
+    public JSONObject ctripCheck(@ModelAttribute(RETAIL_DEVICE) JSONObject device) {
+        return retailAppService.ctripCheck(device);
     }
 
     @RequestMapping(value = "/ctrip/coupon/{couponId}",method = RequestMethod.GET)
-    public void ctripCheck(@ModelAttribute(RETAIL_DEVICE) JSONObject device,@PathVariable String couponId) {
-        retailAppService.ctripCouponInfo(device,couponId);
+    public JSONObject ctripCheck(@ModelAttribute(RETAIL_DEVICE) JSONObject device,@PathVariable String couponId) {
+        return retailAppService.ctripCouponInfo(device,couponId);
     }
 
 }