修改话费订单导出

hai-bweb/src/main/java/com/bweb/excelListener/ImportRechargeOrderListener.java

@@ -40,7 +40,7 @@ public class ImportRechargeOrderListener extends AnalysisEventListener<ExportOut
 
         OutRechargeOrder rechargeOrder = outRechargeOrderService.findByOrderNo(data.getOrderNo());
 
-        if (rechargeOrder.getRechargeStatus() != 201 || rechargeOrder.getRechargeType() != 2) {
+        if (rechargeOrder.getRechargeStatus() != 203 || rechargeOrder.getRechargeType() != 2) {
             data.setErrorMessage("当前订单状态错误。");
             errorData.add(data);
             return;
@@ -56,7 +56,6 @@ public class ImportRechargeOrderListener extends AnalysisEventListener<ExportOut
                 errorData.add(data);
                 return;
             }
-
         }
 
 

hai-service/src/main/java/com/hai/config/CommonSysConfig.java

@@ -61,7 +61,7 @@ public class CommonSysConfig {
     private String czOrderNotify;
 
     private String lyApiKey;
-    private String lyNotifyUrl;
+    private String LyNotifyUrl;
     private String lyMemberId;
     private String LyPostUrl;
 
@@ -467,10 +467,10 @@ public class CommonSysConfig {
     }
 
     public String getLyNotifyUrl() {
-        return lyNotifyUrl;
+        return LyNotifyUrl;
     }
 
     public void setLyNotifyUrl(String lyNotifyUrl) {
-        this.lyNotifyUrl = lyNotifyUrl;
+        LyNotifyUrl = lyNotifyUrl;
     }
 }

hai-service/src/main/java/com/hai/config/HuiLianTongConfig.java

@@ -13,6 +13,7 @@ import com.hai.dao.HighGasOrderPushMapper;
 import com.hai.entity.HighCouponCodeOther;
 import com.hai.entity.HighGasOrderPush;
 import com.hai.entity.HighUserCoupon;
