登录时间设置90天

crmeb-common/src/main/java/com/zbkj/common/constants/Constants.java

@@ -1,12 +1,11 @@
 package com.zbkj.common.constants;
 
 /**
- *  配置类
-
+ * 配置类
  */
 public class Constants {
 
-    public static final long TOKEN_EXPRESS_MINUTES = (60 * 24); //3小时
+    public static final long TOKEN_EXPRESS_MINUTES = (60 * 24 * 90); //90天
 
     public static final int HTTPSTATUS_CODE_SUCCESS = 200;
 
@@ -45,31 +44,51 @@ public class Constants {
     public static final String WE_CHAT_TEMP_KEY_FIRST = "first";
     public static final String WE_CHAT_TEMP_KEY_END = "remark";
 
-    public static final String FAIL     = "FAIL";
-    public static final String SUCCESS  = "SUCCESS";
+    public static final String FAIL = "FAIL";
+    public static final String SUCCESS = "SUCCESS";
 
-    /** 公共开关：0关闭 */
+    /**
+     * 公共开关：0关闭
+     */
     public static final String COMMON_SWITCH_CLOSE = "0";
-    /** 公共开关：1开启 */
+    /**
+     * 公共开关：1开启
+     */
     public static final String COMMON_SWITCH_OPEN = "1";
 
-    /** 小程序源码包文件名 */
+    /**
+     * 小程序源码包文件名
+     */
     public static final String WECHAT_SOURCE_CODE_FILE_NAME = "/mp-weixin-target.zip";
 
-    /** 操作类型-添加 */
+    /**
+     * 操作类型-添加
+     */
     public static final String OPERATION_TYPE_ADD = "add";
-    /** 操作类型-快捷添加 */
+    /**
+     * 操作类型-快捷添加
+     */
     public static final String OPERATION_TYPE_QUICK_ADD = "quick";
-    /** 操作类型-扣减 */
+    /**
+     * 操作类型-扣减
+     */
     public static final String OPERATION_TYPE_SUBTRACT = "sub";
-    /** 操作类型-活动创建 */
+    /**
+     * 操作类型-活动创建
+     */
     public static final String OPERATION_TYPE_ACTIVITY_CREATE = "create";
-    /** 操作类型-活动回归 */
+    /**
+     * 操作类型-活动回归
+     */
     public static final String OPERATION_TYPE_ACTIVITY_ROLL_BACK = "back";
 
-    /** 自定义表单开关：关闭 */
+    /**
+     * 自定义表单开关：关闭
+     */
     public static final String CONFIG_FORM_SWITCH_CLOSE = "'0'";
-    /** 自定义表单开关：开启 */
+    /**
+     * 自定义表单开关：开启
+     */
     public static final String CONFIG_FORM_SWITCH_OPEN = "'1'";
 
 }

crmeb-common/src/main/java/com/zbkj/common/constants/RedisConstants.java

@@ -24,7 +24,7 @@ public class RedisConstants {
     public static final String MERCHANT_VISITORS_KEY = "statistics:merchant:visitors:{}:{}";
 
     /** 移动端Token过期时间 3小时 */
-    public static final long TOKEN_EXPRESS_MINUTES = (60 * 24);
+    public static final long TOKEN_EXPRESS_MINUTES = (60 * 24* 90);
 
     /** 验证码redis key前缀 */
     public static final String VALIDATE_REDIS_KEY_PREFIX = "validate_code_";

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -1401,9 +1401,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
      * @param request 发货参数
      */
     private void validateExpressSend(OrderSendRequest request) {
-        if (request.getExpressRecordType().equals(1)) {
-            if (StrUtil.isBlank(request.getExpressNumber())) throw new CrmebException("请填写快递单号");
-            return;
+        String expressCode = request.getExpressCode();
+        if (!"shangjia".equals(expressCode)){
+            if (request.getExpressRecordType().equals(1)) {
+                if (StrUtil.isBlank(request.getExpressNumber())) throw new CrmebException("请填写快递单号");
+                return;
+            }
         }
         if (StrUtil.isBlank(request.getExpressCode())) throw new CrmebException("请选择快递公司");
         if (StrUtil.isBlank(request.getExpressTempId())) throw new CrmebException("请选择电子面单");