dev-discount
袁野 3 years ago
parent 395cd397fc
commit 80fa35048c
  1. 2
      hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
  2. 4
      hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
  3. 4
      hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@ -474,7 +474,7 @@ public class OutRechargeOrderController {
outRechargeOrderService.goldPayOrder(userInfoModel.getHighUser().getId(), order.getId()); outRechargeOrderService.goldPayOrder(userInfoModel.getHighUser().getId(), order.getId());
if (order.getRechargeType() == 1) { if (order.getRechargeType() != null && order.getRechargeType() == 1) {
outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo()); outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
} }

@ -386,7 +386,7 @@ public class UnionPayController {
order.setPaySerialNo(body.getString("wtorderid")); // 支付流水号 order.setPaySerialNo(body.getString("wtorderid")); // 支付流水号
order.setPayRealPrice(order.getPayPrice()); // 实付金额 order.setPayRealPrice(order.getPayPrice()); // 实付金额
if (order.getRechargeType() == 1) { if (order.getRechargeType() != null && order.getRechargeType() == 1) {
outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo()); outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
} }
@ -394,7 +394,7 @@ public class UnionPayController {
order.setPayType(4); order.setPayType(4);
order.setPayTime(new Date()); // 支付时间 order.setPayTime(new Date()); // 支付时间
outRechargeOrderService.updateOrder(order); outRechargeOrderService.updateOrder(order);
if (order.getRechargeType() == 1) { if (order.getRechargeType() != null && order.getRechargeType() == 1) {
outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo()); outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
} }
} }

@ -346,7 +346,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
} }
order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号 order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号
order.setPayRealPrice(order.getPayPrice()); // 实付金额 order.setPayRealPrice(order.getPayPrice()); // 实付金额
if (order.getRechargeType() == 1) { if (order.getRechargeType() != null && order.getRechargeType() == 1) {
outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo()); outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
} }
order.setStatus(2); order.setStatus(2);
@ -370,7 +370,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
highUserService.goldHandle(userId, goldNum, 2, 2, order.getId()); highUserService.goldHandle(userId, goldNum, 2, 2, order.getId());
order.setPayRealPrice(order.getPayPrice()); // 实付金额 order.setPayRealPrice(order.getPayPrice()); // 实付金额
order.setStatus(2); order.setStatus(2);
if (order.getRechargeType() == 1) { if (order.getRechargeType() != null && order.getRechargeType() == 1) {
outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo()); outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
} }
order.setPayType(3); order.setPayType(3);

Loading…
Cancel
Save