From c60ee5b71f5f52679f4548a56fa2e1ead53982fa Mon Sep 17 00:00:00 2001
From: wangweijia <495720349@qq.com>
Date: Mon, 13 Apr 2020 10:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E7=94=A8=E6=88=B7-=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/kiisoo/ic/customer/CustomerService.java    | 4 ++++
 src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
index f4f92b2..34cc353 100644
--- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java
+++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java
@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -155,11 +156,14 @@ public class CustomerService {
         PageHelper.startPage(pageNum,pageSize);
         List<OpCustomerDTO> customers = opCustomerDOMapper.selectCustomerInfoByShopIds(shopIds, startDate, endDate);
 
+        AtomicInteger number = new AtomicInteger(1 + ((pageNum-1) * pageSize));
         //求分页总数
         Page<OpCustomerDTO> pageList = (Page<OpCustomerDTO>)customers;
         Long totalSize = pageList.getTotal();
         for (OpCustomerDTO m : customers ) {
             m.setTotalSize(totalSize);
+            m.setNumber(number.get());
+            number.incrementAndGet();
         }
         return customers;
     }
diff --git a/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java b/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java
index 0bc03ae..6c748a9 100644
--- a/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java
+++ b/src/main/java/com/kiisoo/ic/customer/bean/OpCustomerDTO.java
@@ -32,6 +32,9 @@ public class OpCustomerDTO {
      */
     private long totalSize;
 
+    /**序号*/
+    private int number;
+
     /**消费次数*/
     private Integer salesNum;