Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@@ -333,8 +333,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
 
 
         }else{
-            log.error(String.format("未检测到该用户下有效的积分规则，消息体->【%s】", JSON.toJSON(event)));
-            throw new RenException("未检测到该用户下有效的积分规则");
+            log.warn(String.format("未检测到该用户下有效的积分规则，消息体->【%s】", JSON.toJSON(event)));
         }
 
 

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java

@@ -68,6 +68,15 @@ public interface CustomerDao extends BaseDao<CustomerEntity> {
 	 **/
     List<CustomerResultDTO> selectCustomerList(@Param("customerName") String customerName);
 
+	/**
+	 * @return int
+	 * @param customerName
+	 * @author yinzuomei
+	 * @description 查询有效客户数据(不区分是否在有效期内)【按名称模糊查询】  - 总记录数
+	 * @Date 2020/8/5 11:02
+	 **/
+	int selectCountByCustomerName(@Param("customerName") String customerName);
+
 	/**
 	 * desc：获取未删除的所有用户
 	 * @return

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -403,7 +403,8 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
         List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
         //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
-        PageData resultDTO = new PageData(list,list.size());
+        int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
+        PageData resultDTO = new PageData(list,total);
         return resultDTO;
     }
 

epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@@ -70,6 +70,19 @@
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
     </select>
+
+    <select id="selectCountByCustomerName" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+        count(id) as total
+        FROM
+        customer
+        WHERE
+        del_flag = '0'
+        <if test='customerName != "" and customerName != null'>
+            AND customer_name LIKE concat('%', trim(#{customerName}), '%')
+        </if>
+    </select>
+
     <select id="getAllList" resultMap="customerMap">
         SELECT
             *