czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
GYJ
2025-01-05 16:58:22 +08:00
parent 4fc6bd5357 7798c1ae10
commit 06bae8fd95
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java
View File

@@ -38,6 +38,7 @@ import com.sqx.modules.pay.controller.app.AliPayController;
import com.sqx.modules.pay.service.DyService; import com.sqx.modules.pay.service.DyService;
import com.sqx.modules.pay.service.WxService; import com.sqx.modules.pay.service.WxService;
import com.sqx.modules.utils.AliPayOrderUtil; import com.sqx.modules.utils.AliPayOrderUtil;
import com.sqx.modules.utils.InvitationCodeUtil;
import com.sqx.modules.utils.TimeCompleteUtils; import com.sqx.modules.utils.TimeCompleteUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@@ -274,6 +275,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
//订单模板对象 //订单模板对象
Orders orders = new Orders(); Orders orders = new Orders();
orders.setOrdersId(InvitationCodeUtil.getSnowFlakeId());
//根据短剧id去查询短剧相关信息 来填充订单模板 //根据短剧id去查询短剧相关信息 来填充订单模板
QueryWrapper<Course> queryWrapper = new QueryWrapper<>(); QueryWrapper<Course> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0); queryWrapper.eq("is_delete", 0);
@@ -360,6 +362,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
//订单模板对象 //订单模板对象
Orders orders = new Orders(); Orders orders = new Orders();
orders.setOrdersId(InvitationCodeUtil.getSnowFlakeId());
//根据短剧id去查询短剧相关信息 来填充订单模板 //根据短剧id去查询短剧相关信息 来填充订单模板
QueryWrapper<Course> queryWrapper = new QueryWrapper<>(); QueryWrapper<Course> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("is_delete", 0); queryWrapper.eq("is_delete", 0);

2
src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
View File

@@ -37,6 +37,7 @@ import com.sqx.modules.pay.wuyou.WuyouPay;
import com.sqx.modules.sys.entity.SysUserEntity; import com.sqx.modules.sys.entity.SysUserEntity;
import com.sqx.modules.sys.service.SysUserService; import com.sqx.modules.sys.service.SysUserService;
import com.sqx.modules.utils.AliPayOrderUtil; import com.sqx.modules.utils.AliPayOrderUtil;
import com.sqx.modules.utils.InvitationCodeUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -99,6 +100,7 @@ public class WuyouController {
PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo());
if (payDetails == null) { if (payDetails == null) {
payDetails = new PayDetails(); payDetails = new PayDetails();
payDetails.setId(InvitationCodeUtil.getSnowFlakeId());
payDetails.setState(0); payDetails.setState(0);
payDetails.setCreateTime(DateUtil.now()); payDetails.setCreateTime(DateUtil.now());
payDetails.setOrderId(order.getOrdersNo()); payDetails.setOrderId(order.getOrdersNo());