Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

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) {

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);

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) {

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);

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);

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);