From 64327811363bd7273531b18f41402dabe24ed13e Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Mon, 28 Mar 2022 17:38:48 +0800 Subject: [PATCH] 1 --- .../java/com/bweb/controller/OutRechargeOrderController.java | 2 +- .../java/com/cweb/controller/OutRechargeOrderController.java | 2 +- .../main/java/com/cweb/controller/pay/CzOrderController.java | 2 +- .../main/java/com/cweb/controller/pay/UnionPayController.java | 2 +- .../java/com/hai/service/impl/OutRechargeOrderServiceImpl.java | 2 +- .../java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java index 625c8bc5..43d3fb7f 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java @@ -589,7 +589,7 @@ public class OutRechargeOrderController { rechargeOrderRecord = new OutRechargeOrderRecord(); // 查询订单 OutRechargeOrder order = outRechargeOrderService.findByOrderId(orderId); - if (order.getRechargeType() != null) { + if (order.getRechargeType() == 1) { String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5); JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo , order.getRechargeType()); if (object.getInteger("code") != 200) { diff --git a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java index 896c3c6d..49c3d1e0 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java @@ -472,7 +472,7 @@ public class OutRechargeOrderController { outRechargeOrderService.goldPayOrder(userInfoModel.getHighUser().getId(), order.getId()); - if (order.getRechargeType() != null) { + if (order.getRechargeType() == 1) { JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() , order.getRechargeType()); if (object.getInteger("code") != 200) { order.setRechargeStatus(1); diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java index f0bb30fa..3db354c9 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java @@ -125,7 +125,7 @@ public class CzOrderController { rechargeOrderRecord = new OutRechargeOrderRecord(); // 查询订单 OutRechargeOrder order = outRechargeOrderService.findByOrderNo(dataObject.getString("out_order_id")); - if (order.getRechargeType() != null) { + if (order.getRechargeType() == 1) { String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5); JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo , order.getRechargeType()); if (object.getInteger("code") != 200) { diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java index f1f7e0cb..38f60250 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java @@ -395,7 +395,7 @@ public class UnionPayController { order.setStatus(2); order.setPayType(4); order.setPayTime(new Date()); // 支付时间 - if (order.getRechargeType() != null) { + if (order.getRechargeType() == 1) { JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() , order.getRechargeType()); if (object.getInteger("code") != 200) { order.setRechargeStatus(1); diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java index d96e7a93..764a5cd0 100644 --- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java @@ -373,7 +373,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { } order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号 order.setPayRealPrice(order.getPayPrice()); // 实付金额 - if (order.getRechargeType() != null) { + if (order.getRechargeType() == 1) { JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() ,order.getRechargeType()); if (object.getInteger("code") != 200) { order.setRechargeStatus(1); diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java index 3e131223..11ab3cb5 100644 --- a/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java @@ -70,7 +70,7 @@ public class RechargeOrderServiceImpl implements PayService { order.setPayRealPrice(new BigDecimal(map.get("total_fee")).divide(new BigDecimal("100"))); // 实付金额 order.setPayTime(new Date()); // 支付时间 order.setStatus(2); // 订单状态 ： 1.待支付 2.已支付 3.已完成 4.已取消 5.已退款 - if (order.getRechargeType() != null) { + if (order.getRechargeType() == 1) { JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() , order.getRechargeType()); if (object.getInteger("code") != 200) { order.setRechargeStatus(1);