From 997c0ef65b474b535e7473e3acc14b9136fb0d0b Mon Sep 17 00:00:00 2001
From: "lisai17@sina.com" <lisai17@sina.com>
Date: Fri, 30 Apr 2021 11:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=9F=E8=AE=A1=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cowr/service/ssjygl/jobs/StatSmsJob.java  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java
index 4a32144..4e86266 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/StatSmsJob.java
@@ -7,7 +7,6 @@ import com.cowr.model.PrepayCustomer;
 import com.cowr.service.ssjygl.main.Config;
 import com.cowr.service.ssjygl.main.SvrCacheData;
 import com.cowr.service.ssjygl.sms.log.SmsService;
-import com.cowr.sms.AliyunSmsService;
 import com.jfinal.kit.StrKit;
 import com.jfinal.log.Log;
 import com.jfinal.plugin.activerecord.Db;
@@ -202,6 +201,7 @@ public class StatSmsJob implements Job {
         c.add(Calendar.DAY_OF_MONTH, -1);
 
         String predaytm   = DateTimeUtil.sdf.get().format(c.getTime()); // 前一日
+        String daytm      = DateTimeUtil.sdf.get().format(now); // 当日
         String sendtmtext = DateTimeUtil.sdfymd.get().format(c.getTime());
         String year_start = DateTimeUtil.year_start.get().format(now);
 
@@ -211,6 +211,7 @@ public class StatSmsJob implements Job {
         String ordersql = "select count(t.sn) aggr_cnt, ifnull(sum(t.weight), 0) aggr_weight, ifnull(sum(t.total_price), 0) aggr_price  \n" +
                 " from order_temp t \n" +
                 " where t.create_time >= ? \n" +
+                " and t.create_time < ? \n" +
                 " and t.state = 5";
         String cusmersql = "select ifnull(sum(t.surplus), 0) customer_total_surplus from prepay_customer t";
         String daysql = "select count(t.sn) total_cnt, ifnull(sum(t.weight), 0) total_weight, ifnull(sum(t.total_price), 0) total_price from order_temp t\n" +
@@ -218,16 +219,17 @@ public class StatSmsJob implements Job {
                 " and t.create_time like '" + predaytm + "%'";
 
         String revenuesql = "select ifnull(sum(t.weight), 0) weight, ifnull(sum(total_price), 0) total_price from order_temp t\n" +
-                "where t.state = 5\n" +
-                "and (t.customer_id = 17\n" +
-                "or t.customer_id = 24\n" +
-                "or t.customer_id = 60\n" +
-                "or t.customer_id = 61)\n" +
-                "and t.create_time >= ? ";
+                " where t.state = 5\n" +
+                " and (t.customer_id = 17\n" +
+                " or t.customer_id = 24\n" +
+                " or t.customer_id = 60\n" +
+                " or t.customer_id = 61)\n" +
+                " and t.create_time >= ? \n" +
+                " and t.create_time < ?";
 
         JSONObject obj         = new JSONObject();
-        Record     orderobj    = Db.findFirst(ordersql, year_start);
-        Record     revenueobj  = Db.findFirst(revenuesql, year_start);
+        Record     orderobj    = Db.findFirst(ordersql, year_start, daytm);
+        Record     revenueobj  = Db.findFirst(revenuesql, year_start, daytm);
         Record     allorderobj = Db.findFirst(allordersql);
         Record     customerobj = Db.findFirst(cusmersql);
         Record     dayobj      = Db.findFirst(daysql);