From 7703252729894cb887be3a90e1588a3c253ff584 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Wed, 3 Mar 2021 09:01:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cowr/common/Const.java | 4 ++-- .../ssjygl/jobs/CheckUndonOrderclusterJob.java | 2 +- .../com/cowr/service/ssjygl/jobs/StatSmsJob.java | 14 +++++++++++++- .../java/com/cowr/service/ssjygl/main/Config.java | 3 +++ .../ordercluster/OrderclusterSyncService.java | 6 +++++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/Const.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/Const.java index ce02eb6..b9a7deb 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/Const.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/Const.java @@ -21,7 +21,7 @@ public class Const { public static final long SUP_OFFLINE_TIME = 5 * 60 * 1000L; // 砂站离线时间限制，单位 毫秒 public static final String TEMP_CODE_AGGR_STAT = "SMS_205434464"; // 累计销售汇总 - public static final String TEMP_CODE_AGGR_STAT_2 = "SMS_212280668"; // 累计销售汇总-实际营收 + public static final String TEMP_CODE_AGGR_STAT_2 = "SMS_212486582"; // 累计销售汇总-实际营收 public static final String TEMP_CODE_DAY_STAT = "SMS_205430436"; // 日销售汇总 public static final String TEMP_CODE_CUSTOMER_DAY_STAT = "SMS_208985081"; // 客户日销售汇总 public static final String TEMP_CODE_PEIE = "SMS_203673037"; // 配额分配通知 @@ -39,7 +39,7 @@ public class Const { SMS_TEMP_MAP.put(TEMP_CODE_DEPOSIT_SUCCESS, "${time}${customer_name}在${vendor}的预存${amount}元，合计余额${surplus}元。"); SMS_TEMP_MAP.put(TEMP_CODE_DEPOSIT_FAIL, "${time}${customer_name}在${vendor}预存的${amount}元审核未通过，若有疑问请及时联系结算中心。"); SMS_TEMP_MAP.put(TEMP_CODE_AGGR_STAT, "截至${time1}累计销售黄砂${aggr_weight}吨，共计${aggr_price}元，运输${aggr_cnt}辆次。账户累计${aggr_total_price}元，其中预付费客户总余额${customer_total_surplus}元。${time2}当日销售黄砂${total_weight}吨，共计${total_price}元，运输${total_cnt}辆次。"); - SMS_TEMP_MAP.put(TEMP_CODE_AGGR_STAT_2, "截至${time1}累计销售黄砂${aggr_weight}吨，共计${aggr_price}元，运输${aggr_cnt}辆次；其中2020年充值客户运输${customer_weight}吨，共${customer_price}元，实际营收${revenue}元。账户累计${aggr_total_price}元，其中预付费客户总余额${customer_total_surplus}元。${time2}当日销售黄砂${total_weight}吨，共计${total_price}元，运输${total_cnt}辆次。"); + SMS_TEMP_MAP.put(TEMP_CODE_AGGR_STAT_2, "截至${time1}累计销售黄砂${aggr_weight}吨，共计${aggr_price}元，运输${aggr_cnt}辆次；其中2020年充值客户销售${customer_weight}吨，共${customer_price}元，2021年新增客户销售${revenue_weight}吨，共${revenue}元。账户累计${aggr_total_price}元，其中预付费客户总余额${customer_total_surplus}元。${time2}当日销售黄砂${total_weight}吨，共计${total_price}元，运输${total_cnt}辆次。"); SMS_TEMP_MAP.put(TEMP_CODE_SURPLUS_WARN, "截至${time}${customer_name}在${vendor}的预存账户余额为${surplus}元。请及时关注。"); SMS_TEMP_MAP.put(TEMP_CODE_REFUND_SUCCESS, "${time}${customer_name}在${vendor}的退款${amount}元，合计余额${surplus}元。"); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java index 9f2d9df..0681309 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/jobs/CheckUndonOrderclusterJob.java @@ -130,7 +130,7 @@ public class CheckUndonOrderclusterJob implements Job { Result ret; if (ordercluster.getCustomerId() != null) { - ret = OrderclusterSyncService.me.forwardCluster(ordercluster_id, surplus_weight, cutoff_time, user); + ret = OrderclusterSyncService.me.forwardCluster(ordercluster_id, surplus_weight, cutoff_time, user, true); } else { String trucks = Db.queryStr("select group_concat(t.truck_license) trucks from ordercluster_truck t\n" + " where t.ordercluster_id = ?\n" + 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 eabb171..c08413f 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,6 +7,7 @@ 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; @@ -264,6 +265,7 @@ public class StatSmsJob implements Job { obj.put("customer_weight", String.format("%.2f万", revenueobj.getBigDecimal("weight").divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_HALF_UP))); obj.put("customer_price", String.format("%.2f万", revenueobj.getBigDecimal("total_price").divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_HALF_UP))); obj.put("revenue", String.format("%.2f万", orderobj.getBigDecimal("aggr_price").subtract(revenueobj.getBigDecimal("total_price")).divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_HALF_UP))); + obj.put("revenue_weight", String.format("%.2f万", orderobj.getBigDecimal("aggr_weight").subtract(revenueobj.getBigDecimal("weight")).divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_HALF_UP))); obj.put("customer_total_surplus", String.format("%.2f万", customerobj.getBigDecimal("customer_total_surplus").divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_HALF_UP))); obj.put("aggr_total_price", String.format("%.2f万", allorderobj.getBigDecimal("aggr_price").add(customerobj.getBigDecimal("customer_total_surplus")).divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_HALF_UP))); @@ -273,7 +275,17 @@ public class StatSmsJob implements Job { obj.put("total_weight", String.format("%.2f", dayobj.getBigDecimal("total_weight"))); obj.put("total_price", String.format("%.2f", dayobj.getBigDecimal("total_price"))); - SmsService.me.sendStatAggr(obj); +// SmsService.me.sendStatAggr(obj); + try { + AliyunSmsService aliyunsms = new AliyunSmsService(); + String content = aliyunsms.generator(Const.SMS_TEMP_MAP.get("SMS_212486582"), obj); + log.debug(content); + String response = aliyunsms.send("13627293906", "SMS_212486582", obj); + log.debug(content); + log.debug(response); + } catch (Exception e) { + log.error(e.getMessage(), e); + } } @Override diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java index 0df6363..b6e689e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java @@ -16,6 +16,7 @@ import com.cowr.service.ssjygl.driver.DriverController; import com.cowr.service.ssjygl.invoice.invalidverify.InvoiceInvalidVerifyController; import com.cowr.service.ssjygl.invoice.log.InvoiceLogController; import com.cowr.service.ssjygl.invoice.receive.InvoiceReceiveController; +import com.cowr.service.ssjygl.jobs.StatSmsJob; import com.cowr.service.ssjygl.netty.NettyServer; import com.cowr.service.ssjygl.order.invalidverify.OrderInvalidVerifyController; import com.cowr.service.ssjygl.order.ordercluster.OrderclusterController; @@ -297,6 +298,8 @@ public class Config extends JFinalConfig { } SyncTaskService.me.start(); + + new StatSmsJob().statAggr(); } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index 59d36fa..7821e8e 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -930,6 +930,10 @@ public class OrderclusterSyncService extends BaseSyncService { * @return */ public Result forwardCluster(int ordercluster_id, BigDecimal total_weight, Date cutoff_time, Sysuser sysuser) { + return forwardCluster(ordercluster_id, total_weight, cutoff_time, sysuser, false); + } + + public Result forwardCluster(int ordercluster_id, BigDecimal total_weight, Date cutoff_time, Sysuser sysuser, boolean isAuto) { Ordercluster oldobj = Ordercluster.dao.findById(ordercluster_id); if (oldobj == null) { @@ -1117,7 +1121,7 @@ public class OrderclusterSyncService extends BaseSyncService { if (ret) { SyncTaskService.me.send(synctask); - if (forwardoldobj[0] != null) { + if (forwardoldobj[0] != null && !isAuto) { SmsService.me.sendPeiE(forwardoldobj[0]); } } From a00ef0189f1d4eba52b08824c98aefa373642b06 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Wed, 3 Mar 2021 09:10:00 +0800 Subject: [PATCH 2/2] . --- .../cowr/service/ssjygl/jobs/StatSmsJob.java | 22 +++++++++---------- .../com/cowr/service/ssjygl/main/Config.java | 21 ++++++++---------- 2 files changed, 20 insertions(+), 23 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 c08413f..4a32144 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 @@ -275,17 +275,17 @@ public class StatSmsJob implements Job { obj.put("total_weight", String.format("%.2f", dayobj.getBigDecimal("total_weight"))); obj.put("total_price", String.format("%.2f", dayobj.getBigDecimal("total_price"))); -// SmsService.me.sendStatAggr(obj); - try { - AliyunSmsService aliyunsms = new AliyunSmsService(); - String content = aliyunsms.generator(Const.SMS_TEMP_MAP.get("SMS_212486582"), obj); - log.debug(content); - String response = aliyunsms.send("13627293906", "SMS_212486582", obj); - log.debug(content); - log.debug(response); - } catch (Exception e) { - log.error(e.getMessage(), e); - } + SmsService.me.sendStatAggr(obj); +// try { +// AliyunSmsService aliyunsms = new AliyunSmsService(); +// String content = aliyunsms.generator(Const.SMS_TEMP_MAP.get("SMS_212486582"), obj); +// log.debug(content); +// String response = aliyunsms.send("13627293906", "SMS_212486582", obj); +// log.debug(content); +// log.debug(response); +// } catch (Exception e) { +// log.error(e.getMessage(), e); +// } } @Override diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java index b6e689e..392e77f 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java @@ -2,8 +2,14 @@ package com.cowr.service.ssjygl.main; import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.wall.WallFilter; +import com.cowr.common.Const; +import com.cowr.common.Interceptor.ReporterInterceptor; import com.cowr.common.ctrl.HomeController; +import com.cowr.common.handler.GlobalHandler; import com.cowr.common.oss.OSSKit; +import com.cowr.common.plugin.QuartzPlugin; +import com.cowr.common.view.JsonRenderFactory; +import com.cowr.model._MappingKit; import com.cowr.service.ssjygl.blacklist.BlacklistController; import com.cowr.service.ssjygl.cache.CacheController; import com.cowr.service.ssjygl.customer.CustomerController; @@ -16,7 +22,6 @@ import com.cowr.service.ssjygl.driver.DriverController; import com.cowr.service.ssjygl.invoice.invalidverify.InvoiceInvalidVerifyController; import com.cowr.service.ssjygl.invoice.log.InvoiceLogController; import com.cowr.service.ssjygl.invoice.receive.InvoiceReceiveController; -import com.cowr.service.ssjygl.jobs.StatSmsJob; import com.cowr.service.ssjygl.netty.NettyServer; import com.cowr.service.ssjygl.order.invalidverify.OrderInvalidVerifyController; import com.cowr.service.ssjygl.order.ordercluster.OrderclusterController; @@ -26,6 +31,8 @@ import com.cowr.service.ssjygl.order.ordersale.OrderSaleController; import com.cowr.service.ssjygl.order.ordertemp.OrderTempController; import com.cowr.service.ssjygl.order.ordertransfer.OrderTransferController; import com.cowr.service.ssjygl.order.ordertrash.OrderTrashController; +import com.cowr.service.ssjygl.overall.OverallController; +import com.cowr.service.ssjygl.prepay.PrepayController; import com.cowr.service.ssjygl.prepay.prepaydetail.PrepayDetailController; import com.cowr.service.ssjygl.prepay.prepaytruck.PrepayTruckController; import com.cowr.service.ssjygl.prepay.refunddetail.RefundDetailController; @@ -35,6 +42,7 @@ import com.cowr.service.ssjygl.sandfarm.SandfarmController; import com.cowr.service.ssjygl.sms.log.SmsLogController; import com.cowr.service.ssjygl.sms.noticecontact.SmsNoticeContactController; import com.cowr.service.ssjygl.stat.customer.CustomerStatController; +import com.cowr.service.ssjygl.stat.sale.OrderStatController; import com.cowr.service.ssjygl.supermarket.SupermarketController; import com.cowr.service.ssjygl.supermarket.SupermarketSyncService; import com.cowr.service.ssjygl.supermarket.customerdistance.SupermarketCustomerDistanceController; @@ -47,16 +55,11 @@ import com.cowr.service.ssjygl.transport.TransportQueryController; import com.cowr.service.ssjygl.transportcompany.TransportCompanyController; import com.cowr.service.ssjygl.truck.TruckController; import com.cowr.ssjygl.CacheData; -import com.cowr.common.Const; -import com.cowr.common.plugin.QuartzPlugin; import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController; import com.cowr.ssjygl.cctv.CctvController; -import com.cowr.service.ssjygl.prepay.PrepayController; -import com.cowr.service.ssjygl.overall.OverallController; import com.cowr.ssjygl.modifylog.ModifyLogController; import com.cowr.ssjygl.stat.invoice.InvoiceUseController; import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController; -import com.cowr.service.ssjygl.stat.sale.OrderStatController; import com.cowr.ssjygl.stat.transfer.OrderTransferStatController; import com.cowr.ssjygl.transportcompany.TransportCompanyService; import com.cowr.ssjygl.transprice.TransPriceService; @@ -74,10 +77,6 @@ import com.jfinal.plugin.druid.DruidPlugin; import com.jfinal.plugin.druid.DruidStatViewHandler; import com.jfinal.plugin.redis.RedisPlugin; import com.jfinal.template.Engine; -import com.cowr.common.Interceptor.ReporterInterceptor; -import com.cowr.common.handler.GlobalHandler; -import com.cowr.common.view.JsonRenderFactory; -import com.cowr.model._MappingKit; import java.sql.Connection; @@ -298,8 +297,6 @@ public class Config extends JFinalConfig { } SyncTaskService.me.start(); - - new StatSmsJob().statAggr(); } catch (Exception e) { log.error(e.getMessage(), e); }