From 9cc0ad82cd2aace27bede73942d85142c7d70e79 Mon Sep 17 00:00:00 2001
From: xiezhijun <15270898033@163.com>
Date: Thu, 18 Mar 2021 18:48:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=A3=9F=E8=B0=B1=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96=E6=A1=88=E4=BE=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/custom/WxCustomerCaseController.java      | 5 +++--
 .../main/java/com/stdiet/custom/domain/SysCustomerCase.java  | 3 +++
 .../custom/service/impl/SysRecipesPlanServiceImpl.java       | 2 +-
 .../main/resources/mapper/custom/SysCustomerCaseMapper.xml   | 3 +++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WxCustomerCaseController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WxCustomerCaseController.java
index 95f1725e4..dd45de035 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WxCustomerCaseController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WxCustomerCaseController.java
@@ -33,9 +33,10 @@ public class WxCustomerCaseController extends BaseController{
     {
         startPage();
         sysCustomerCase.setKeywordArray(StringUtils.isNotEmpty(sysCustomerCase.getKeyword()) ? sysCustomerCase.getKeyword().split(",") : null);
+        //sysCustomerCase.setWxShow(1);
         List<SysCustomerCase> list = sysCustomerCaseService.selectSysCustomerCaseList(sysCustomerCase);
-        List<CustomerCaseResponse> resultList = dealSysCustomerCase(list);
-        return getDataTable(resultList);
+        //List<CustomerCaseResponse> resultList = dealSysCustomerCase(list);
+        return getDataTable(list);
     }
 
     /**
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerCase.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerCase.java
index 1bc94bf0a..7c8e0a51d 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerCase.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerCase.java
@@ -36,6 +36,9 @@ public class SysCustomerCase extends BaseEntity
     @Excel(name = "所属客户")
     private String customerName;
 
+    //是否显示到微信小程序
+    private Integer wxShow;
+
     /** 删除标识 0未删除 1已删除，默认0 */
     private Long delFlag;
 
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 27697a26b..035811af6 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
@@ -132,7 +132,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
         }
         SysOrder sysOrder = sysOrderService.selectSysOrderById(orderId);
         //订单为空、金额小于0、订单未审核不进行食谱生成、更新，只对2021年开始的订单进行食谱计划生成，判断订单金额、开始时间、结束时间，为空则直接返回，不重新生成食谱计划
-        if (sysOrder == null || !sysOrder.getReviewStatus().equals("yes") || DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021
+        if (sysOrder == null || !sysOrder.getReviewStatus().equals("yes") /*|| DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021*/
                 || sysOrder.getAmount().floatValue() <= 0 || sysOrder.getStartTime() == null || sysOrder.getServerEndTime() == null) {
             return;
         }
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml
index b82963900..5783a7191 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerCaseMapper.xml
@@ -43,6 +43,9 @@
         <if test="customerName != null and customerName != ''">
             and sc.name like concat('%', #{customerName}, '%')
         </if>
+        <if test="wxShow != null">
+            and scc.wx_show = #{wxShow}
+        </if>
         order by id desc
     </select>