diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 6b65c4dc0..34e102afd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -401,7 +401,12 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
throw new ParamInvalidException("date", "error.payment.valid.invalid_date_format");
}
params.put("channel",record.getString("channel"));
- int newCustomers = transactionAnalysisMapper.countNewCustomers(params);
+ int newCustomers = 0;
+ if (client.getIntValue("client_id")==0){
+ newCustomers = transactionAnalysisMapper.getCountCustomers(params.getDate("end")) - transactionAnalysisMapper.getCountCustomers(params.getDate("begin"));
+ }else {
+ newCustomers = transactionAnalysisMapper.countNewCustomers(params);
+ }
int oldCustomers = transactionAnalysisMapper.countOldCustomers(params);
record.put("new_customers",newCustomers);
record.put("old_customers",oldCustomers);
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
index 7b959d673..3e83dc242 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
@@ -69,4 +69,6 @@ public interface TransactionAnalysisMapper {
BigDecimal getOneOrder(@Param("order_id") String order_id);
+ int getCountCustomers(@Param("date") Date date);
+
}
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..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
@@ -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,20 +24,21 @@ 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);
}
- @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/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index 3469b71ad..4a3f597ef 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -389,6 +389,12 @@
]]>
+