Merge branch 'pre' into dev

hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java

@@ -125,6 +125,7 @@ public class CzOrderController {
                     rechargeOrderRecord = new OutRechargeOrderRecord();
                     // 查询订单
                     OutRechargeOrder order = outRechargeOrderService.findByOrderNo(dataObject.getString("out_order_id"));
+                    if (order.getStatus() == 2) {
                         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());
@@ -139,6 +140,7 @@ public class CzOrderController {
                             rechargeOrderRecord.setStatus(1);
                             rechargeOrderRecordService.insertOrder(rechargeOrderRecord);
                         }
+                    }
                 } else {
                     // 查询订单
                     OutRechargeOrder order = outRechargeOrderService.findByOrderId(rechargeOrderRecord.getRechargeOrderId());