From 004d9e74f66d87e8416a9b0d807b64cbfd1576f8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 15:16:07 +0800
Subject: [PATCH] fix

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 7977662..05d418a 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -2,6 +2,8 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -198,6 +200,7 @@
         }
 //        scoreOrder.setStatus(ScoreOrder.STATUS_DONE);
         scoreOrder.setIsFinish(ScoreOrder.ISFINISH_YES);
+        scoreOrder.setIsFinishTime(new Date());
         scoreOrder.setVoucherImg(CollUtil.join(model.getVoucherImgs(),","));
         scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
         return scoreOrder.getId();
@@ -252,7 +255,7 @@
                         if(quotaTime > 0){
                             totalPrice = sku.getPresentPrice().multiply(BigDecimal.valueOf(quotaTime)).add(
                                     sku.getOriginalPrice().multiply(BigDecimal.valueOf(addGoodsOrderDto.getCnt()-quotaTime)));
-                            unitPrice = sku.getPresentPrice();
+                            unitPrice = sku.getOriginalPrice();
                         }else{
                             totalPrice = sku.getOriginalPrice().multiply(BigDecimal.valueOf(addGoodsOrderDto.getCnt()));
                             unitPrice = sku.getOriginalPrice();
@@ -490,4 +493,24 @@
         statisticsVo.setTotalBuyCnt(Integer.parseInt(allData.get("totalBuy").toString()));
         return statisticsVo;
     }
+
+    public void autoConfirmReceipt() {
+        //获取七天之前后台点击确认提货的订单
+        DateTime dateTime = DateUtil.offsetDay(new Date(), -7);
+        //
+        List<ScoreOrder> orders = scoreOrderMapper.selectOrderByIsFinish(dateTime);
+        if(CollUtil.isNotEmpty(orders)){
+            for(ScoreOrder order : orders){
+                scoreOrderMapper.updateOrderStatusToDone(order.getId());
+            }
+        }
+
+    }
+
+
+//    public static void main(String[] args) {
+//        DateTime dateTime = DateUtil.offsetDay(new Date(), -7);
+//        System.out.println(dateTime);
+//    }
+
 }

--
Gitblit v1.9.1