From 4027c84debe02178256da7cb4a8ec7d06509ebfa Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Thu, 4 Jan 2018 11:10:34 +0800 Subject: [PATCH 1/4] update --- .../apps/bean/CustomerImpressionQuery.java | 33 +++++++++++++++---- .../core/impls/CustomerImpressionImpl.java | 31 +++++++++++++++++ .../mappers/client/ClientCustomersMapper.xml | 12 +++++-- .../manage/mappers/payment/OrderMapper.xml | 6 ++-- 4 files changed, 70 insertions(+), 12 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/bean/CustomerImpressionQuery.java b/src/main/java/au/com/royalpay/payment/manage/apps/bean/CustomerImpressionQuery.java index a177232b0..c4ae0da28 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apps/bean/CustomerImpressionQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/apps/bean/CustomerImpressionQuery.java @@ -8,29 +8,42 @@ import java.math.BigDecimal; * Created by wangning on 2017/12/28. */ public class CustomerImpressionQuery { - private int payment_times; + private int payment_times_begin; + private int payment_times_end; private BigDecimal amount_begin; private BigDecimal amount_end; private String order; + private String nick_name; private int client_id; private int page = 1; private int limit = 10; public JSONObject toParam(){ JSONObject param = new JSONObject(); - param.put("payment_times",this.payment_times); + param.put("payment_times_begin",this.payment_times_begin); + param.put("payment_times_end",this.payment_times_end); param.put("amount_begin",this.amount_begin); param.put("amount_end",this.amount_end); param.put("order",this.order); param.put("client_id",this.client_id); + param.put("nick_name",nick_name); return param; } - public int getPayment_times() { - return payment_times; + + public int getPayment_times_begin() { + return payment_times_begin; + } + + public void setPayment_times_begin(int payment_times_begin) { + this.payment_times_begin = payment_times_begin; + } + + public int getPayment_times_end() { + return payment_times_end; } - public void setPayment_times(int payment_times) { - this.payment_times = payment_times; + public void setPayment_times_end(int payment_times_end) { + this.payment_times_end = payment_times_end; } public BigDecimal getamount_begin() { @@ -96,5 +109,13 @@ public class CustomerImpressionQuery { public void setClient_id(int client_id) { this.client_id = client_id; } + + public String getNick_name() { + return nick_name; + } + + public void setNick_name(String nick_name) { + this.nick_name = nick_name; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImpl.java b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImpl.java index 034c11350..1288bbc83 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImpl.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; +import org.joda.time.DateTime; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -90,6 +91,7 @@ public class CustomerImpressionImpl implements CustomerImpression { client_customer.put("client_id", order.getIntValue("client_id")); client_customer.put("customer_id", order.getString("customer_id")); client_customer.put("channel", order.getString("channel")); + client_customer.put("tag","不活跃用户"); if (order.getString("alipay_headimg") == null) { client_customer.put("headimg", order.getString("wechat_headimg")); client_customer.put("nick_name", order.getString("wechat_nickname")); @@ -118,10 +120,39 @@ public class CustomerImpressionImpl implements CustomerImpression { clientCustomerInfo.put("nick_name", order.getString("alipay_nickname")); } clientCustomerInfo.put("channel", order.getString("channel")); + clientCustomerInfo.put("tag","不活跃用户"); clientCustomerInfo.put("update_time",now); clientCustomersMapper.update(clientCustomerInfo); } } + generateTag(client_id); + } + + + private void generateTag(int client_id){ + JSONObject params = new JSONObject(); + DateTime dt = new DateTime(); + dt = dt.minusMonths(5); + params.put("confirm_time",dt.toDate()); + params.put("client_id",client_id); + List orders = orderMapper.listAnalysisClientCustomer(params); + for (JSONObject order : orders) { + int payment_times = order.getInteger("payment_times"); + JSONObject updateRecord = new JSONObject(); + updateRecord.put("client_id",order.getIntValue("client_id")); + updateRecord.put("customer_id",order.getString("customer_id")); + if(payment_times<2){ + updateRecord.put("tag","不活跃用户"); + } + if(payment_times>=2 && payment_times<10){ + updateRecord.put("tag","潜力用户"); + } + if(payment_times>=10){ + updateRecord.put("tag","忠实用户"); + } + clientCustomersMapper.update(updateRecord); + } + } @Override 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 1de5ec0bb..15477002f 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,12 +3,15 @@ From 3f9d65aa58bbc24a584b9062dc4273f2e7b3c9a9 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Thu, 4 Jan 2018 14:03:09 +0800 Subject: [PATCH 2/4] update --- .../manage/apps/web/CustomerImpressionController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 18469792a..c5788cfea 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 @@ -3,9 +3,11 @@ package au.com.royalpay.payment.manage.apps.web; import au.com.royalpay.payment.manage.apps.AppController; import au.com.royalpay.payment.manage.apps.bean.CustomerImpressionQuery; import au.com.royalpay.payment.manage.apps.core.CustomerImpression; +import au.com.royalpay.payment.tools.CommonConsts; import com.alibaba.fastjson.JSONObject; +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; @@ -22,7 +24,8 @@ public class CustomerImpressionController { @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public JSONObject list(CustomerImpressionQuery customerImpressionQuery) { + public JSONObject list(CustomerImpressionQuery customerImpressionQuery,@ModelAttribute(CommonConsts.APP_INFO) JSONObject app) { + customerImpressionQuery.setClient_id(app.getInteger("client_id")); return customerImpression.listPageble(customerImpressionQuery); } From fba967152d539481c47aa636fe6e7debd1c79cc9 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 4 Jan 2018 14:44:27 +0800 Subject: [PATCH 3/4] points --- .../ui/static/templates/payment/success.js | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/src/main/ui/static/templates/payment/success.js b/src/main/ui/static/templates/payment/success.js index 77a54636b..85c7020b3 100644 --- a/src/main/ui/static/templates/payment/success.js +++ b/src/main/ui/static/templates/payment/success.js @@ -1,10 +1,10 @@ -window.onbeforeunload = function(e) { +window.onbeforeunload = function (e) { return '页面已过期|Page Expired'; }; $(function () { var ctrl = {doubled: false, accessed: false}; $('.coin').click(function () { - if(ctrl.accessed && !ctrl.doubled){ + if (ctrl.accessed && !ctrl.doubled) { var coin = $(this); coin.addClass('throwing'); $.ajax({ @@ -15,20 +15,21 @@ $(function () { $('.encourage-dialog .money-amount').html(encourage.actural_amount); $('.encourage-dialog .double-rate').html('X ' + encourage.factor); $('.encourage-dialog .double-text').hide(); - setTimeout(function(){ + setTimeout(function () { coin.removeClass('throwing'); - },1000); + }, 1000); }, error: function () { - setTimeout(function(){ + setTimeout(function () { coin.removeClass('throwing'); - },1000); + }, 1000); } }); ctrl.doubled = true; } }); + function loadEncourage() { $.ajax({ url: '/act/encourage_money/orders/' + window.order_id, @@ -39,28 +40,32 @@ $(function () { $('.encourage-dialog .money-amount').html(encourage.actural_amount); $('.encourage-dialog .double-rate').html('X ' + encourage.factor); $('.encourage-dialog').removeClass('hide'); - ctrl.accessed=true; + ctrl.accessed = true; } } }) } + loadEncourage(); function loadPoints() { - $.ajax({ - url: '/customers/points/' + window.order_id +'/check', - method: 'GET', - dataType: 'text', - success: function (data) { - if (data>0){ - $('.points-dialog .points-value').html('+ ' + data); - $('.points-dialog').removeClass('hide'); - } + if ([0, 1, 2, 11].indexOf(window.order_gateway) >= 0) { + $.ajax({ + url: '/customers/points/' + window.order_id + '/check', + method: 'GET', + dataType: 'text', + success: function (data) { + if (data > 0) { + $('.points-dialog .points-value').html('+ ' + data); + $('.points-dialog').removeClass('hide'); + } - },error:function () { - } - }); + }, error: function () { + } + }); + } } + loadPoints(); $('.encourage-dialog .close-circle').click(function () { 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 4/4] 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 @@