未支付的订单,30分钟后自动清除
This commit is contained in:
parent
ea4136d9f6
commit
58cbecf8ac
@ -156,6 +156,7 @@ public class SysUserController extends BaseController {
|
|||||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
|
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
|
||||||
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
|
return AjaxResult.error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
|
||||||
}
|
}
|
||||||
|
user.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png");
|
||||||
user.setCreateBy(SecurityUtils.getUsername());
|
user.setCreateBy(SecurityUtils.getUsername());
|
||||||
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
||||||
return toAjax(userService.insertUser(user));
|
return toAjax(userService.insertUser(user));
|
||||||
|
|||||||
@ -437,6 +437,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|||||||
{
|
{
|
||||||
user.setPassword(SecurityUtils.encryptPassword(password));
|
user.setPassword(SecurityUtils.encryptPassword(password));
|
||||||
user.setCreateBy(operName);
|
user.setCreateBy(operName);
|
||||||
|
user.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png");
|
||||||
this.insertUser(user);
|
this.insertUser(user);
|
||||||
successNum++;
|
successNum++;
|
||||||
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
package com.xhpc.payment.controller;
|
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.controller.BaseController;
|
||||||
import com.xhpc.common.core.web.domain.AjaxResult;
|
import com.xhpc.common.core.web.domain.AjaxResult;
|
||||||
import com.xhpc.common.core.web.page.TableDataInfo;
|
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.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
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.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
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.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@ -45,4 +53,15 @@ public class XhpcRechargeOrderController extends BaseController {
|
|||||||
List<Map<String, Object>> list = iXhpcRechargeOrderService.page(phone, refundOrderNumber, status, createTimeStart, createTimeEnd);
|
List<Map<String, Object>> list = iXhpcRechargeOrderService.page(phone, refundOrderNumber, status, createTimeStart, createTimeEnd);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每隔30分钟,清理一次未支付的订单
|
||||||
|
*/
|
||||||
|
@Scheduled(cron = "0 0/30 * * * ?")
|
||||||
|
@GetMapping("/test1")
|
||||||
|
public void test1(){
|
||||||
|
iXhpcRechargeOrderService.updateRechargeOrderStatus();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -56,4 +56,10 @@ public interface XhpcRechargeOrderMapper {
|
|||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public XhpcRechargeOrder infoRechargeOrderNumber(@Param("rechargeOrderNumber") String rechargeOrderNumber);
|
public XhpcRechargeOrder infoRechargeOrderNumber(@Param("rechargeOrderNumber") String rechargeOrderNumber);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每隔30分钟,清理一次未支付的订单
|
||||||
|
*/
|
||||||
|
public void updateRechargeOrderStatus();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,4 +67,9 @@ public interface IXhpcRechargeOrderService {
|
|||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public XhpcRechargeOrder infoRechargeOrderNumber(String rechargeOrderNumber);
|
public XhpcRechargeOrder infoRechargeOrderNumber(String rechargeOrderNumber);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 每隔30分钟,清理一次未支付的订单
|
||||||
|
*/
|
||||||
|
public void updateRechargeOrderStatus();
|
||||||
}
|
}
|
||||||
@ -123,4 +123,10 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService {
|
|||||||
public XhpcRechargeOrder infoRechargeOrderNumber(String rechargeOrderNumber) {
|
public XhpcRechargeOrder infoRechargeOrderNumber(String rechargeOrderNumber) {
|
||||||
return xhpcRechargeOrderMapper.infoRechargeOrderNumber(rechargeOrderNumber);
|
return xhpcRechargeOrderMapper.infoRechargeOrderNumber(rechargeOrderNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateRechargeOrderStatus() {
|
||||||
|
xhpcRechargeOrderMapper.updateRechargeOrderStatus();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -171,4 +171,9 @@
|
|||||||
from xhpc_recharge_order xro
|
from xhpc_recharge_order xro
|
||||||
where xro.del_flag = 0 and xro.recharge_order_number = #{rechargeOrderNumber}
|
where xro.del_flag = 0 and xro.recharge_order_number = #{rechargeOrderNumber}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
<update id="updateRechargeOrderStatus">
|
||||||
|
update xhpc_recharge_order set del_flag =1 where status=0 and TIMESTAMPDIFF(MINUTE,create_time,now())>30
|
||||||
|
</update>
|
||||||
</mapper>
|
</mapper>
|
||||||
@ -53,8 +53,9 @@ public class XhpcInternetUserController extends BaseController {
|
|||||||
sysUser.setDataPowerType(StatusConstants.INTERNET_POWER_TYPE);
|
sysUser.setDataPowerType(StatusConstants.INTERNET_POWER_TYPE);
|
||||||
sysUser.setCreateBy(SecurityUtils.getUsername());
|
sysUser.setCreateBy(SecurityUtils.getUsername());
|
||||||
sysUser.setPassword(xhpcInternetUser.getPhone());
|
sysUser.setPassword(xhpcInternetUser.getPhone());
|
||||||
|
sysUser.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png");
|
||||||
Long[] role = new Long[1];
|
Long[] role = new Long[1];
|
||||||
role[0] = 4l;
|
role[0] = 4L;
|
||||||
sysUser.setRoleIds(role);
|
sysUser.setRoleIds(role);
|
||||||
if (iXhpcUserService.checkUserNameUnique(sysUser.getUserName()) > 0) {
|
if (iXhpcUserService.checkUserNameUnique(sysUser.getUserName()) > 0) {
|
||||||
return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败,登录账号已存在");
|
return AjaxResult.error("新增用户'" + sysUser.getUserName() + "'失败,登录账号已存在");
|
||||||
|
|||||||
@ -68,6 +68,7 @@ public class XhpcUserController extends BaseController {
|
|||||||
sysUser.setUserType(StatusConstants.SYSTEM_USER_TYPE);
|
sysUser.setUserType(StatusConstants.SYSTEM_USER_TYPE);
|
||||||
sysUser.setCreateBy(SecurityUtils.getUsername());
|
sysUser.setCreateBy(SecurityUtils.getUsername());
|
||||||
sysUser.setPassword(sysUser.getUserName());
|
sysUser.setPassword(sysUser.getUserName());
|
||||||
|
sysUser.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png");
|
||||||
Long[] roles = new Long[1];
|
Long[] roles = new Long[1];
|
||||||
roles[0] = role.getRoleId();
|
roles[0] = role.getRoleId();
|
||||||
sysUser.setRoleIds(roles);
|
sysUser.setRoleIds(roles);
|
||||||
@ -138,6 +139,7 @@ public class XhpcUserController extends BaseController {
|
|||||||
sysUser.setDataPowerType(StatusConstants.SON_POWER_TYPE);
|
sysUser.setDataPowerType(StatusConstants.SON_POWER_TYPE);
|
||||||
sysUser.setUserType(StatusConstants.OPERATION_SON_USER_TYPE);
|
sysUser.setUserType(StatusConstants.OPERATION_SON_USER_TYPE);
|
||||||
sysUser.setCreateBy(SecurityUtils.getUsername());
|
sysUser.setCreateBy(SecurityUtils.getUsername());
|
||||||
|
sysUser.setAvatar("https://xhpc-bucket1.oss-cn-hangzhou.aliyuncs.com/avatar/logo.png");
|
||||||
Long[] roles = new Long[1];
|
Long[] roles = new Long[1];
|
||||||
roles[0] = role.getRoleId();
|
roles[0] = role.getRoleId();
|
||||||
sysUser.setRoleIds(roles);
|
sysUser.setRoleIds(roles);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user