wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~C

main
linhw 2024-04-29 13:36:24 +08:00
parent 19af6b9e95
commit 2407e6ccda
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
View File

@ -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
*/

4
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
View File

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

3
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/PayServiceImpl.java
View File

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