From 25d6d34a3f55196c0f0ecbac53f0e62fca656458 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 7 Mar 2018 18:10:07 +0800
Subject: [PATCH] update

---
 .../core/impls/RetailAppServiceImp.java       |  3 --
 .../appclient/web/RetailAppController.java    | 43 ++++++++++---------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 8cf9af7f6..33c24b1c2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -25,7 +25,6 @@ import au.com.royalpay.payment.manage.notice.beans.NoticeInfo;
 import au.com.royalpay.payment.manage.notice.core.NoticeManage;
 import au.com.royalpay.payment.manage.notice.core.NoticePartner;
 import au.com.royalpay.payment.manage.pushMessage.APNSMessageHelper;
-import au.com.royalpay.payment.manage.pushMessage.JpushMessageHelper;
 import au.com.royalpay.payment.manage.pushMessage.bean.AppManagerMessageBuilder;
 import au.com.royalpay.payment.manage.signin.beans.ChangePwdBean;
 import au.com.royalpay.payment.manage.signin.core.SignInAccountService;
@@ -138,8 +137,6 @@ public class RetailAppServiceImp implements RetailAppService {
     @Resource
     private ClientDeviceTokenMapper clientDeviceTokenMapper;
     @Resource
-    private JpushMessageHelper jpushMessageHelper;
-    @Resource
     private ClientRateMapper clientRateMapper;
 
     private Map<String, AppMsgSender> senderMap = new HashMap<>();
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
index c67a61bfe..34c73b63c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
@@ -1,23 +1,5 @@
 package au.com.royalpay.payment.manage.appclient.web;
 
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import org.springframework.validation.Errors;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-
 import au.com.royalpay.payment.core.exceptions.ParamInvalidException;
 import au.com.royalpay.payment.manage.appclient.beans.AppClientBean;
 import au.com.royalpay.payment.manage.appclient.beans.AppQueryBean;
@@ -35,10 +17,28 @@ import au.com.royalpay.payment.tools.device.advise.AppClientController;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.http.HttpUtils;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
 /**
  * Created by yishuqian on 28/03/2017.
  */
- @AppClientController
+@AppClientController
 @RequestMapping("/api/v1.0/retail/app")
 public class RetailAppController {
     @Resource
@@ -333,7 +333,10 @@ public class RetailAppController {
 
     @RequestMapping(value = "/file/agree", method = RequestMethod.PUT)
     public JSONObject generateSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
-        return appFileService.getOrGenerateSourceAgreement(device.getIntValue("client_id"));
+        JSONObject file = appFileService.getOrGenerateSourceAgreement(device.getIntValue("client_id"));
+        JSONObject result = new JSONObject();
+        result.put("file_value",file.getString("file_value"));
+        return result;
     }
 
     @RequestMapping(value = "/file/agree/confirm", method = RequestMethod.POST)