Merge branch 'update' into develop

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) {
+    public JSONObject find(@PathVariable String customer_id,@ModelAttribute(CommonConsts.APP_INFO) JSONObject app) {
-        return customerImpression.findOne(client_id,customer_id);
+        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) {
+    public void modifyNameRemark(@PathVariable String customer_id, @RequestBody JSONObject customerInfo,@ModelAttribute(CommonConsts.APP_INFO) JSONObject app) {
-         customerImpression.modifyNameRemark(client_id,customer_id,customerInfo.getString("name_remark"));
+         customerImpression.modifyNameRemark(app.getIntValue("client_id"),customer_id,customerInfo.getString("name_remark"));
     }
 }

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}