提交修改

hai-cweb/src/main/java/com/cweb/config/AuthConfig.java

@@ -116,7 +116,6 @@ public class AuthConfig implements WebMvcConfigurer {
 	      .excludePathPatterns("/highUser/delCacheParam")
 	      .excludePathPatterns("/order/orderToH5Pay")
 	      .excludePathPatterns("/order/orderToPay")
-	      .excludePathPatterns("/test/*")
 	      .excludePathPatterns("/cmsContent/*")
 		  .excludePathPatterns("/highGas/*")
 		  .excludePathPatterns("/outRechargeOrder/*")

hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java

@@ -475,10 +475,14 @@ public class OutRechargeOrderController {
             outRechargeOrderService.goldPayOrder(userInfoModel.getHighUser().getId(), order.getId());
 
             if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-                outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+               JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+               if (object.getInteger("code") != 200) {
+                   outRechargeOrderService.rechargeOrderToRefund(orderId);
+                   return ResponseMsgUtil.success("充值失败");
+               }
             }
 
-            return ResponseMsgUtil.success("支付成功");
+            return ResponseMsgUtil.success("充值成功");
         } catch (Exception e) {
             log.error("orderToPay error!", e);
             return ResponseMsgUtil.exception(e);

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
+import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.config.CommonSysConst;
 import com.hai.config.HuiLianTongConfig;
 import com.hai.config.TuanYouConfig;
@@ -386,16 +387,16 @@ public class UnionPayController {
 
                     order.setPaySerialNo(body.getString("wtorderid")); // 支付流水号
                     order.setPayRealPrice(order.getPayPrice()); // 实付金额
-                    if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-                        outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
-                    }
 
                     order.setStatus(2);
                     order.setPayType(4);
                     order.setPayTime(new Date()); // 支付时间
                     outRechargeOrderService.updateOrder(order);
                     if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-                        outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
+                        JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+                        if (object.getInteger("code") != 200) {
+                            outRechargeOrderService.rechargeOrderToRefund(order.getId());
+                        }
                     }
                 }
             }

hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java

@@ -68,7 +68,7 @@ public interface OutRechargeOrderMapperExt {
                    " a.user_name userName," +
                    " a.user_phone userPhone," +
                    " case a.recharge_model when 1 then '电信话费' when 2 then '移动话费' when 3 then '联通话费' end rechargeModelName," +
-                   " case a.recharge_type when 1 then '快充' when 2 then '慢充'  end getRechargeTypeName," +
+                   " case a.recharge_type when 1 then '快充' when 2 then '慢充'  end rechargeTypeName," +
                    " a.recharge_content rechargeContent," +
                    " a.remarks remarks," +
                    " a.id_card cardNo," +

hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java

@@ -8,6 +8,7 @@ import com.hai.model.OutRechargeOrderModel;
 import com.hai.model.OutUserOrderModel;
 import io.swagger.models.auth.In;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -157,7 +158,7 @@ public interface OutRechargeOrderService {
 
     /**
     * @Author Sum1Dream
-    * @name orderToRefund.java
+    * @name orderToRefund.java∂
     * @Description // 话费订单退款
     * @Date 4:44 下午 2022/1/24
     * @Param [java.lang.Long]

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -7,10 +7,7 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.pay.util.XmlUtil;
 import com.hai.common.pay.util.sdk.WXPayConstants;
-import com.hai.common.utils.DateUtil;
+import com.hai.common.utils.*;
-import com.hai.common.utils.HttpsUtils;
-import com.hai.common.utils.IDGenerator;
-import com.hai.common.utils.WxUtils;
 import com.hai.config.CommonSysConfig;
 import com.hai.config.CommonSysConst;
 import com.hai.config.HuiLianTongUnionCardConfig;
@@ -347,7 +344,10 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号
         order.setPayRealPrice(order.getPayPrice()); // 实付金额
         if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-            outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+            JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+            if (object.getInteger("code") != 200) {
+                outRechargeOrderService.rechargeOrderToRefund(orderId);
+            }
         }
         order.setStatus(2);
         order.setPayType(2);
@@ -371,7 +371,10 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         order.setPayRealPrice(order.getPayPrice()); // 实付金额
         order.setStatus(2);
         if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-            outRechargeOrderService.getMobile(order.getRechargeContent() , order.getPayPrice().intValue() , order.getOrderNo());
+            JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+            if (object.getInteger("code") != 200) {
+                outRechargeOrderService.rechargeOrderToRefund(orderId);
+            }
         }
         order.setPayType(3);
         order.setPayTime(new Date()); // 支付时间
@@ -406,9 +409,10 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
 
         map.put("sign" , signStr);
 
-        return HttpsUtils.doPost(CommonSysConst.getSysConfig().getCzUrl() , map);
+        return HttpsUtils.doPost(CommonSysConst.getSysConfig().getCzUrl() + "createOrder" , map);
     }
 
+
     @Override
     public void rechargeOrderToRefund(Long orderId) throws Exception {
         OutRechargeOrder order = outRechargeOrderService.findByOrderId(orderId);

hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java

@@ -76,8 +76,11 @@ public class RechargeOrderServiceImpl implements PayService {
                 order.setPayTime(new Date()); // 支付时间
                 order.setStatus(2);      // 订单状态 ： 1.待支付 2.已支付 3.已完成 4.已取消 5.已退款
                 outRechargeOrderService.updateOrder(order);
-                if (order.getRechargeType() == 1) {
+                if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-                    outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+                    JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+                    if (object.getInteger("code") != 200) {
+                        outRechargeOrderService.rechargeOrderToRefund(order.getId());
+                    }
                 }
                 // 推送订单记录
                 HighGasOrderPush highGasOrderPush = new HighGasOrderPush();

hai-service/src/main/resources/dev/commonConfig.properties

@@ -54,5 +54,5 @@ TelMemberId=d13091df65d64aafbf0f35d2093157b7
 // Mobile
 CzNotifyUrl = https://hsgcs.dctpay.com/crest/czOrder/rechargeCallback
 CzAppKey = eaomqcbpdz7yjfih
-CzUrl = https://hfcs.dmjvip.com/index.php/third/mobile/createOrder
+CzUrl = https://hfcs.dmjvip.com/index.php/third/mobile/
 CzAppSecret = xkf9eoq2cjh6uvzp0mtrga134lnibdw8

hai-service/src/main/resources/prod-9401/commonConfig.properties

@@ -46,5 +46,5 @@ TelMemberId=d13091df65d64aafbf0f35d2093157b7
 
 CzNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallback
 CzAppKey = p429mlj3cvn5hb07
-CzUrl = https://jj.dmjvip.com/index.php/third/mobile/createOrder
+CzUrl = https://jj.dmjvip.com/index.php/third/mobile/
 CzAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij

hai-service/src/main/resources/prod/commonConfig.properties

@@ -46,5 +46,5 @@ TelMemberId=d13091df65d64aafbf0f35d2093157b7
 // Mobile
 CzNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallback
 CzAppKey = p429mlj3cvn5hb07
-CzUrl = https://jj.dmjvip.com/index.php/third/mobile/createOrder
+CzUrl = https://jj.dmjvip.com/index.php/third/mobile/
 CzAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij