保有客保持率抽取bug修复

张志伟
1 parent 766f1865
Showing 2 changed files with 19 additions and 5 deletions
fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomerRetentionRatioBizService.java
@@ -304,6 +304,20 @@ public final class DateUtil {
     }
  
     /**
+     * 获取时间字符串
+     *
+     * @param date 需要转换格式的日期
+     * @return 返回短时间字符串格式 yyyy-MM-dd HH:mm:ss
+     */
+    public static String getMonthString(Date date) {
+        if (date == null) {
+            return "";
+        }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
+        return format.format(date);
+    }
+
+    /**
      * 获取下月月初时间
      */
     public static Date getNextMonthStartTime() {
@@ -74,12 +74,12 @@ public class CustomerRetentionRatioBizService {
  
     private void extractingPerson(ShopInfo shop, Date nowDate) {
         Timestamp preMonthDay = DateUtil.getExpiredMonth(nowDate, -1);
-        String dateString = DateUtil.getFullDateString(preMonthDay);
         List<StammkundePool> pools = Optional.ofNullable(stammkundePoolService.list(Wrappers.<StammkundePool>query()
-                .select("DISTINCT adviser_id", "adviser_name")
-                .eq("pool_status", 1)
-                .eq("DATE_FORMAT(activation_time, '%Y-%m')", "DATE_FORMAT('" + dateString + "', '%Y-%m')")
-                .eq("shop_id", shop.getId()))
+                        .select("DISTINCT adviser_id", "adviser_name")
+                        .eq("pool_status", 1)
+                        .eq("shop_id", shop.getId())
+                        .apply("DATE_FORMAT(activation_time, '%Y-%m') = {0}", DateUtil.getMonthString(preMonthDay))
+                )
         ).orElse(new ArrayList<>());
         List<PostUserDTO> userDTOS = Optional.ofNullable(userService.getUserByRole(shop.getId(), RoleCode.FWGW)).orElse(new ArrayList<>());
         Set<UserInfo> set = new HashSet<>();