From c7ef23a41cc5f81ebae95b5f6e8dca2294d71e1f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 20 八月 2021 13:49:41 +0800
Subject: [PATCH] 修改邮件发送

---
 src/main/java/com/nanometer/smartlab/email/EmailSendSchedule.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/email/EmailSendSchedule.java b/src/main/java/com/nanometer/smartlab/email/EmailSendSchedule.java
index 387622c..5bbf6b0 100644
--- a/src/main/java/com/nanometer/smartlab/email/EmailSendSchedule.java
+++ b/src/main/java/com/nanometer/smartlab/email/EmailSendSchedule.java
@@ -138,7 +138,7 @@
             content.append("</body></html>");
 
             try {
-                EmailSend.sendArrivalEmail(revicerList,content.toString());
+                EmailSend.sendArrivalEmail(revicerList,content.toString(),"-待补货试剂");
                 //  发送成功,更新邮件发送状态为:已发送
             } catch (BusinessException e) {
                 //  发送失败,更新邮件发送状态为:发送失败
@@ -165,6 +165,7 @@
     * @date 2021/8/19 9:06
     */
     @Scheduled(cron = "0 0 2 * * ?")
+//    @Scheduled(cron = "0/5 * * * * ?") //每隔5秒执行一次
     public void ReagentPriceSend(){
         //0.限制在姑苏实验室
         if (StringUtils.isBlank(reagentApi) || reagentApi.length() == 0) return;
@@ -204,8 +205,8 @@
                 BigDecimal goodsCostPrice = goodJson.getBigDecimal("goodsCostPrice");
                 BigDecimal price = reagent.getPrice();
                 //保留两位
-                BigDecimal price_afterDiscount = SALE_85.multiply(price).setScale(2, RoundingMode.HALF_UP);
-                if (price_afterDiscount.compareTo(goodsCostPrice) != 0) {
+                BigDecimal price_afterDiscount = SALE_85.multiply(goodsCostPrice).setScale(2, RoundingMode.HALF_UP);
+                if (price_afterDiscount.compareTo(price) > 0) {
                     sendDataList.add(new JSONObject() {{
                         put("goodsName", goodsName);
                         put("goodsCostPrice", goodsCostPrice);
@@ -241,7 +242,7 @@
 
 
                 //发送邮件
-                EmailSend.sendArrivalEmail(Collections.singletonList(admin.getEmail()),content.toString());
+                EmailSend.sendArrivalEmail(Collections.singletonList(admin.getEmail()),content.toString(),"-国药试剂价格变动");
                     //  发送成功,更新邮件发送状态为:已发送
 
         } catch (BusinessException e) {

--
Gitblit v1.9.2