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

三方订单号

Browse Source
This commit is contained in:
wangw
2024-12-30 22:54:42 +08:00
parent cc18a05b45
commit 4c4c469db2
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
View File

@@ -105,13 +105,13 @@ public class TempOrdersTask {
logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails)); logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails));
logger.info("order：{} ", JSONUtil.toJsonStr(order)); logger.info("order：{} ", JSONUtil.toJsonStr(order));
updateOrderStatus(payDetails, order); updateOrderStatus(payDetails, order);
}else { } else {
order.setStatus(3); order.setStatus(3);
payDetails.setState(2); payDetails.setState(2);
ordersDao.updateById(order); ordersDao.updateById(order);
payDetailsDao.updateById(payDetails); payDetailsDao.updateById(payDetails);
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("订单数据处理异常：", e); logger.error("订单数据处理异常：", e);
} }
@@ -126,7 +126,7 @@ public class TempOrdersTask {
String format = sdf.format(new Date()); String format = sdf.format(new Date());
payDetailsDao.updateState(payDetails.getId(), 1, format, payDetails.getTradeNo()); payDetailsDao.updateState(payDetails.getId(), 1, format, payDetails.getTradeNo(), payDetails.getThirdOrderNo());
order.setPayWay(9); order.setPayWay(9);
order.setStatus(1); order.setStatus(1);

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

@@ -114,7 +114,7 @@ public class AliPayController {
PayDetails payDetails = payDetailsDao.selectByOrderId(outTradeNo); PayDetails payDetails = payDetailsDao.selectByOrderId(outTradeNo);
if (payDetails.getState() == 0) { if (payDetails.getState() == 0) {
String format = sdf.format(new Date()); String format = sdf.format(new Date());
payDetailsDao.updateState(payDetails.getId(), 1, format, tradeNo); payDetailsDao.updateState(payDetails.getId(), 1, format, tradeNo,"");
if (payDetails.getType() == 1) { if (payDetails.getType() == 1) {
Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId());
orders.setPayWay(4); orders.setPayWay(4);

4
src/main/java/com/sqx/modules/pay/service/impl/DyServiceImpl.java
View File

@@ -406,7 +406,7 @@ public class DyServiceImpl implements DyService {
PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo); PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo);
if(payDetails.getState()==0){ if(payDetails.getState()==0){
String format = sdf.format(new Date()); String format = sdf.format(new Date());
payDetailsDao.updateState(payDetails.getId(),1,format,""); payDetailsDao.updateState(payDetails.getId(),1,format,"","");
if(payDetails.getType()==1){ if(payDetails.getType()==1){
Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId());
orders.setPayWay(7); orders.setPayWay(7);
@@ -493,7 +493,7 @@ public class DyServiceImpl implements DyService {
PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo); PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo);
if(payDetails.getState()==0){ if(payDetails.getState()==0){
String format = sdf.format(new Date()); String format = sdf.format(new Date());
payDetailsDao.updateState(payDetails.getId(),1,format,""); payDetailsDao.updateState(payDetails.getId(),1,format,"","");
if(payDetails.getType()==1){ if(payDetails.getType()==1){
Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId());
orders.setPayWay(7); orders.setPayWay(7);

2
src/main/java/com/sqx/modules/pay/service/impl/KsServiceImpl.java
View File

@@ -182,7 +182,7 @@ public class KsServiceImpl implements KsService {
PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo); PayDetails payDetails = payDetailsDao.selectByOrderId(orderNo);
if(payDetails.getState()==0){ if(payDetails.getState()==0){
String format = sdf.format(new Date()); String format = sdf.format(new Date());
payDetailsDao.updateState(payDetails.getId(),1,format,""); payDetailsDao.updateState(payDetails.getId(),1,format,"","");
if(payDetails.getType()==1){ if(payDetails.getType()==1){
Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId());
orders.setPayWay(8); orders.setPayWay(8);

4
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@@ -278,7 +278,7 @@ public class WxServiceImpl implements WxService {
PayDetails payDetails = payDetailsDao.selectByOrderId(out_trade_no); PayDetails payDetails = payDetailsDao.selectByOrderId(out_trade_no);
if(payDetails.getState()==0){ if(payDetails.getState()==0){
String format = sdf.format(new Date()); String format = sdf.format(new Date());
payDetailsDao.updateState(payDetails.getId(),1,format,""); payDetailsDao.updateState(payDetails.getId(),1,format,"","");
if(payDetails.getType()==1){ if(payDetails.getType()==1){
Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId());
orders.setPayTime(DateUtils.format(new Date())); orders.setPayTime(DateUtils.format(new Date()));
@@ -357,7 +357,7 @@ public class WxServiceImpl implements WxService {
PayDetails payDetails = payDetailsDao.selectByOrderId(out_trade_no); PayDetails payDetails = payDetailsDao.selectByOrderId(out_trade_no);
if(payDetails.getState()==0){ if(payDetails.getState()==0){
String format = sdf.format(new Date()); String format = sdf.format(new Date());
payDetailsDao.updateState(payDetails.getId(),1,format,""); payDetailsDao.updateState(payDetails.getId(),1,format,"","");
if(payDetails.getType()==1){ if(payDetails.getType()==1){
Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId()); Orders orders = ordersService.selectOrderByOrdersNo(payDetails.getOrderId());
orders.setPayTime(DateUtils.format(new Date())); orders.setPayTime(DateUtils.format(new Date()));