From 87ac9e92f1ba005ba5831cdb8a7f6d5436de7300 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Sat, 17 Jul 2021 17:14:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 stdiet-ui/src/views/custom/customer/index.vue | 64 ++++++++++++-------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index 8174962c0..e41791e88 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -42,7 +42,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="营养师" prop="mainDietitian" v-if="!isPartner">
-        <el-select v-model="queryParams.mainDietitian" clearable filterable  placeholder="请选择">
+        <el-select
+          v-model="queryParams.mainDietitian"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in nutritionistIdOptions"
             :key="dict.dictValue"
@@ -59,8 +64,8 @@
         <el-select
           v-model="queryParams.assistantDietitian"
           placeholder="请选择"
-          clearable 
-          filterable 
+          clearable
+          filterable
         >
           <el-option
             v-for="dict in nutriAssisIdOptions"
@@ -71,7 +76,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="销售人员" prop="salesman" v-if="!isPartner">
-        <el-select v-model="queryParams.salesman" clearable filterable  placeholder="请选择">
+        <el-select
+          v-model="queryParams.salesman"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in preSaleIdOptions"
             :key="dict.dictValue"
@@ -80,8 +90,13 @@
           />
         </el-select>
       </el-form-item>
-       <el-form-item label="售中人员" prop="onSaleId" v-if="!isPartner">
-        <el-select v-model="queryParams.onSaleId" clearable filterable placeholder="请选择">
+      <el-form-item label="售中人员" prop="onSaleId" v-if="!isPartner">
+        <el-select
+          v-model="queryParams.onSaleId"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in onSaleIdOptions"
             :key="dict.dictValue"
@@ -91,7 +106,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="售后营养师" prop="afterDietitian" v-if="!isPartner">
-        <el-select v-model="queryParams.afterDietitian" clearable filterable  placeholder="请选择">
+        <el-select
+          v-model="queryParams.afterDietitian"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in afterSaleIdOptions"
             :key="dict.dictValue"
@@ -195,7 +215,7 @@
         :formatter="channelFormat"
       />
       <el-table-column label="客户姓名" align="center" prop="name" />
-      <el-table-column label="手机号" align="center" prop="phone" width="120"/>
+      <el-table-column label="手机号" align="center" prop="phone" width="120" />
       <el-table-column
         label="主营养师"
         align="center"
@@ -268,20 +288,6 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="外食热量"
-        align="center"
-        v-hasPermi="['custom:foodHeatStatistics:list']"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleClickHeatStatistics(scope.row)"
-            >详情
-          </el-button>
-        </template>
-      </el-table-column>
       <el-table-column
         label="食谱计划"
         align="center"
@@ -296,6 +302,20 @@
           </el-button>
         </template>
       </el-table-column>
+      <el-table-column
+        label="外食热量"
+        align="center"
+        v-hasPermi="['custom:foodHeatStatistics:list']"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleClickHeatStatistics(scope.row)"
+            >详情
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column
         label="打卡记录"
         align="center"

From 2f3c77d4200f16125c92a2cdd755638aca5c91b0 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Mon, 19 Jul 2021 09:51:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BB=B6=E9=95=BF=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=B4=A6=E5=8F=B7=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stdiet/web/controller/custom/WechatAppletController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
index 5680b9efa..6577c9c16 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
@@ -520,7 +520,7 @@ public class WechatAppletController extends BaseController {
         }
 
         // 更新时间超过7天，重新登录获取最新信息
-        if (StringUtils.isEmpty(curWxUserInfo.getAvatarUrl()) || ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(curWxUserInfo.getUpdateTime()), LocalDate.now()) >= 7) {
+        if (StringUtils.isEmpty(curWxUserInfo.getAvatarUrl()) || ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(curWxUserInfo.getUpdateTime()), LocalDate.now()) >= 21) {
             return AjaxResult.error(5001, "信息缺失或者过期需要重新登录");
         }