+import com.hai.enum_type.OrderPushType;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
@@ -136,6 +137,7 @@ public class HuiLianTongConfig {
         JSONObject object1 = HttpsUtils.doHuiLianTongPost(CommonSysConst.getSysConfig().getHuiliantongUrl() + "/coupon/api/coupon_corp/couJointDist?" + paramStr);
 
         new Thread(() -> {
+            try {
                 if (object1 != null && object1.getString("result").equals("success")) {
                     JSONArray dataArray = object1.getJSONArray("data");
                     for (Object data : dataArray) {
@@ -150,12 +152,14 @@ public class HuiLianTongConfig {
                         mapPost.put("couTypeCode" , dataObject.getString("couTypeCode"));
                         mapPost.put("validStartDate" , dataObject.getDate("validStartDate"));
                         mapPost.put("validEndDate" , dataObject.getDate("validEndDate"));
-                    try {
+                        JSONObject o = HuiLianTongUnionCardConfig.syncPayOrder(mapPost);
-                        HuiLianTongUnionCardConfig.syncPayOrder(mapPost);
+                        System.out.println("订单同步请求参数---------" + mapPost);
-                    } catch (Exception e) {
+                        System.out.println("订单同步请求结果---------" + o);
-                        e.printStackTrace();
+
                     }
                 }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }).start();
 

hai-service/src/main/java/com/hai/config/RechargeConfig.java

@@ -63,7 +63,7 @@ public class RechargeConfig {
         paramMap.put("out_trade_num" , object.getString("out_trade_num"));
         paramMap.put("product_id" , object.getString("product_id"));
         paramMap.put("mobile" , object.getString("mobile"));
-        paramMap.put("notify_url" , CommonSysConst.getSysConfig().getLyNotifyUrl());
+        paramMap.put("notify_url" , object.getString("notifyUrl"));
         paramMap.put("userid" , CommonSysConst.getSysConfig().getLyMemberId());
         paramMap.put("sign", WxUtils.generateSignatureLy(paramMap , CommonSysConst.getSysConfig().getLyApiKey() , WXPayConstants.SignType.MD5));
         return HttpsUtils.doPost(CommonSysConst.getSysConfig().getLyPostUrl()+ "index/recharge", paramMap);
@@ -108,8 +108,7 @@ public class RechargeConfig {
         map.put("app_key" , CommonSysConst.getSysConfig().getJjAppKey());
         map.put("timestamp" , timestamp.substring(0,timestamp.length()-3));
         map.put("is_fast" , object.getString("is_fast"));
-        map.put("notify_url" , CommonSysConst.getSysConfig().getJjNotifyUrl());
+        map.put("notify_url" , object.getString("notifyUrl"));
-
         String signStr = WxUtils.generateSignatureAppSecret(map, CommonSysConst.getSysConfig().getJjAppSecret() , WXPayConstants.SignType.MD5);
 
         map.put("sign" , signStr);

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

@@ -596,9 +596,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         if (order.getRechargeStatus() == 201) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法退款，订单处于充值中状态");
         }
-
-        //  1：支付宝  2：微信  3：汇联通工会卡  4：银联   5：银联分期
-        if (order.getPayType() == null) {
         // 退还积分
         if (order.getIntegralNum() != null) {
             highUserService.goldHandle(order.getUserId(), order.getIntegralNum().intValue(), 1, 3, order.getId());
@@ -609,7 +606,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
                 outRechargeOrderService.updateOrder(order);
             }
         }
-        } else {
         // 微信退款
         if (order.getPayType() == 2) {
             Map<String, String> param = new HashMap<>();
@@ -679,7 +675,6 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
             order.setRefundFee(order.getPayRealPrice());
             outRechargeOrderService.updateOrder(order);
         }
-        }
 
 
         if (order.getMemDiscountId() != null) {
@@ -755,6 +750,23 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
             outRechargeChildOrderService.updateOrder(childOrder);
             type = childOrder.getRechargePlatform();
 
+        } else {
+            // 查询充值子订单
+            Map<String, Object> childOrderMap103 = new HashMap<>();
+
+            childOrderMap.put("parent_order_id", outRechargeOrder.getId());
+            childOrderMap.put("status", 103);
+
+            List<OutRechargeChildOrder> childOrderList103 = outRechargeChildOrderService.getListRechargeChildOrder(childOrderMap103);
+            if (childOrderList103.size() > 0) {
+                type = childOrderList103.get(0).getRechargePlatform();
+            }
+        }
+
+        if (type == 2) {
+            type = 1;
+        } else {
+            type++;
         }
 
         JSONObject object = new JSONObject();
@@ -765,10 +777,12 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
 
         for (String s : rechargePlatform) {
             // 尖椒充值
-            if (s.equals("1") && (type == 2 || type == 0)) {
+            if (s.equals("1") && type == 1) {
                 object.put("out_order_id", orderNo);
                 object.put("amount", outRechargePrice.getRechargePrice());
                 object.put("mobile", outRechargeOrder.getRechargeContent());
+                object.put("notifyUrl", CommonSysConst.getSysConfig().getJjNotifyUrl());
+                System.out.println("尖椒请求回调地址---------------------" + CommonSysConst.getSysConfig().getJjNotifyUrl());
                 if (outRechargePrice.getRechargeType() == 1) {
                     object.put("is_fast", 1);
                 }
@@ -782,11 +796,14 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
                 rechargePlatformType = 1;
                 break;
             }
-            if (s.equals("2") && (type == 1 || type == 0)) {
+            // 龙阅充值
+            if (s.equals("2") && type == 2) {
                 object.put("out_trade_num", orderNo);
                 object.put("product_id", outRechargePrice.getGoodsId());
                 object.put("mobile", outRechargeOrder.getRechargeContent());
+                object.put("notifyUrl", CommonSysConst.getSysConfig().getLyNotifyUrl());
                 JSONObject returnObject = RechargeConfig.rechargeOrderByLy(object);
+                System.out.println("龙阅请求回调地址---------------------" + CommonSysConst.getSysConfig().getLyNotifyUrl());
                 object.put("return_content", returnObject);
                 if (returnObject != null && returnObject.getLong("errno") == 0) {
                     childOrder.setStatus(102);