diff --git a/hai-bweb/src/main/java/com/bweb/controller/ApiMchProduct/ApiMchProductController.java b/hai-bweb/src/main/java/com/bweb/controller/ApiMchProduct/ApiMchProductController.java
index 7d826eb5..743800ba 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/ApiMchProduct/ApiMchProductController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/ApiMchProduct/ApiMchProductController.java
@@ -1,15 +1,30 @@
 package com.bweb.controller.ApiMchProduct;
 
+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.security.SessionObject;
 import com.hai.common.security.UserCenter;
+import com.hai.common.utils.ResponseMsgUtil;
+import com.hai.model.ResponseData;
+import com.hai.model.UserInfoModel;
 import com.hai.openApi.service.ApiMchProductService;
+import com.hai.order.type.OrderProductType;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
 
 @Controller
 @RequestMapping(value = "/apiMchProduct")
@@ -24,4 +39,47 @@ public class ApiMchProductController {
     @Autowired
     private UserCenter userCenter;
 
+
+    @RequestMapping(value = "/insertMchProduct", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "新增产品")
+    public ResponseData insertMchProduct(@RequestBody JSONObject object, HttpServletRequest request) {
+        try {
+
+            SessionObject sessionObject = userCenter.getSessionObject(request);
+            UserInfoModel userInfoModel = (UserInfoModel) sessionObject.getObject();
+
+            if (object == null ||
+                    object.getInteger("productType") == null ||
+                    object.getString("mchId") == null ||
+                    object.getBigDecimal("discount") == null
+            ) {
+                log.error("ApiProductController -> insertProduct() error!");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+
+            if (Objects.equals(object.getInteger("productType"), OrderProductType.PRODUCT_TYPE6.getNumber())) {
+                if (object.getLong("companyId") == null ||
+                        object.getString("merchantId") == null
+                ) {
+                    log.error("ApiProductController -> insertProduct() error!");
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+                }
+            }
+
+
+            object.put("operatorId", userInfoModel.getSecUser().getId());
+            object.put("operatorName", userInfoModel.getSecUser().getLoginName());
+
+
+
+            apiMchProductService.insertMchProduct(object);
+
+            return ResponseMsgUtil.success("新增成功");
+
+        } catch (Exception e) {
+            log.error("ApiProductController --> insertPrice() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
 }
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 77fb172e..64174746 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;

    @Resource
    private HighOrderService highOrderService;


    @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) {
            object = new JSONObject();

            OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(order.getOrderNo());
            OutRechargeChildOrder childOrder = outRechargeOrder.getOutRechargeChildOrders().get(0);
            try {
                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 (childOrder.getStatus() != 101) {
                            // 龙阅
                            if (childOrder.getRechargePlatform() == 2) {

                                object.put("out_trade_nums" , childOrder.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() , childOrder);
                                } else {
                                    // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                                    // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                                    if (objectData.getInteger("state") == 2 || objectData.getInteger("state") == -1) {
                                        outRechargeOrderService.refundOrder(outRechargeOrder.getId() , childOrder);
                                    } else if (objectData.getInteger("state") == 1) {
                                        outRechargeOrderService.completeOrder(outRechargeOrder , childOrder);
                                    }
                                }

                            }
                            // 嗨购
                            if (childOrder.getRechargePlatform() == 4) {
                                object.put("orderid" , childOrder.getOrderNo());

                                JSONObject jsonObject = RechargeConfig.checkOrderByHg(object);
                                if (jsonObject.getJSONArray("data") == null) {
                                    outRechargeOrderService.refundOrder(outRechargeOrder.getId() , childOrder);
                                } else {
                                    JSONArray objectJSONArray = jsonObject.getJSONArray("data");
                                    JSONObject objectData;
                                    for (Object objects : objectJSONArray) {
                                        objectData =  (JSONObject) objects;
                                        // 充值中1成功2失败3已取消4部分充值5缓存订单
                                        if (objectData.getInteger("status") == 2 || objectData.getInteger("status") == 3) {
                                            outRechargeOrderService.refundOrder(outRechargeOrder.getId() , childOrder);
                                        } else if (objectData.getInteger("status") == 1) {
                                            outRechargeOrderService.completeOrder(outRechargeOrder , childOrder);
                                        }
                                    }
                                }
                            }
                        }
                    }


                }
            } catch (Exception e) {
                log.error("HighUserCardController --> oilCardRefund() error!", 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();

            OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(orderNo);
            OutRechargeChildOrder outRechargeChildOrder = outRechargeOrder.getOutRechargeChildOrders().get(0);
            object.put("out_trade_nums" , outRechargeChildOrder.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() , outRechargeChildOrder);
            } else {
                if (objectData.getInteger("state") == 2 || objectData.getInteger("state") == -1) {
                    outRechargeOrderService.refundOrder(outRechargeOrder.getId() , outRechargeChildOrder);
                } else if (objectData.getInteger("state") == 1) {
                    outRechargeOrderService.completeOrder(outRechargeOrder , outRechargeChildOrder);
                }
            }

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


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

            JSONObject object = new JSONObject();

            OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(orderNo);
            OutRechargeChildOrder outRechargeChildOrder = outRechargeOrder.getOutRechargeChildOrders().get(0);
            object.put("out_trade_nums" , outRechargeChildOrder.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) {
                return ResponseMsgUtil.success("无订单退款");
            } else {
                if (objectData.getInteger("state") == 2 || objectData.getInteger("state") == -1) {
                    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);
        }
    }


    @RequestMapping(value = "/phoneBillOrderMigration", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "话费订单迁移")
    public ResponseData phoneBillOrderMigration() {
        try {

            Map<String , Object> map = new HashMap<>();
            map.put("productType" , 9);

            List<HighOrder> list  = highOrderService.getOrderList(map);

            for (HighOrder order : list) {
                OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(order.getOrderNo());

                order.setTitle(orderTitle(outRechargeOrder));

                highOrderService.updateOrderDetail(order);
            }

            return ResponseMsgUtil.success(list);

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



    public String orderTitle(OutRechargeOrder outRechargeOrder) {
        // 1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
        //  101.待支付 102.已支付 100.已完成 104.已取消 105.已退款
        switch (outRechargeOrder.getOperatorType()) {
            case 1:
                return outRechargeOrder.getRechargeContent() + "电信话费充值" + outRechargeOrder.getRechargePrice() + "元";
            case 2:
                return outRechargeOrder.getRechargeContent() + "移动话费充值" + outRechargeOrder.getRechargePrice() + "元";
            case 3:
                return outRechargeOrder.getRechargeContent() + "联通话费充值" + outRechargeOrder.getRechargePrice() + "元";
            default:
                return null;
        }
    }
}


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

    @Resource
    private HighOrderService highOrderService;


    @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();
        for (HighOrder order: highOrders) {

            try {

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

                OutRechargeChildOrder childOrder = new OutRechargeChildOrder();

                if (outRechargeOrder.getOutRechargeChildOrders().size() > 0) {
                    childOrder = outRechargeOrder.getOutRechargeChildOrders().get(0);
                }
                outRechargeOrderService.rechargeOrderHandle(outRechargeOrder , childOrder);


            } catch (Exception e) {
                log.error("HighCouponSchedule --> expiredCoupon() error!", e);
            }
        }

        return ResponseMsgUtil.success("操作成功");

    }


    @RequestMapping(value = "/checkOrderByOrderNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据订单号话费查询是否可以退款")
    public ResponseData checkOrderByOrderNo(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(orderNo);

            OutRechargeChildOrder childOrder = new OutRechargeChildOrder();

            if (outRechargeOrder.getOutRechargeChildOrders().size() > 0) {
                childOrder = outRechargeOrder.getOutRechargeChildOrders().get(0);
            }
            outRechargeOrderService.rechargeOrderHandle(outRechargeOrder , childOrder);


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


    public String orderTitle(OutRechargeOrder outRechargeOrder) {
        // 1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
        //  101.待支付 102.已支付 100.已完成 104.已取消 105.已退款
        switch (outRechargeOrder.getOperatorType()) {
            case 1:
                return outRechargeOrder.getRechargeContent() + "电信话费充值" + outRechargeOrder.getRechargePrice() + "元";
            case 2:
                return outRechargeOrder.getRechargeContent() + "移动话费充值" + outRechargeOrder.getRechargePrice() + "元";
            case 3:
                return outRechargeOrder.getRechargeContent() + "联通话费充值" + outRechargeOrder.getRechargePrice() + "元";
            default:
                return null;
        }
    }
}


