From df2d13826f96d8871eb964ecbfa4ccbda30ab15f Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 4 Jan 2018 14:55:22 +0800
Subject: [PATCH] update

---
 .../apps/web/CustomerImpressionController.java       | 12 ++++++------
 .../manage/mappers/client/ClientCustomersMapper.xml  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/web/CustomerImpressionController.java b/src/main/java/au/com/royalpay/payment/manage/apps/web/CustomerImpressionController.java
index c5788cfea..b57203804 100644
--- a/src/main/java/au/com/royalpay/payment/manage/apps/web/CustomerImpressionController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/apps/web/CustomerImpressionController.java
@@ -30,15 +30,15 @@ public class CustomerImpressionController {
     }
 
 
-    @RequestMapping(value = "/{client_id}/{customer_id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/{customer_id}", method = RequestMethod.GET)
     @ResponseBody
-    public JSONObject find(@PathVariable int client_id,@PathVariable String customer_id) {
-        return customerImpression.findOne(client_id,customer_id);
+    public JSONObject find(@PathVariable String customer_id,@ModelAttribute(CommonConsts.APP_INFO) JSONObject app) {
+        return customerImpression.findOne(app.getIntValue("client_id"),customer_id);
     }
 
-    @RequestMapping(value = "/{client_id}/{customer_id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/{customer_id}", method = RequestMethod.PUT)
     @ResponseBody
-    public void modifyNameRemark(@PathVariable int client_id, @PathVariable String customer_id, @RequestBody JSONObject customerInfo) {
-         customerImpression.modifyNameRemark(client_id,customer_id,customerInfo.getString("name_remark"));
+    public void modifyNameRemark(@PathVariable String customer_id, @RequestBody JSONObject customerInfo,@ModelAttribute(CommonConsts.APP_INFO) JSONObject app) {
+         customerImpression.modifyNameRemark(app.getIntValue("client_id"),customer_id,customerInfo.getString("name_remark"));
     }
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.xml
index 15477002f..dfd1e3c25 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="au.com.royalpay.payment.manage.mappers.client.ClientCustomersMapper">
     <select id="listCustomerInfo" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-         *
+         client_id,customer_id,name_remak,headimg,nick_name,tag,payment_times,total_amount,update_time,channel
         FROM sys_clients_customers
         where
         client_id = #{client_id}