修改--修改支付回调接口中,资源位添加order_id,使得资源位每日任务能够修改订单状态
This commit is contained in:
parent
955a9cdbf3
commit
7b96fd3f00
@ -1045,7 +1045,6 @@ public class AppSystemController extends BaseController {
|
||||
{
|
||||
// 获取用户id
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
System.out.println("userid: "+ userId);
|
||||
|
||||
// 检查用户是否被禁止发布
|
||||
SysUser sysUser = sysUserService.selectUserById(userId);
|
||||
@ -1240,7 +1239,7 @@ public class AppSystemController extends BaseController {
|
||||
// 组合订单号
|
||||
String mchOrderNo = timestamp + randomSuffix;
|
||||
|
||||
System.out.println("mchOrderNo: " + mchOrderNo);
|
||||
// System.out.println("mchOrderNo: " + mchOrderNo);
|
||||
// String mchOrderNo = "M" + UUID.randomUUID().toString().replaceAll("-", "");
|
||||
//
|
||||
// // 缓存订单和用户关系, 为了回调函数中写入订单数据库
|
||||
@ -1251,7 +1250,7 @@ public class AppSystemController extends BaseController {
|
||||
// 将订单信息写入缓存--超时时间稍微比订单时间长1分钟吧
|
||||
redisCache.setCacheObject(mchOrderNo, orderCacheVoList, 6, TimeUnit.MINUTES);
|
||||
|
||||
System.out.println("总价格："+ tPrice);
|
||||
// System.out.println("总价格："+ tPrice);
|
||||
|
||||
return AjaxResult.success(mchOrderNo);
|
||||
}
|
||||
|
||||
@ -68,8 +68,36 @@ public class PayBackController {
|
||||
// return result;
|
||||
// //-------------------------------------------旧版end----------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// 获取缓存中的订单信息
|
||||
List<OrderCacheVo> list = redisCache.getCacheObject(mchOrderNo);
|
||||
|
||||
|
||||
//--------------------------------------------------插入订单数据--------------------------------------------------------
|
||||
SysOrder sysOrder = new SysOrder();
|
||||
sysOrder.setOrderInfoId(mchOrderNo);
|
||||
sysOrder.setStatus("0");
|
||||
sysOrder.setCreateTime(DateUtils.getNowDate());
|
||||
sysOrder.setUserId(list.get(0).getUserId());
|
||||
sysOrder.setMoney(list.get(0).getMoney());
|
||||
sysOrder.setStartTime(list.get(0).getStartTime());
|
||||
sysOrder.setEndTime(list.get(0).getEndTime());
|
||||
sysOrder.setSourceId(list.get(0).getSourceId());
|
||||
sysOrder.setWay(list.get(0).getWay());
|
||||
|
||||
// 插入系统订单表
|
||||
sysOrderService.insertSysOrder(sysOrder);
|
||||
//--------------------------------------------------插入订单数据 end-----------------------------------------------------
|
||||
|
||||
SysOrder sysOrder1 = sysOrderService.selectSysOrderList(sysOrder).get(0);
|
||||
System.out.println("新订单id"+sysOrder1.getOrderId());
|
||||
|
||||
|
||||
|
||||
for(OrderCacheVo orderCacheVo : list){
|
||||
// System.out.println(orderCacheVo);
|
||||
OrderInfo orderInfo = new OrderInfo();
|
||||
@ -101,6 +129,7 @@ public class PayBackController {
|
||||
|
||||
// 设置workId
|
||||
sysSource.setWorkId(orderCacheVo.getWorkId());
|
||||
sysSource.setOrderId(sysOrder1.getOrderId());
|
||||
|
||||
|
||||
|
||||
@ -156,20 +185,8 @@ public class PayBackController {
|
||||
//---------------------------------------daily_source 中 资源位 b_bought+1 end-------------------------------------
|
||||
|
||||
}
|
||||
SysOrder sysOrder = new SysOrder();
|
||||
sysOrder.setOrderInfoId(mchOrderNo);
|
||||
sysOrder.setStatus("0");
|
||||
sysOrder.setCreateTime(DateUtils.getNowDate());
|
||||
sysOrder.setUserId(list.get(0).getUserId());
|
||||
// sysOrder.setRefund(0L);
|
||||
sysOrder.setMoney(list.get(0).getMoney());
|
||||
sysOrder.setStartTime(list.get(0).getStartTime());
|
||||
sysOrder.setEndTime(list.get(0).getEndTime());
|
||||
sysOrder.setSourceId(list.get(0).getSourceId());
|
||||
sysOrder.setWay(list.get(0).getWay());
|
||||
|
||||
// 插入系统订单表
|
||||
sysOrderService.insertSysOrder(sysOrder);
|
||||
|
||||
|
||||
|
||||
// 删除订单缓存数据
|
||||
@ -177,17 +194,12 @@ public class PayBackController {
|
||||
|
||||
|
||||
// 返回订单 order_id 和 订单详情的id,两者通过order_info_id关联.
|
||||
SysOrder sysOrder1 = new SysOrder();
|
||||
sysOrder1.setOrderInfoId(mchOrderNo);
|
||||
List<SysOrder> order = sysOrderService.selectSysOrderList(sysOrder1);
|
||||
// System.out.println("List<SysOrder>: 长度"+order.size());
|
||||
// System.out.println("订单id"+order.get(0).getOrderId());
|
||||
|
||||
List<Long> orderInfoList = orderInfoService.getOrderInfoByOrderInfoId(mchOrderNo);
|
||||
|
||||
|
||||
AjaxResult ajaxResult = AjaxResult.success();
|
||||
ajaxResult.put("orderId", order.get(0).getOrderId());
|
||||
ajaxResult.put("orderId", sysOrder1.getOrderId());
|
||||
ajaxResult.put("id", orderInfoList);
|
||||
|
||||
return ajaxResult;
|
||||
|
||||
@ -81,7 +81,7 @@ public class dailySysServer {
|
||||
//计数当前系统用户数量并且插入daily_sys表(日期是昨天)
|
||||
// 每天凌晨2点计算一次
|
||||
// 应该是定时任务, 测试完毕后修改接口类型
|
||||
@GetMapping("/UserCount")
|
||||
// @GetMapping("/UserCount")
|
||||
public void updateUserCount(){
|
||||
|
||||
Long UserCount = sysUserCountService.getUserCount();
|
||||
@ -403,7 +403,7 @@ public class dailySysServer {
|
||||
// 每天凌晨一点更新系统每天统计数据.
|
||||
@Scheduled(cron = "0 0 1 * * ?")
|
||||
@Transactional
|
||||
@GetMapping("/dailySys")
|
||||
// @GetMapping("/dailySys")
|
||||
public void updateDailySys(){
|
||||
LocalDate now = LocalDate.now();
|
||||
// 一天前
|
||||
|
||||
@ -145,6 +145,8 @@ public class FileUploadUtils
|
||||
String baseName = stringList[0];
|
||||
String newExtension = stringList[1]; // 统一使用jpg扩展名
|
||||
|
||||
System.out.println("originalFilename: " + originalFilename+ " newExtension: " + newExtension);
|
||||
|
||||
// 保持原有命名规则
|
||||
String uuid = IdUtils.simpleUUID();
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
@ -361,6 +363,9 @@ public class FileUploadUtils
|
||||
// 创建临时文件（保留原始扩展名）
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
String fileExtension = originalFilename.substring(originalFilename.lastIndexOf(".") + 1);
|
||||
|
||||
System.out.println("originalFilename:"+originalFilename + " fileExtension:"+fileExtension);
|
||||
|
||||
Path tempFile = Files.createTempFile("compress_", "." + fileExtension);
|
||||
|
||||
try (InputStream is = file.getInputStream()) {
|
||||
@ -369,6 +374,8 @@ public class FileUploadUtils
|
||||
int originalWidth = srcImage.getWidth();
|
||||
int originalHeight = srcImage.getHeight();
|
||||
|
||||
|
||||
|
||||
// 压缩处理（保持原尺寸）
|
||||
Thumbnails.of(file.getInputStream())
|
||||
.size(originalWidth, originalHeight) // 显式指定原始尺寸
|
||||
|
||||
Loading…
Reference in New Issue
Block a user