hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pre' into dev

Browse Source
dev-discount
胡锐 3 years ago
parent 0b534f4a9e 6f4fe98e6f
commit fd447b24ea
1 changed files with 14 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java

26
hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
Unescape View File

@ -125,19 +125,21 @@ 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.getRechargeType() == 1) { if (order.getStatus() == 2) {
String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5); if (order.getRechargeType() == 1) {
JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo , order.getRechargeType()); String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5);
if (object.getInteger("code") != 200) { JSONObject object = outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo , order.getRechargeType());
order.setRechargeStatus(1); if (object.getInteger("code") != 200) {
order.setAbnormalMsg(object.getString("message")); order.setRechargeStatus(1);
order.setAbnormalMsg(object.getString("message"));
}
outRechargeOrderService.updateOrder(order);
rechargeOrderRecord.setRechargeOrderId(order.getId());
rechargeOrderRecord.setRechargeOrderNo(orderNo);
rechargeOrderRecord.setCreateTime(new Date());
rechargeOrderRecord.setStatus(1);
rechargeOrderRecordService.insertOrder(rechargeOrderRecord);
} }
outRechargeOrderService.updateOrder(order);
rechargeOrderRecord.setRechargeOrderId(order.getId());
rechargeOrderRecord.setRechargeOrderNo(orderNo);
rechargeOrderRecord.setCreateTime(new Date());
rechargeOrderRecord.setStatus(1);
rechargeOrderRecordService.insertOrder(rechargeOrderRecord);
} }
} else { } else {
// 查询订单 // 查询订单

Write Preview
Loading…
Cancel
Save