From d4256454a97f679161a6326784b49d0028fdf39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 27 Jun 2024 10:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8B=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8D=95=E4=BB=B7=E5=92=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=89=93=E5=BC=80=E9=83=A8=E5=88=86=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artificer/controller/ArtificerController.java      |  1 +
 .../java/com/sqx/modules/artificer/entity/Orders.java  | 10 ++++++++++
 .../artificer/service/impl/OrdersServiceImpl.java      |  3 +++
 .../coupon/controller/app/AppCouponUserController.java |  2 +-
 .../modules/task/service/impl/AllTaskServiceImpl.java  |  2 +-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
index 567e915..4bf9c28 100644
--- a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
+++ b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
@@ -334,6 +334,7 @@ public class ArtificerController {
     }
 
 //    @Scheduled(cron = "0 */1 * * * ?")
+    @Scheduled(cron = "0 2/5 * * * ?")
     public void endOrders(){
         ordersService.endOrders();
     }
diff --git a/src/main/java/com/sqx/modules/artificer/entity/Orders.java b/src/main/java/com/sqx/modules/artificer/entity/Orders.java
index d2894db..2818c08 100644
--- a/src/main/java/com/sqx/modules/artificer/entity/Orders.java
+++ b/src/main/java/com/sqx/modules/artificer/entity/Orders.java
@@ -358,6 +358,16 @@ public class Orders implements Serializable {
      */
     private String jsTsbz;
 
+    /**
+     * 项目单价
+     */
+    private BigDecimal massagePrice;
+
+    /**
+     * 项目数量
+     */
+    private Integer massageNum;
+
     /**
      * 项目名称
      */
diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
index d2e4fab..689a000 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
@@ -354,6 +354,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         BigDecimal artificerPrice = new BigDecimal("0.00");
 
         for (OrdersMassage ordersMassage : ordersMassageList) {
+            orders.setMassagePrice(massageType.getPrice());
+            orders.setMassageNum(ordersMassage.getNum());
             price = massageType.getPrice().multiply(BigDecimal.valueOf(ordersMassage.getNum()));
             BigDecimal massagePrice = price.multiply(orders.getTechnicianRate()).divide(new BigDecimal(100)).add(price);//技师等级加成金额
             massagePrice = massagePrice.multiply(orders.getVipRate()).divide(new BigDecimal(100));//会员优惠后金额
@@ -5507,6 +5509,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
     }
 
 //    @Scheduled(cron = "0 */1 * * * ?")
+    @Scheduled(cron = "0 1/5 * * * ?")
     public void updateOrdersWarning() {
         String value = commonInfoService.findOne(376).getValue();
         baseMapper.updateOrdersWarning(value);
diff --git a/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java b/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java
index 91677ce..33ae787 100644
--- a/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java
+++ b/src/main/java/com/sqx/modules/coupon/controller/app/AppCouponUserController.java
@@ -44,7 +44,7 @@ public class AppCouponUserController extends AbstractController {
     }
 
     //将所有超过失效时间的优惠券改为失效状态
-//    @Scheduled(cron = "0 */1 * * * ?", zone = "Asia/Shanghai")
+    @Scheduled(cron = "0 */1 * * * ?", zone = "Asia/Shanghai")
     public void couponEnd(){
         couponUserService.updateExpiration();
     }
diff --git a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
index 5cb57eb..8782679 100644
--- a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
+++ b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
@@ -61,7 +61,7 @@ public class AllTaskServiceImpl implements AllTaskSercice {
      * A0,A1,A2,A3,A4,A5等
      */
 //    @Scheduled(cron = "0 0 0 * * ?")
-    @Scheduled(cron = "0 * * * * ?")
+//    @Scheduled(cron = "0 * * * * ?")
     public void upgradeJishi() {
         System.out.println("------------计算技师升级规则-----------");
         //1.获取全部参与积分规则的技师