\ No newline at end of file
diff --git a/hai-schedule/src/main/java/com/hai/schedule/HighRechargeOrderSchedule.java b/hai-schedule/src/main/java/com/hai/schedule/HighRechargeOrderSchedule.java
index 805de457..ddf8e019 100644
--- a/hai-schedule/src/main/java/com/hai/schedule/HighRechargeOrderSchedule.java
+++ b/hai-schedule/src/main/java/com/hai/schedule/HighRechargeOrderSchedule.java
@@ -102,8 +102,11 @@ public class HighRechargeOrderSchedule {
 
                 OutRechargeOrder outRechargeOrder = outRechargeOrderService.findByOrderNo(order.getOrderNo());
 
-                OutRechargeChildOrder childOrder = outRechargeOrder.getOutRechargeChildOrders().get(0);
+                OutRechargeChildOrder childOrder = new OutRechargeChildOrder();
 
+                if (outRechargeOrder.getOutRechargeChildOrders().size() > 0) {
+                    childOrder = outRechargeOrder.getOutRechargeChildOrders().get(0);
+                }
                 outRechargeOrderService.rechargeOrderHandle(outRechargeOrder , childOrder);
 
 
diff --git a/hai-service/src/main/java/com/hai/openApi/service/ApiMchProductService.java b/hai-service/src/main/java/com/hai/openApi/service/ApiMchProductService.java
index b4b3d283..e5f6e848 100644
--- a/hai-service/src/main/java/com/hai/openApi/service/ApiMchProductService.java
+++ b/hai-service/src/main/java/com/hai/openApi/service/ApiMchProductService.java
@@ -1,5 +1,6 @@
 package com.hai.openApi.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.hai.entity.ApiMchProduct;
 
 import java.util.List;
@@ -22,7 +23,7 @@ public interface ApiMchProductService {
      * @Param [apiMchProduct]
      * @Return void
      */
-    void insertMchProduct(ApiMchProduct apiMchProduct);
+    void insertMchProduct(JSONObject object);
     /**
      * @Author Sum1Dream
      * @Name updateMchProduct
diff --git a/hai-service/src/main/java/com/hai/openApi/service/impl/ApiMchProductServiceImpl.java b/hai-service/src/main/java/com/hai/openApi/service/impl/ApiMchProductServiceImpl.java
index 338aed5a..c58e1410 100644
--- a/hai-service/src/main/java/com/hai/openApi/service/impl/ApiMchProductServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/openApi/service/impl/ApiMchProductServiceImpl.java
@@ -1,5 +1,6 @@
 package com.hai.openApi.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.hai.dao.ApiMchProductMapper;
 import com.hai.entity.ApiMchProduct;
 import com.hai.openApi.service.ApiMchProductService;
@@ -16,8 +17,8 @@ public class ApiMchProductServiceImpl implements ApiMchProductService {
     private ApiMchProductMapper apiMchProductMapper;
 
     @Override
-    public void insertMchProduct(ApiMchProduct apiMchProduct) {
-        apiMchProductMapper.insert(apiMchProduct);
+    public void insertMchProduct(JSONObject object) {
+//        apiMchProductMapper.insert(apiMchProduct);
     }
 
     @Override
diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
index 7ca4f502..76f58594 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
@@ -561,7 +561,7 @@ public class OrderServiceImpl implements OrderService {
         order.setRefundTime(new Date());
         order.setOrderStatus(OrderStatus.STATUS4.getNumber());
 
-        /*//  退回金额，原路返回
+        //  退回金额，原路返回
         RefundPriceModel refundPrice = orderRefundService.refundPrice(refundOrderNo
                 , order
                 , OrderPayType.getDataByType(order.getPayType())
@@ -569,7 +569,7 @@ public class OrderServiceImpl implements OrderService {
                 , order.getPayGold());
         if (!refundPrice.getRefundSuccess()) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败，请稍后重试");
-        }*/
+        }
 
         List<HighOrderRefund> refundList = orderRefundService.getRefundByRefundNo(refundOrderNo);
         for (HighOrderRefund orderRefund : refundList) {