diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
index 0f849a8a..913cd70e 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
@@ -1 +1 @@
-
package com.bweb.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.domain.ForbbidenTime;
import com.alipay.api.domain.OfferObject;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.*;
import com.hai.config.*;
import com.hai.entity.*;
import com.hai.model.OrderRefundModel;
import com.hai.model.ResponseData;
import com.hai.order.service.OrderRefundService;
import com.hai.order.service.OrderService;
import com.hai.order.type.OrderRefundOpUserType;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
 * @Auther: 胡锐
 * @Description:
 * @Date: 2021/3/26 23:08
 */
@Controller
@RequestMapping(value = "/test")
@Api(value = "订单接口")
public class HighTestController {

    private static Logger log = LoggerFactory.getLogger(HighTestController.class);


    @Resource
    private OutRechargeOrderService outRechargeOrderService;

    @Resource
    private OrderService orderService;


    @RequestMapping(value="/resolveResponse",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "解析")
    public ResponseData resolveResponse(
            @RequestParam(name = "data", required = false) String data
    ) {
        try {
            JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(data);
            return ResponseMsgUtil.success(cardInfoObject);

        } catch (Exception e) {
            log.error("getUserByTelephone",e);
            return ResponseMsgUtil.exception(e);
        }
    }



    @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询汇联通工会卡消费记录")
    public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType,
                                                  @RequestParam(name = "cardNo", required = true) String cardNo,
                                                  @RequestParam(name = "sdate", required = true) Long sdate,
                                                  @RequestParam(name = "edate", required = true) Long edate,
                                                  @RequestParam(name = "pageNum", required = true) Integer pageNum,
                                                  @RequestParam(name = "pageSize", required = true) Integer pageSize,
                                                  HttpServletRequest request) {
        try {


            JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize);
            if (StringUtils.isBlank(consumptionRecord.getString("data"))) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, "");
            }

            JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records");

            return ResponseMsgUtil.success(array);

        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/insertV2", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "支付")
    public ResponseData insertV2() {
        try {

            Map<String , Object> map = new HashMap<>();
            map.put("timetable" , new Date().getTime());
            map.put("apiKey" , "9A838BEBC60712775E119366DB804C43");
            map.put("orderNo" , "20220329182036435619");
            map.put("count" , "1");
            map.put("couTypeCode" , "test");
            map.put("phone" , "15206071196");
            map.put("merchId" , "20220670800");
            map.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsgcs.dctpay.com/v1/gzSinopec/couJointDist" , map));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }



    @RequestMapping(value = "/phoneBillOrderError", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "话费订单错误")
    public ResponseData phoneBillOrderError() {
        try {

        List<HighOrder> highOrders = orderService.phoneErrorOrder();

        JSONObject object;

        for (HighOrder order: highOrders) {

            object = new JSONObject();

            OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(order.getOrderNo());

            if (outRechargeOrder.getPayStatus() == 102 && outRechargeOrder.getRechargeStatus() != 202) {

                if (outRechargeOrder.getOutRechargeChildOrders().size() == 0) {

                    OutRechargeChildOrder outRechargeChildOrder = new OutRechargeChildOrder();

                    outRechargeChildOrder.setOrderNo("CZ" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5));
                    outRechargeChildOrder.setParentOrderId(outRechargeOrder.getId());
                    outRechargeChildOrder.setUpdateTime(new Date());
                    outRechargeChildOrder.setCreateTime(new Date());

                    outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeChildOrder);
                } else {
                    if (outRechargeOrder.getOutRechargeChildOrders().get(0).getStatus() != 101) {
                        // 龙阅
                        if (outRechargeOrder.getOutRechargeChildOrders().get(0).getRechargePlatform() == 2) {

                            object.put("out_trade_nums" , outRechargeOrder.getOutRechargeChildOrders().get(0).getOrderNo());

                            JSONObject jsonObject = RechargeConfig.checkOrderByLy(object);

                            JSONArray objectJSONArray = jsonObject.getJSONArray("data");
                            JSONObject objectData = new JSONObject();
                            for (Object objects : objectJSONArray) {
                                objectData =  (JSONObject) objects;
                            }
                            if (objectData.size() == 0) {
                                outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeOrder.getOutRechargeChildOrders().get(0));
                            } else {
                                // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                                // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                                if (objectData.getInteger("state") == 2) {
                                    outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeOrder.getOutRechargeChildOrders().get(0));
                                } else if (objectData.getInteger("state") == 1) {
                                    outRechargeOrderService.completeOrder(outRechargeOrder , outRechargeOrder.getOutRechargeChildOrders().get(0));
                                }
                            }

                        }
                    }
                }


            }

        }

            return ResponseMsgUtil.success("null");

        } catch (Exception e) {
            log.error("HighUserCardController --> oilCardRefund() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }



    @RequestMapping(value = "/checkOrderByLy", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "龙阅话费查询")
    public ResponseData checkOrderByLy(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            JSONObject object = new JSONObject();

            object.put("out_trade_nums" , orderNo);

            JSONObject jsonObject = RechargeConfig.checkOrderByLy(object);

            JSONArray objectJSONArray = jsonObject.getJSONArray("data");

            JSONObject objectData = new JSONObject();
            for (Object objects : objectJSONArray) {
                objectData =  (JSONObject) objects;
            }
            if (objectData.size() == 0) {
                return ResponseMsgUtil.success("话费退款");
            } else {
                if (objectData.getInteger("state") == 2) {
                    return ResponseMsgUtil.success("话费退款");
                } else if (objectData.getInteger("state") == 1) {
                    return ResponseMsgUtil.success("话费完成");
                }
            }

            return ResponseMsgUtil.success(objectJSONArray);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

}


\ No newline at end of file
+
package com.bweb.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.domain.ForbbidenTime;
import com.alipay.api.domain.OfferObject;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.*;
import com.hai.config.*;
import com.hai.entity.*;
import com.hai.model.OrderRefundModel;
import com.hai.model.ResponseData;
import com.hai.order.service.OrderRefundService;
import com.hai.order.service.OrderService;
import com.hai.order.type.OrderRefundOpUserType;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
 * @Auther: 胡锐
 * @Description:
 * @Date: 2021/3/26 23:08
 */
@Controller
@RequestMapping(value = "/test")
@Api(value = "订单接口")
public class HighTestController {

    private static Logger log = LoggerFactory.getLogger(HighTestController.class);


    @Resource
    private OutRechargeOrderService outRechargeOrderService;

    @Resource
    private OrderService orderService;


    @RequestMapping(value="/resolveResponse",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "解析")
    public ResponseData resolveResponse(
            @RequestParam(name = "data", required = false) String data
    ) {
        try {
            JSONObject cardInfoObject = HuiLianTongUnionCardConfig.resolveResponse(data);
            return ResponseMsgUtil.success(cardInfoObject);

        } catch (Exception e) {
            log.error("getUserByTelephone",e);
            return ResponseMsgUtil.exception(e);
        }
    }



    @RequestMapping(value = "/getHuiLianTongCardConsume", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询汇联通工会卡消费记录")
    public ResponseData getHuiLianTongCardConsume(@RequestParam(name = "businessType", required = true) String businessType,
                                                  @RequestParam(name = "cardNo", required = true) String cardNo,
                                                  @RequestParam(name = "sdate", required = true) Long sdate,
                                                  @RequestParam(name = "edate", required = true) Long edate,
                                                  @RequestParam(name = "pageNum", required = true) Integer pageNum,
                                                  @RequestParam(name = "pageSize", required = true) Integer pageSize,
                                                  HttpServletRequest request) {
        try {


            JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize);
            if (StringUtils.isBlank(consumptionRecord.getString("data"))) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, "");
            }

            JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records");

            return ResponseMsgUtil.success(array);

        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/insertV2", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "支付")
    public ResponseData insertV2() {
        try {

            Map<String , Object> map = new HashMap<>();
            map.put("timetable" , new Date().getTime());
            map.put("apiKey" , "9A838BEBC60712775E119366DB804C43");
            map.put("orderNo" , "20220329182036435619");
            map.put("count" , "1");
            map.put("couTypeCode" , "test");
            map.put("phone" , "15206071196");
            map.put("merchId" , "20220670800");
            map.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsgcs.dctpay.com/v1/gzSinopec/couJointDist" , map));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }



    @RequestMapping(value = "/phoneBillOrderError", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "话费订单错误")
    public ResponseData phoneBillOrderError() {

        List<HighOrder> highOrders = orderService.phoneErrorOrder();

        JSONObject object;

        for (HighOrder order: highOrders) {
            try {
            object = new JSONObject();

            OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(order.getOrderNo());

            if (outRechargeOrder.getPayStatus() == 102 && outRechargeOrder.getRechargeStatus() != 202) {

                if (outRechargeOrder.getOutRechargeChildOrders().size() == 0) {

                    OutRechargeChildOrder outRechargeChildOrder = new OutRechargeChildOrder();

                    outRechargeChildOrder.setOrderNo("CZ" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5));
                    outRechargeChildOrder.setParentOrderId(outRechargeOrder.getId());
                    outRechargeChildOrder.setUpdateTime(new Date());
                    outRechargeChildOrder.setCreateTime(new Date());

                    outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeChildOrder);
                } else {
                    if (outRechargeOrder.getOutRechargeChildOrders().get(0).getStatus() != 101) {
                        // 龙阅
                        if (outRechargeOrder.getOutRechargeChildOrders().get(0).getRechargePlatform() == 2) {

                            object.put("out_trade_nums" , outRechargeOrder.getOutRechargeChildOrders().get(0).getOrderNo());

                            JSONObject jsonObject = RechargeConfig.checkOrderByLy(object);

                            JSONArray objectJSONArray = jsonObject.getJSONArray("data");
                            JSONObject objectData = new JSONObject();
                            for (Object objects : objectJSONArray) {
                                objectData =  (JSONObject) objects;
                            }
                            if (objectData.size() == 0) {
                                outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeOrder.getOutRechargeChildOrders().get(0));
                            } else {
                                // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                                // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                                if (objectData.getInteger("state") == 2) {
                                    outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeOrder.getOutRechargeChildOrders().get(0));
                                } else if (objectData.getInteger("state") == 1) {
                                    outRechargeOrderService.completeOrder(outRechargeOrder , outRechargeOrder.getOutRechargeChildOrders().get(0));
                                }
                            }

                        }
                    }
                }


            }
            } catch (Exception e) {
                log.error("HighUserCardController --> oilCardRefund() error!", e);
                return ResponseMsgUtil.exception(e);
            }
        }

            return ResponseMsgUtil.success("null");


    }



    @RequestMapping(value = "/checkOrderByLy", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "龙阅话费查询")
    public ResponseData checkOrderByLy(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            JSONObject object = new JSONObject();

            object.put("out_trade_nums" , orderNo);

            JSONObject jsonObject = RechargeConfig.checkOrderByLy(object);

            JSONArray objectJSONArray = jsonObject.getJSONArray("data");

            JSONObject objectData = new JSONObject();
            for (Object objects : objectJSONArray) {
                objectData =  (JSONObject) objects;
            }
            if (objectData.size() == 0) {
                return ResponseMsgUtil.success("话费退款");
            } else {
                if (objectData.getInteger("state") == 2) {
                    return ResponseMsgUtil.success("话费退款");
                } else if (objectData.getInteger("state") == 1) {
                    return ResponseMsgUtil.success("话费完成");
                }
            }

            return ResponseMsgUtil.success(objectJSONArray);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

}


\ No newline at end of file