From 58cbecf8ac2c139b800bcf49f9ad00dae9e22156 Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Mon, 25 Oct 2021 15:43:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=94=AF=E4=BB=98=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=EF=BC=8C30=E5=88=86=E9=92=9F=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 1 + .../service/impl/SysUserServiceImpl.java | 1 + .../XhpcRechargeOrderController.java | 19 +++++++++++++++++++ .../mapper/XhpcRechargeOrderMapper.java | 6 ++++++ .../service/IXhpcRechargeOrderService.java | 5 +++++ .../impl/XhpcRechargeOrderServiceImpl.java | 6 ++++++ .../mapper/XhpcRechargeOrderMapper.xml | 5 +++++ .../XhpcInternetUserController.java | 3 ++- .../user/controller/XhpcUserController.java | 2 ++ 9 files changed, 47 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java index d6d63f47..03a0da35 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java @@ -156,6 +156,7 @@ public class SysUserController extends BaseController { && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); } + user.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"); user.setCreateBy(SecurityUtils.getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); return toAjax(userService.insertUser(user)); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java index b2e7df37..b74f41f1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java @@ -437,6 +437,7 @@ public class SysUserServiceImpl implements ISysUserService { user.setPassword(SecurityUtils.encryptPassword(password)); user.setCreateBy(operName); + user.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"); this.insertUser(user); successNum++; successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java index cbc9d0d5..744b30c0 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRechargeOrderController.java @@ -1,5 +1,8 @@ package com.xhpc.payment.controller; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; @@ -7,11 +10,16 @@ import com.xhpc.payment.service.IXhpcRechargeOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.Calendar; +import java.util.Date; import java.util.List; import java.util.Map; @@ -45,4 +53,15 @@ public class XhpcRechargeOrderController extends BaseController { List> list = iXhpcRechargeOrderService.page(phone, refundOrderNumber, status, createTimeStart, createTimeEnd); return getDataTable(list); } + + + /** + * 每隔30分钟，清理一次未支付的订单 + */ + @Scheduled(cron = "0 0/30 * * * ?") + @GetMapping("/test1") + public void test1(){ + iXhpcRechargeOrderService.updateRechargeOrderStatus(); + } + } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java index 4319e760..b1b61e20 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcRechargeOrderMapper.java @@ -56,4 +56,10 @@ public interface XhpcRechargeOrderMapper { * @return 结果 */ public XhpcRechargeOrder infoRechargeOrderNumber(@Param("rechargeOrderNumber") String rechargeOrderNumber); + + + /** + * 每隔30分钟，清理一次未支付的订单 + */ + public void updateRechargeOrderStatus(); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java index 557a8590..68751705 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRechargeOrderService.java @@ -67,4 +67,9 @@ public interface IXhpcRechargeOrderService { * @return 结果 */ public XhpcRechargeOrder infoRechargeOrderNumber(String rechargeOrderNumber); + + /** + * 每隔30分钟，清理一次未支付的订单 + */ + public void updateRechargeOrderStatus(); } \ No newline at end of file diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java index 4bd466f8..b3df929a 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java @@ -123,4 +123,10 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService { public XhpcRechargeOrder infoRechargeOrderNumber(String rechargeOrderNumber) { return xhpcRechargeOrderMapper.infoRechargeOrderNumber(rechargeOrderNumber); } + + @Override + public void updateRechargeOrderStatus() { + xhpcRechargeOrderMapper.updateRechargeOrderStatus(); + } + } diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml index 6a2cdc9e..c11bca2b 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml @@ -171,4 +171,9 @@ from xhpc_recharge_order xro where xro.del_flag = 0 and xro.recharge_order_number = #{rechargeOrderNumber} + + + + update xhpc_recharge_order set del_flag =1 where status=0 and TIMESTAMPDIFF(MINUTE,create_time,now())>30 + \ No newline at end of file diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java index 0b58547a..090455f2 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcInternetUserController.java @@ -53,8 +53,9 @@ public class XhpcInternetUserController extends BaseController { sysUser.setDataPowerType(StatusConstants.INTERNET_POWER_TYPE); sysUser.setCreateBy(SecurityUtils.getUsername()); sysUser.setPassword(xhpcInternetUser.getPhone()); + sysUser.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"); Long[] role = new Long[1]; - role[0] = 4l; + role[0] = 4L; sysUser.setRoleIds(role); if (iXhpcUserService.checkUserNameUnique(sysUser.getUserName()) > 0) { return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败，登录账号已存在"); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java index 4126bc0f..7bd444c3 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcUserController.java @@ -68,6 +68,7 @@ public class XhpcUserController extends BaseController { sysUser.setUserType(StatusConstants.SYSTEM_USER_TYPE); sysUser.setCreateBy(SecurityUtils.getUsername()); sysUser.setPassword(sysUser.getUserName()); + sysUser.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"); Long[] roles = new Long[1]; roles[0] = role.getRoleId(); sysUser.setRoleIds(roles); @@ -138,6 +139,7 @@ public class XhpcUserController extends BaseController { sysUser.setDataPowerType(StatusConstants.SON_POWER_TYPE); sysUser.setUserType(StatusConstants.OPERATION_SON_USER_TYPE); sysUser.setCreateBy(SecurityUtils.getUsername()); + sysUser.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png"); Long[] roles = new Long[1]; roles[0] = role.getRoleId(); sysUser.setRoleIds(roles);