Merge branch 'CustomerImpression' into develop

src/main/java/au/com/royalpay/payment/manage/apps/core/CustomerImpressionService.java

@@ -13,7 +13,10 @@ public interface CustomerImpressionService {
 
     JSONObject findOne(int client_id,String customer_id);
 
+    void generateTag(int client_id);
     void generate(int client_id);
 
+    void generateInfo();
+
     void modifyNameRemark(int client_id, String customer_id,String name_remark);
 }

src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionServiceImpl.java

@@ -10,6 +10,10 @@ import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.BoundListOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -28,6 +32,8 @@ import au.com.royalpay.payment.manage.mappers.system.CustomerMapper;
 import au.com.royalpay.payment.manage.mappers.system.CustomerRelationAlipayMapper;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.NotFoundException;
+import au.com.royalpay.payment.tools.lock.Locker;
+import au.com.royalpay.payment.tools.lock.LockerRedisImpl;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
 
 /**
@@ -45,6 +51,13 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
     private CustomerRelationAlipayMapper customerRelationAlipayMapper;
     @Resource
     private CustomerMapper customerMapper;
+    @Resource
+    private Locker locker;
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    private static String CUSTOMER_IMPRESSION_PREFIX = "Customer_impression_insert";
+    Logger logger = LoggerFactory.getLogger(CustomerImpressionServiceImpl.class);
 
     @Override
     public JSONObject listPageble(CustomerImpressionQuery customerImpressionQuery) {
@@ -92,8 +105,12 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
     }
 
     @Override
-    @Transactional
     public void generate(int client_id) {
+        Date now = new Date();
+        DateTime dt = new DateTime(2018, 1, 20, 0, 0);
+        if (now.compareTo(dt.toDate()) > 0) {
+            return;
+        }
         JSONObject params = new JSONObject();
         params.put("client_id", client_id);
         params.put("include_success_status", 3);
@@ -102,18 +119,20 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
             params.put("confirm_time", lastRecord.get(0).getDate("update_time"));
         }
         List<JSONObject> orders = orderMapper.listAnalysisClientCustomer(params);
-        Date now = new Date();
         for (JSONObject order : orders) {
             if (StringUtils.isEmpty(order.getString("channel"))) {
                 continue;
             }
-            JSONObject userInfo = customerMapper.findCustomerByOpenId(order.getString("customer_id"));
+            String customer_id = order.getString("customer_id");
+            JSONObject userInfo = customerMapper.findCustomerByOpenId(customer_id);
             if (userInfo == null) {
-                userInfo = customerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
+                userInfo = customerRelationAlipayMapper.findCustomerByUserId(customer_id);
             }
 
-            JSONObject clientCustomerInfo = clientCustomersMapper.getClientCustomerWithNull(client_id, order.getString("customer_id"));
+            JSONObject clientCustomerInfo = clientCustomersMapper.getClientCustomerWithNull(client_id, customer_id);
             if (clientCustomerInfo == null) {
+                locker.lock(CUSTOMER_IMPRESSION_PREFIX+customer_id, 30_000, 30_000);
+                try {
                     JSONObject client_customer = new JSONObject();
                     client_customer.put("client_id", order.getIntValue("client_id"));
                     client_customer.put("customer_id", order.getString("customer_id"));
@@ -128,32 +147,31 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
                     client_customer.put("update_time", now);
                     client_customer.put("last_payment_time", order.getDate("confirm_time"));
                     clientCustomersMapper.insert(client_customer);
+                } finally {
+                    locker.unlock(customer_id);
+                }
             } else {
                 clientCustomerInfo.put("payment_times", clientCustomerInfo.getIntValue("payment_times") + order.getIntValue("payment_times"));
-                BigDecimal total_amount = clientCustomerInfo.getBigDecimal("total_amount");
+                clientCustomerInfo.put("payment_times", order.getIntValue("payment_times"));
-                if (total_amount != null) {
+                clientCustomerInfo.put("client_id", order.getIntValue("client_id"));
-                    clientCustomerInfo.put("total_amount", clientCustomerInfo.getBigDecimal("total_amount").add(order.getBigDecimal("total_amount")));
+                clientCustomerInfo.put("customer_id", order.getString("customer_id"));
-                } else {
                 clientCustomerInfo.put("total_amount", order.getBigDecimal("total_amount"));
-                }
                 if (userInfo != null) {
                     clientCustomerInfo.put("headimg", userInfo.getString("headimg"));
                     clientCustomerInfo.put("nick_name", userInfo.getString("nickname"));
                 }
-                clientCustomerInfo.put("channel", order.getString("channel"));
-                clientCustomerInfo.put("tag", "不活跃用户");
-                clientCustomerInfo.put("update_time", now);
                 clientCustomerInfo.put("last_payment_time", order.getDate("confirm_time"));
-                clientCustomersMapper.update(clientCustomerInfo);
+                clientCustomersMapper.updateAfterPaymentFinish(clientCustomerInfo);
             }
         }
-        generateTag(client_id);
     }
 
-    private void generateTag(int client_id) {
+    @Override
+    @Transactional
+    public void generateTag(int client_id) {
         JSONObject params = new JSONObject();
         DateTime dt = new DateTime();
-        dt = dt.minusMonths(5);
+        dt = dt.minusMonths(1);
         params.put("confirm_time", dt.toDate());
         params.put("client_id", client_id);
         List<JSONObject> orders = orderMapper.listAnalysisClientCustomer(params);
@@ -176,6 +194,67 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
 
     }
 
+    @Override
+    public void generateInfo() {
+        Date now = new Date();
+        DateTime dt = new DateTime(2018, 1, 19, 3, 0);
+        if (dt.toDate().compareTo(now) > 0) {
+            return;
+        }
+        BoundListOperations<String, String> ops = stringRedisTemplate.boundListOps("customer_impression");
+        String redisValue = ops.leftPop();
+
+        while (!StringUtils.isEmpty(redisValue)) {
+            try {
+                JSONObject order = JSONObject.parseObject(redisValue);
+                redisValue = ops.leftPop();
+                if (StringUtils.isEmpty(order.getString("channel"))) {
+                    continue;
+                }
+                String customer_id = order.getString("customer_id");
+                JSONObject userInfo = customerMapper.findCustomerByOpenId(customer_id);
+                if (userInfo == null) {
+                    userInfo = customerRelationAlipayMapper.findCustomerByUserId(customer_id);
+                }
+                JSONObject clientCustomerInfo = clientCustomersMapper.getClientCustomerWithNull(order.getIntValue("client_id"), customer_id);
+                if (clientCustomerInfo == null) {
+                    locker.lock(CUSTOMER_IMPRESSION_PREFIX+customer_id, 30_000, 30_000);
+                    try {
+                        JSONObject client_customer = new JSONObject();
+                        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 (userInfo != null) {
+                            client_customer.put("headimg", userInfo.getString("headimg"));
+                            client_customer.put("nick_name", userInfo.getString("nickname"));
+                        }
+                        client_customer.put("payment_times", 1);
+                        client_customer.put("update_time", now);
+                        client_customer.put("total_amount", order.getBigDecimal("total_amount"));
+                        client_customer.put("last_payment_time", order.getDate("confirm_time"));
+                        clientCustomersMapper.insert(client_customer);
+                    } finally {
+                        locker.unlock(customer_id);
+                    }
+                } else {
+                    clientCustomerInfo.put("payment_times", 1);
+                    clientCustomerInfo.put("client_id", order.getIntValue("client_id"));
+                    clientCustomerInfo.put("customer_id", order.getString("customer_id"));
+                    clientCustomerInfo.put("total_amount", order.getBigDecimal("total_amount"));
+                    if (userInfo != null) {
+                        clientCustomerInfo.put("headimg", userInfo.getString("headimg"));
+                        clientCustomerInfo.put("nick_name", userInfo.getString("nickname"));
+                    }
+                    clientCustomerInfo.put("last_payment_time", order.getDate("confirm_time"));
+                    clientCustomersMapper.updateAfterPaymentFinish(clientCustomerInfo);
+                }
+            } catch (Exception e) {
+                logger.debug("Reduce Customer Impression Error Redis Value =" + redisValue, e);
+            }
+        }
+    }
+
     @Override
     public void modifyNameRemark(int client_id, String customer_id, String name_remark) {
         JSONObject clientCustomerInfo = clientCustomersMapper.getClientCustomer(client_id, customer_id);
@@ -185,5 +264,4 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
         clientCustomerInfo.put("name_remak", name_remark);
         clientCustomersMapper.update(clientCustomerInfo);
     }
-
 }

src/main/java/au/com/royalpay/payment/manage/apps/events/listeners/AfterPaymentFinishListener.java

@@ -0,0 +1,28 @@
+package au.com.royalpay.payment.manage.apps.events.listeners;
+
+import au.com.royalpay.payment.core.events.AfterPaymentFinishEvent;
+
+import com.alibaba.fastjson.JSONObject;
+
+import org.springframework.context.ApplicationListener;
+import org.springframework.data.redis.core.BoundListOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by wangning on 17/01/2018.
+ */
+@Service
+public class AfterPaymentFinishListener implements ApplicationListener<AfterPaymentFinishEvent> {
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Override
+    public void onApplicationEvent(AfterPaymentFinishEvent event) {
+        JSONObject order = event.getFinishedEvent().getOrder();
+        BoundListOperations<String, String> ops = stringRedisTemplate.boundListOps("customer_impression");
+            ops.rightPush(order.toJSONString());
+    }
+}

