From 2407e6ccda09633655a99d640ed1bec7ae1e8652 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Mon, 29 Apr 2024 13:36:24 +0800
Subject: [PATCH] ~C

---
 .../ruoyi/common/core/utils/DateUtils.java    | 27 +++++++++++++++++++
 .../ruoyi/app/controller/PayController.java   |  4 +--
 .../app/service/impl/PayServiceImpl.java      |  3 ++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index d955b70..b31af47 100644
--- a/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -171,6 +171,33 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return Date.from(zdt.toInstant());
     }
 
+    /**
+     * 给datetime时间类型增加指定时间  type=1 增加分钟  type = 2 增加小时  type= 3增加天 type= 4 增加月 type=5增加年
+     * @return
+     */
+    public static Date dateAddTime(Date stateTime,int type, int num) {
+        LocalDateTime localDate = ZonedDateTime.ofInstant(stateTime.toInstant(), ZoneId.systemDefault()).toLocalDateTime();
+        switch (type) {
+            case 1:
+                localDate = localDate.plusMinutes(num);
+                break;
+            case 2:
+                localDate = localDate.plusHours(num);
+                break;
+            case 3:
+                localDate = localDate.plusDays(num);
+                break;
+            case 4:
+                localDate = localDate.plusMonths(num);
+                break;
+            case 5:
+                localDate = localDate.plusYears(num);
+                break;
+        }
+        ZonedDateTime zdt = localDate.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+
     /**
      * 增加 LocalDate ==> Date
      */
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
index e9134f5..2db950f 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
@@ -327,8 +327,8 @@ public class PayController extends BaseController
         if (null == endDate) {
             endDate = startDate;
         }
-        endDate = appOrder.getLevel() == 1 ? DateUtils.dateSubtractTime(endDate,3,7)
-                : (appOrder.getLevel() == 2 ? DateUtils.dateSubtractTime(endDate,4,31) : DateUtils.dateSubtractTime(endDate,5,365));
+        endDate = appOrder.getLevel() == 1 ? DateUtils.dateAddTime(endDate,3,7)
+                : (appOrder.getLevel() == 2 ? DateUtils.dateAddTime(endDate,4,31) : DateUtils.dateAddTime(endDate,5,365));
         userEntity.setOrderStartTime(startDate);
         userEntity.setOrderEndTime(endDate);
         appUserMapper.updateAppUser(userEntity);
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java
index 0f61319..b20e15c 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java
@@ -34,7 +34,8 @@ public class PayServiceImpl implements IPayService {
         parameterMap.put("total_fee", orderMoney);
         parameterMap.put("spbill_create_ip","127.0.0.1");
         parameterMap.put("notify_url", weChatConfig.getWechat_notify_url());
-        parameterMap.put("trade_type", "MWEB");
+        parameterMap.put("trade_type", "JSAPI");
+        //parameterMap.put("trade_type", "MWEB");
         //parameterMap.put("openid", openId);
         String sign = PayUtils.createSign(weChatConfig.getAPP_KEY(), parameterMap);
         log.info("sign:" + sign);