From 7ea959e741d4a09b1e19a70769a4a2fe7f7d8340 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Sat, 15 May 2021 17:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9updateSysRecipesPlan=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysRecipesPlanServiceImpl.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
index fa62f7f03..719d0d8c2 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
@@ -86,13 +86,18 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
      */
     @Override
     public int updateSysRecipesPlan(SysRecipesPlan sysRecipesPlan) {
-        SysRecipesPlan recipesPlan = sysRecipesPlanMapper.selectSysRecipesPlanById(sysRecipesPlan.getId());
+        SysRecipesPlan recipesPlan = null;
 
         sysRecipesPlan.setUpdateTime(DateUtils.getNowDate());
-        //目前只能修改发送状态，所以修改时加上发送时间
-        sysRecipesPlan.setSendTime(DateUtils.getNowDate());
+        if (StringUtils.isNotNull(sysRecipesPlan.getSubscribed())) {
+            // 客户端修改订阅状态
+        } else if (StringUtils.isNotNull(sysRecipesPlan.getSendFlag())) {
+            // 后台修改发送状态
+            sysRecipesPlan.setSendTime(DateUtils.getNowDate());
+            recipesPlan = sysRecipesPlanMapper.selectSysRecipesPlanById(sysRecipesPlan.getId());
+        }
         int row = sysRecipesPlanMapper.updateSysRecipesPlan(sysRecipesPlan);
-        if (row > 0 && sysRecipesPlan.getSendFlag() == 1 && StringUtils.isNull(recipesPlan.getSendTime())) {
+        if (row > 0 && StringUtils.isNotNull(sysRecipesPlan.getSendFlag()) && sysRecipesPlan.getSendFlag() == 1 && StringUtils.isNotNull(recipesPlan) && StringUtils.isNull(recipesPlan.getSendTime())) {
             // 未发送过
             String name = "第" + recipesPlan.getStartNumDay() + "至" + recipesPlan.getEndNumDay() + "天";
             String startDate = recipesPlan.getStartDate().toString();