src/main/java/au/com/royalpay/payment/manage/apps/events/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Created by wangning on 17/01/2018.
+ */
+package au.com.royalpay.payment.manage.apps.events;

src/main/java/au/com/royalpay/payment/manage/apps/web/CustomerImpressionController.java

@@ -41,10 +41,4 @@ public class CustomerImpressionController {
             @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
         customerImpressionService.modifyNameRemark(app.getIntValue("client_id"), customer_id, customerInfo.getString("name_remark"));
     }
-
-    @RequestMapping(value = "/gengrate", method = RequestMethod.PUT)
-    @ResponseBody
-    public void generate(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
-        customerImpressionService.generate(app.getIntValue("client_id"));
-    }
 }

src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.java

@@ -26,6 +26,8 @@ public interface ClientCustomersMapper {
     @AutoSql(type = SqlType.UPDATE)
     public void update(JSONObject obj);
 
+    public void updateAfterPaymentFinish(JSONObject obj);
+
     PageList<JSONObject> listCustomerInfo(JSONObject params, PageBounds pageBounds);
 
 }

src/main/java/au/com/royalpay/payment/manage/task/CustomerImpressionTask.java

@@ -30,6 +30,27 @@ public class CustomerImpressionTask {
 
     private ThreadPoolExecutor generatePool = new ThreadPoolExecutor(10, 30, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
+    @Scheduled(cron = "0 0 3 * * ?")
+    public void generateTags() {
+        List<JSONObject> clients = clientMapper.listValidClient();
+        List<List<JSONObject>> splitList = new ArrayList<>();
+        for (int i = 0; i < clients.size(); i+=200) {
+            if(i+200>clients.size()){
+                splitList.add(clients.subList(i,clients.size()));
+            }else {
+                splitList.add(clients.subList(i,i+200));
+            }
+
+        }
+        for (List<JSONObject> splitClients : splitList) {
+            Runnable task = () -> splitClients.forEach((p)->{
+                System.out.println("当前执行到"+p.getIntValue("client_id"));
+                customerImpressionService.generateTag(p.getIntValue("client_id"));
+            });
+            generatePool.execute(task);
+        }
+    }
+
     @Scheduled(cron = "0 0 3 * * ?")
     public void generate() {
         List<JSONObject> clients = clientMapper.listValidClient();
@@ -50,4 +71,9 @@ public class CustomerImpressionTask {
             generatePool.execute(task);
         }
     }
+
+    @Scheduled(cron = "0/1 * * * * ?")
+    public void generateInfo() {
+        customerImpressionService.generateInfo();
+    }
 }

src/main/resources/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.xml

@@ -31,4 +31,16 @@
            and customer_id = #{customer_id}
 
     </select>
+
+    <update id="updateAfterPaymentFinish">
+        update sys_clients_customers
+        set total_amount  = total_amount + #{total_amount},
+            payment_times = payment_times + #{payment_times},
+            last_payment_time = #{last_payment_time},
+            nick_name = #{nick_name},
+            headimg = #{headimg}
+            where client_id= #{client_id}
+            and customer_id = #{customer_id}
+
+    </update>
 </mapper>

src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java

@@ -1,68 +1,39 @@
 package au.com.royalpay.payment.manage.apps.core.impls;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Resource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.redis.core.BoundListOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.alibaba.fastjson.JSONObject;
 
-import au.com.royalpay.payment.manage.apps.core.CustomerImpressionService;
+import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 
 /**
  * Created by wangning on 05/01/2018.
  */
 @SpringBootTest
-@ActiveProfiles({"production","alipay","wechat","jd","bestpay"})
+@ActiveProfiles({ "local", "alipay", "wechat", "jd", "bestpay" })
 @RunWith(SpringRunner.class)
 public class CustomerImpressionImplTest {
     @Resource
-    private CustomerImpressionService customerImpression;
+    private OrderMapper orderMapper;
-    @Resource
-    private ClientMapper clientMapper;
-
-    private ThreadPoolExecutor generatePool = new ThreadPoolExecutor(10, 30, 5, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
-    @Test
+    @Resource
-    public void generate() throws Exception {
+    private StringRedisTemplate stringRedisTemplate;
-        customerImpression.generate(9);
-    }
 
     @Test
-    public void generateAll(){
+    public void redisQueue() {
-        List<JSONObject> clients = clientMapper.listValidClient();
+        BoundListOperations<String, String> ops = stringRedisTemplate.boundListOps("customer_impression");
-        List<List<JSONObject>> splitList = new ArrayList<>();
+        JSONObject order = orderMapper.find("00009201711300930013961422");
-        for (int i = 0; i < clients.size(); i+=200) {
+        for (int i = 0; i < 10000; i++) {
-            if(i+200>clients.size()){
+            ops.rightPush(order.toJSONString());
-                splitList.add(clients.subList(i,clients.size()));
-            }else {
-                splitList.add(clients.subList(i,i+200));
-            }
 
         }
-        for (List<JSONObject> splitClients : splitList) {
-            Runnable task = () -> splitClients.forEach((p)->{
-                System.out.println("当前执行到"+p.getIntValue("client_id"));
-                customerImpression.generate(p.getIntValue("client_id"));
-            });
-            generatePool.execute(task);
-        }
-        generatePool.shutdown();
-        try {
-            generatePool.awaitTermination(5, TimeUnit.HOURS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
     }
-    }
-
 }