|
|
@ -125,6 +125,7 @@ public class CzOrderController { |
|
|
|
rechargeOrderRecord = new OutRechargeOrderRecord(); |
|
|
|
rechargeOrderRecord = new OutRechargeOrderRecord(); |
|
|
|
// 查询订单
|
|
|
|
// 查询订单
|
|
|
|
OutRechargeOrder order = outRechargeOrderService.findByOrderNo(dataObject.getString("out_order_id")); |
|
|
|
OutRechargeOrder order = outRechargeOrderService.findByOrderNo(dataObject.getString("out_order_id")); |
|
|
|
|
|
|
|
if (order.getStatus() == 2) { |
|
|
|
if (order.getRechargeType() == 1) { |
|
|
|
if (order.getRechargeType() == 1) { |
|
|
|
String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5); |
|
|
|
String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5); |
|
|
|
JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo , order.getRechargeType()); |
|
|
|
JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo , order.getRechargeType()); |
|
|
@ -139,6 +140,8 @@ public class CzOrderController { |
|
|
|
rechargeOrderRecord.setStatus(1); |
|
|
|
rechargeOrderRecord.setStatus(1); |
|
|
|
rechargeOrderRecordService.insertOrder(rechargeOrderRecord); |
|
|
|
rechargeOrderRecordService.insertOrder(rechargeOrderRecord); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// 查询订单
|
|
|
|
// 查询订单
|
|
|
|
OutRechargeOrder order = outRechargeOrderService.findByOrderId(rechargeOrderRecord.getRechargeOrderId()); |
|
|
|
OutRechargeOrder order = outRechargeOrderService.findByOrderId(rechargeOrderRecord.getRechargeOrderId()); |
|
|
|