cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

首页接口数据优化,订单未支付返回剩余时间

Browse Source
This commit is contained in:
hupeng
2020-03-06 20:33:35 +08:00
parent ec903e4cdb
commit 529fc770ee
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -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){

8
yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/IndexController.java
View File

@ -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);
}

1
yshop-api/src/main/java/co/yixiang/modules/shop/web/param/YxStoreProductQueryParam.java
View File

@ -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;

3
yshop-api/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java
View File

@ -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());