From 529fc770ee53d5e179ea461d40d5cb623173590e Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Fri, 6 Mar 2020 20:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BC=98=E5=8C=96,=E8=AE=A2=E5=8D=95=E6=9C=AA?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9E=E5=89=A9=E4=BD=99=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/YxStoreOrderServiceImpl.java    |  4 +++-
 .../modules/shop/web/controller/IndexController.java   |  8 +++++++-
 .../shop/web/param/YxStoreProductQueryParam.java       |  1 -
 .../wechat/web/controller/WechatController.java        |  3 ++-
 .../main/java/co/yixiang/constant/ShopConstants.java   | 10 ++++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index 25531267..ec1e7f06 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -857,8 +857,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
         order.setCartInfo(cartInfo);
         StatusDTO statusDTO = new StatusDTO();
         if(order.getPaid() == 0){
+            //计算未支付到自动取消订 时间
+            long time = ShopConstants.ORDER_OUTTIME_UNPAY *60 + Long.valueOf(order.getAddTime());
             statusDTO.set_class("nobuy");
-            statusDTO.set_msg("请完成支付");
+            statusDTO.set_msg(StrUtil.format("请在{}前完成支付",OrderUtil.stampToDate(String.valueOf(time))));
             statusDTO.set_type("0");
             statusDTO.set_title("未支付");
         }else if(order.getRefundStatus() == 1){
diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java
index 3fb2d4d9..aa6b1dca 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java
@@ -12,9 +12,11 @@ import cn.hutool.core.io.file.FileReader;
 import cn.hutool.core.io.resource.ClassPathResource;
 import co.yixiang.annotation.AnonymousAccess;
 import co.yixiang.common.api.ApiResult;
+import co.yixiang.constant.ShopConstants;
 import co.yixiang.modules.shop.service.YxStoreProductService;
 import co.yixiang.modules.shop.service.YxSystemGroupDataService;
 import co.yixiang.utils.FileUtil;
+import co.yixiang.utils.RedisUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
@@ -52,6 +54,9 @@ public class IndexController {
     @ApiOperation(value = "首页数据",notes = "首页数据")
     public ApiResult<Map<String,Object>> index(){
 
+        if(RedisUtil.get(ShopConstants.YSHOP_REDIS_INDEX_KEY) != null){
+            return ApiResult.ok(RedisUtil.get(ShopConstants.YSHOP_REDIS_INDEX_KEY));
+        }
 
         Map<String,Object> map = new LinkedHashMap<>();
         //banner
@@ -75,7 +80,8 @@ public class IndexController {
         map.put("roll",systemGroupDataService.getDatas("routine_home_roll_news"));
 
 
-
+        //缓存
+        RedisUtil.set(ShopConstants.YSHOP_REDIS_INDEX_KEY,map,ShopConstants.YSHOP_REDIS_INDEX_KEY_EXPIRE);
 
         return ApiResult.ok(map);
     }
diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java
index 4d16d294..76ad7e5b 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java
@@ -22,7 +22,6 @@ public class YxStoreProductQueryParam extends QueryParam {
 
     private int type;
     private int sid;
-    private int cid;
     private int news;
     private String priceOrder;
     private String salesOrder;
diff --git a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
index 190e00f8..e83221e7 100644
--- a/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
+++ b/yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
@@ -92,7 +92,8 @@ public class WechatController extends BaseController {
         Map<String,Object> map = new LinkedHashMap<>();
 
         map.put("appId",jsapiSignature.getAppId());
-        map.put("jsApiList",new String[]{"updateAppMessageShareData","openLocation","scanQRCode","chooseWXPay"});
+        map.put("jsApiList",new String[]{"updateAppMessageShareData","openLocation","scanQRCode",
+                "chooseWXPay","updateAppMessageShareData","updateTimelineShareData"});
         map.put("nonceStr",jsapiSignature.getNonceStr());
         map.put("signature",jsapiSignature.getSignature());
         map.put("timestamp",jsapiSignature.getTimestamp());
diff --git a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java
index 14f8a543..bdaa5598 100644
--- a/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java
+++ b/yshop-common/src/main/java/co/yixiang/constant/ShopConstants.java
@@ -49,6 +49,16 @@ public interface ShopConstants {
 	 */
 	String QQ_MAP_URL = "https://apis.map.qq.com/ws/geocoder/v1/";
 
+	/**
+	 * redis首页键
+	 */
+	String YSHOP_REDIS_INDEX_KEY = "yshop_index_data";
+
+	/**
+	 * redis首页过期时间 单位秒
+	 */
+	long YSHOP_REDIS_INDEX_KEY_EXPIRE = 7200;
+
 
 
 }