From c56372c3c3320a92af9b8fcd7e31ac29139f98ba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 03 Apr 2023 01:27:49 +0800
Subject: [PATCH] 设定时区,这样创建的时间就不会出现问题

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 71a5d77..50d1583 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -114,11 +114,21 @@
                 DataDictionaryEnum.BUY_TIMES.getType(), DataDictionaryEnum.BUY_TIMES.getCode());
         Integer buyTimes = Integer.parseInt(buyTimesDic.getValue());
 
-        DateTime date = DateUtil.date();
+        DateTime date = DateUtil.offsetHour(DateUtil.date(), -1);
+//        DateTime date = DateUtil.date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String yyyyMMdd = sdf.format(date);
         Integer times = this.baseMapper.selectCountByCreateTimeAndMemberId(yyyyMMdd,member.getId());
         if(buyTimes <= times){
+            throw new FebsException("今日任务完成,明天再来");
+        }
+
+        DataDictionaryCustom allBuyTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+                DataDictionaryEnum.ALL_BUY_TIMES.getType(), DataDictionaryEnum.ALL_BUY_TIMES.getCode());
+        Integer allBuyTimes = Integer.parseInt(allBuyTimesDic.getValue());
+
+        Integer allBuyTimesNow = this.baseMapper.selectCountByCreateTime(yyyyMMdd);
+        if(allBuyTimes <= allBuyTimesNow){
             throw new FebsException("今日任务完成,明天再来");
         }
 
@@ -132,6 +142,7 @@
         orderInfo.setOrderType(addOrderDto.getOrderType());
         //补贴金额
         orderInfo.setSubsidyAmount(goods.getSubsidyAmount());
+        orderInfo.setCommentState(MallOrderInfo.COMMENT_STATE_NO);
 
         this.baseMapper.insert(orderInfo);
         List<MallGoodsSku> mallGoodsSkus = mallGoodsSkuMapper.selectSkuByGoodsId(goods.getId());
@@ -676,8 +687,9 @@
         if(CollUtil.isNotEmpty(apiAddCommentDtos)){
             for(ApiAddCommentDto apiAddCommentDto : apiAddCommentDtos){
                 Long skuId = apiAddCommentDto.getSkuId();
-                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(skuId);
                 Long goodsId = apiAddCommentDto.getGoodsId();
+                List<MallGoodsSku> mallGoodsSkus = mallGoodsSkuMapper.selectSkuByGoodsId(goodsId);
+                MallGoodsSku mallGoodsSku = mallGoodsSkus.get(0);
                 MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
                 MallGoodsComment mallGoodsComment = MallGoodsCommentConversion.INSTANCE.dtoToEntity(apiAddCommentDto);
                 mallGoodsComment.setMemberId(member.getId());

--
Gitblit v1.9.1