diff --git a/hai-bweb/src/main/java/com/bweb/controller/FileUploadController.java b/hai-bweb/src/main/java/com/bweb/controller/FileUploadController.java
index 0adea92d..5deb9163 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/FileUploadController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/FileUploadController.java
@@ -76,7 +76,7 @@ public class FileUploadController {
 							// 图片压缩
 							InputStream fis = new FileInputStream(destDirName + File.separator + fileName);
 							System.out.println("图片上传大小" + fis.available());
-							if (fis.available() > 500000) {
+							if (fis.available() > 3000000) {
 								Thumbnails.of(new FileInputStream(destDirName + File.separator + fileName)).scale(0.5).toFile(new File(destDirName + File.separator + fileName));
 							}
 							System.out.println("图片上传日志" + childPath + "/" + fileName);
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 4f15e8f9..f2205952 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.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.enum_type.GasOilPriceStatusEnum;
import com.hai.model.HighMerchantModel;
import com.hai.model.HighMerchantStoreModel;
import com.hai.model.ResponseData;

import com.hai.openApi.config.BlxConfig;
import com.hai.openApi.config.PriceComputeConfig;
import com.hai.openApi.service.ApiOrderService;
import com.hai.order.service.OrderPaySuccessService;
import com.hai.order.service.OrderService;
import com.hai.order.service.impl.OrderPaySuccessServiceImpl;
import com.hai.order.type.OrderPayType;
import com.hai.order.type.OrderProductType;
import com.hai.order.type.OrderRefundOpUserType;
import com.hai.order.type.OrderStatus;
import com.hai.order.utils.OrderUtil;
import com.hai.pay.channel.huipay.config.HuiConfig;
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.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
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.nio.charset.StandardCharsets;
import java.util.*;

/**
 * @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 BsOrderRebateService bsOrderRebateService;



    @Resource
    private PetroConfig petroConfig;


    @Resource
    private HighGoldRecService highGoldRecService;

    @Resource
    private OrderService orderService;
    @Resource
    private HighUserCardService highUserCardService;

    @Resource
    private HighOrderService highOrderService;

    @Resource
    private HighUserService highUserService;

    @Resource
    private HighGasService gasService;

    @Resource
    private HighMerchantService highMerchantService;

    @Resource
    private HighMerchantStoreService highMerchantStoreService;

    @Resource
    private HighGasOilPriceService highGasOilPriceService;

    @Resource
    private OutRechargeOrderService outRechargeOrderService;

    @Resource
    private HuiConfig huiConfig;

    @Resource
    private CommonService commonService;

    @Resource
    private HighOilCardOrderService highOilCardOrderService;

    @Resource
    private HighGasOrderService gasOrderService;
    @Resource
    private ShellGroupService shellGroupService;
    @Resource
    private HighMerchantStoreService merchantStoreService;

    @Resource
    private ApiOrderService apiOrderService;

    @Resource
    private ApiMerchantsService apiMerchantsService;

    @Resource
    private BlxConfig blxConfig;

    @Resource
    private HighGasOilGunNoService gasOilGunNoService;

    @Autowired
    private RedisTemplate redisTemplate;

    @Resource
    private PriceComputeConfig priceComputeConfig;

    @Resource
    private OrderPaySuccessServiceImpl orderPaySuccessService = new OrderPaySuccessServiceImpl();
    @RequestMapping(value = "/orderBusHandle", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "")
    public ResponseData orderBusHandle(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            orderPaySuccessService.orderBusHandle(orderService.getOrderDetailByNo(orderNo));
       /* HighOrder order = orderService.getOrderDetailByNo(orderNo);
        if (order != null) {
            // orderService.refundOrder(orderNo, DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
            // order.setRefundTime(new Date());
            // orderService.updateOrderData(order);
            return ResponseMsgUtil.success("修改成功");
        }*/
            return ResponseMsgUtil.success(null);

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


    @RequestMapping(value = "/gasSyncPayment", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "重庆壳牌推送")
    public ResponseData gasSyncPayment(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            HighGasOrder order = gasOrderService.getDetailByOrderNo(orderNo);
            if (order != null) {
                // 查询油站
                HighMerchantStore store = merchantStoreService.getDetailById(order.getStoreId());
                if (store == null) {
                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到门店");
                }

                return ResponseMsgUtil.success(
                        // 推送加好油
                        shellGroupService.gasSyncPayment(order.getOrderNo(),
                                store.getStoreKey(),
                                order.getPayTime(),
                                order.getGasRefuelPrice(),
                                order.getGasOilNo(),
                                order.getGasGunNo(),
                                order.getPayPrice(),
                                order.getTotalDeductionPrice()
                        )
                );
            }

            return ResponseMsgUtil.success(null);

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


    @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 = "/createOrder", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "创建订单")
    public ResponseData createOrder(@RequestBody JSONObject object) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("orderNo" , OrderUtil.generateOrderNo());
            mapPost.put("productType" , object.getString("productType"));
            mapPost.put("content" , object.getString("content"));

            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/createOrder" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/payOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "支付订单")
    public ResponseData payOrder(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48");
            mapPost.put("merchId" , "20230394901");
            mapPost.put("mchOrderNo" , mchOrderNo);


            Map<String , Object> map = new HashMap<>();
            map.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48");
            map.put("merchId" , "20230394901");
            map.put("mchOrderNo" , mchOrderNo);

            System.out.println(map);

            mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/order/orderPay" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/queryOrderDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询订单详情")
    public ResponseData queryOrderDetail(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645");
            mapPost.put("merchId" , "20230258302");
            mapPost.put("mchOrderNo" , mchOrderNo);


            Map<String , Object> map = new HashMap<>();
            map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645");
            map.put("merchId" , "20230258302");
            map.put("mchOrderNo" , mchOrderNo);

            System.out.println(map);

            mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/queryOrderDetail" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/deposit", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "工会卡充值")
    public ResponseData deposit(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            HighChildOrder highChildOrder = order.getHighChildOrderList().get(0);

            if (order.getOrderStatus() != 2) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误");
            }

            // 汇联通充值
            String goodsDesc = "汇联通充值"+order.getPayPrice()+"元";
            String tranDesc = "";
            String businessType = "ghk_deposit";

            String orderNoAgain = OrderUtil.generateOrderNo();

            order.setOrderStatus(Integer.valueOf(3));
            order.setRemarks("工会卡再次充值订单号" + orderNoAgain);

            highOrderService.updateOrder(order);

            // 汇联通卡充值
            JSONObject deposit = HuiLianTongUnionCardConfig.deposit(orderNoAgain, highChildOrder.getGoodsSpecName(), order.getPayPrice(), businessType, order.getPaySerialNo(), goodsDesc);

            return ResponseMsgUtil.success( HuiLianTongUnionCardConfig.resolveResponse(deposit.getString("data")));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/getHuiLianTongCardByCardNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据卡号查询汇联通工会卡详情")
    public ResponseData getHuiLianTongCardByCardNo(@RequestParam(name = "cardNo", required = true) String cardNo) {
        try {
            // 查询工会卡
            JSONObject cardInfo = HuiLianTongUnionCardConfig.queryBalance(cardNo);
            JSONObject resolveResponse = HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data"));
            return ResponseMsgUtil.success(resolveResponse);

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

    @RequestMapping(value = "/consumption", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "工会卡支付")
    public ResponseData consumption(@RequestParam(name = "payRealPrice", required = true) BigDecimal payRealPrice,
                                    @RequestParam(name = "cardNo", required = true) String cardNo) {
        try {


            String goodsDesc = "";
            String tranDesc = "";
            String instCode = "11101652";
            String businessType = "hisen_consume";


            // 工会卡支付
            JSONObject consumption = HuiLianTongUnionCardConfig.consumption(OrderUtil.generateOrderNo(), cardNo, payRealPrice, businessType, instCode, goodsDesc, tranDesc);
            if (!consumption.getString("respCode").equals("0000")) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage"));
            }
            // 响应参数
            JSONObject consumptionResult = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data"));
            if (consumptionResult.getBoolean("success") != true) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message"));
            }
            return ResponseMsgUtil.success(consumptionResult);

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


    @RequestMapping(value = "/refundOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "工会卡退款")
    public ResponseData refundOrder(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);

            if (order.getOrderStatus() != 2) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误");
            }

            orderService.refundOrder(order, OrderProductType.getDataByType(order.getProductType()).getName() + "退款",OrderRefundOpUserType.TYPE1,
                    null,
                    "系统自动退款");

            if (order.getProductType().equals(4)) {
                HighUser user = highUserService.findByUserId(order.getMemId());

                // 获取应退款积分
                int integralNum = order.getTotalPrice().multiply(new BigDecimal(100)).intValue();

                if ( integralNum> user.getGold()) {
                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "积分数量不足");
                }

                String remark = "订单" + order.getOrderNo() + "退还积分：" + integralNum;
                // 积分退款
                highUserService.goldHandle(user.getId(), integralNum,2, 3, order.getId() , remark , order.getOrderNo());
            }


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


    @RequestMapping(value = "/externalOrderRefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "对外订单退款")
    public ResponseData externalOrderRefund(@RequestParam(name = "paySerialNo", required = true) String paySerialNo,
                                            @RequestParam(name = "WxMchId", required = true) String WxMchId,
                                            @RequestParam(name = "payRealPrice", required = true) String payRealPrice) {
        try {


            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48");
            mapPost.put("merchId" , "20230394901");
            mapPost.put("paySerialNo" , paySerialNo);
            mapPost.put("wxMchId" , WxMchId);
            mapPost.put("payRealPrice" , payRealPrice);
            mapPost.put("refundPrice" , payRealPrice);

            Map<String , Object> map = new HashMap<>();
            map.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48");
            map.put("merchId" , "20230394901");
            map.put("paySerialNo" , paySerialNo);
            map.put("wxMchId" , WxMchId);
            map.put("payRealPrice" , payRealPrice);
            map.put("refundPrice" , payRealPrice);

            System.out.println(map);

            mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/order/externalOrderRefund" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getBlxCouponBalance", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询停车券")
    public ResponseData getBlxCouponBalance(@RequestParam(name = "phone", required = true) String phone) {
        try {


            highUserCardService.getBlxCouponBalance(phone);

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


    @RequestMapping(value = "/queryJsParking", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询捷顺停车场")
    public ResponseData queryJsParking(@RequestParam(name = "packageId", required = true) String packageId ,@RequestParam(name = "phone", required = true) String phone ) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20240694600");
            mapPost.put("packageId" , packageId);
            mapPost.put("phone" , phone);


            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "B1C8316D09969BD7F6534AC1676B4EFB", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/discount/presentDiscount" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getUserCouponPage", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询捷顺停车场")
    public ResponseData getUserCouponPage(@RequestParam(name = "phone", required = true) String phone) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("phone" , phone);


            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/blxCoupon/getUserCouponPage" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/queryJsOrderList", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询车牌订单列表信息")
    public ResponseData queryJsOrderList(@RequestParam(name = "carNo", required = true) String carNo,
                                         @RequestParam(name = "orderStatus", required = true) String orderStatus) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("orderStatus" , orderStatus);
            mapPost.put("carNo" , carNo);
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/blxCoupon/queryJsOrderList" , mapPost , new HashMap<>()));

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



    @RequestMapping(value = "/sendCoupon", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "发放券")
    public ResponseData sendCoupon(@RequestParam(name = "couponCode", required = true) String couponCode,
                                   @RequestParam(name = "receiverCount", required = true) Integer receiverCount,
                                   @RequestParam(name = "orderNo", required = true) String orderNo,
                                      @RequestParam(name = "receiverPhone", required = true) String receiverPhone) {
        try {


            // 下单请求
            JSONObject rechargeObject = HuiLianTongConfig.recharge(orderNo,
                    receiverCount,
                    couponCode,
                    receiverPhone);
            if (!rechargeObject.getString("respCode").equals("0000")) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "下单失败");
            }
            JSONObject response = HuiLianTongUnionCardConfig.resolveResponse(rechargeObject.getString("data"));

            // 购买卡券
            JSONObject returnParam = HuiLianTongConfig.costRechargeOrder(response.getJSONObject("data").getString("rechargeOrderId"));

            if (returnParam != null && returnParam.getString("respCode").equals("0000")) {
                // 解密
                JSONObject jsonObject = HuiLianTongUnionCardConfig.resolveResponse(returnParam.getString("data"));
                JSONArray dataArray = JSONObject.parseObject(jsonObject.getString("data"), JSONArray.class);

                return ResponseMsgUtil.success(dataArray);
            } else {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "下单失败");
            }

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

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


            JSONObject object = new JSONObject();
            object.put("outTradeNo" , "HUI" + OrderUtil.generateOrderNo());
            object.put("transType" , "JSAPI");
            object.put("payMode" , "WECHAT");
            object.put("totalAmount" , "0.01");
            object.put("profitSharing" , 0);
            object.put("subject" , "测试");
            object.put("userId" , "oUGn_4unIjp90MY-oEXluY4laDrQ");

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

    @RequestMapping(value = "/queryGasInfoListByPage", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询团油门店")
    public ResponseData queryGasInfoListByPage() {
        try {


            HighMerchantModel merchant = highMerchantService.getMerchantById(39L);
            if (merchant == null) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户");
            }
            JSONObject jsonObjectP = TuanYouConfig.queryGasInfoListByPage(1, 1000);
            JSONObject resultObjectP = jsonObjectP.getObject("result", JSONObject.class);

            for (int i = 1; i <= resultObjectP.getInteger("totalPageNum").intValue();i++) {
                JSONObject jsonObject = TuanYouConfig.queryGasInfoListByPage(i, 1000);
                JSONObject resultObject = jsonObject.getObject("result", JSONObject.class);
                JSONArray jsonArray = resultObject.getJSONArray("gasInfoList");
                HighMerchantStore highMerchantStore;
                HighGasOilPrice highGasOilPrice;
                for (Object gasObject : jsonArray) {
                    JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(gasObject));
                    HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("gasId"));
                    JSONArray gasGunList = object.getJSONArray("gasGunList");
                    if (store != null) {
                        store.setType(1);
                        store.setSourceType(2);
                        store.setMerchantId(merchant.getId());
                        store.setCompanyId(merchant.getCompanyId());
                        store.setStoreKey(object.getString("gasId"));
                        store.setStoreName(object.getString("gasName"));
                        store.setStoreLogo(object.getString("gasLogoSmall"));
                        store.setRegionId(object.getLong("provinceCode"));
                        store.setRegionName(object.getString("provinceName"));
                        store.setAddress(object.getString("gasAddress"));
                        store.setLongitude(object.getString("gasAddressLongitude"));
                        store.setLatitude(object.getString("gasAddressLatitude"));
                        store.setStatus(object.getInteger("gasStatus"));
                        store.setPrestoreType(0);
                        store.setOperatorId(0L);
                        store.setOperatorName("系统创建");
                        store.setUpdateTime(new Date());
                        store.setExt1(object.getString("gasSourceId"));
                        highMerchantStoreService.updateMerchantStoreDetail(store);

                        JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                        for (Object oilPrice : oilPriceList) {
                            JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                            // 查询门店油号
                            highGasOilPrice = highGasOilPriceService.getGasOilPriceByStoreAndOilNo(store.getId(), oilPriceObject.getString("oilNo"));
                            if (highGasOilPrice == null) {
                                highGasOilPrice = new HighGasOilPrice();
                                highGasOilPrice.setMerchantStoreId(store.getId());
                                highGasOilPrice.setOilNo(oilPriceObject.getString("oilNo"));
                                highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                                highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("priceVip"));
                                highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                                highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                                highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                                highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                            } else {
                                highGasOilPrice.setMerchantStoreId(store.getId());
                                highGasOilPrice.setOilNo(oilPriceObject.getString("oilNo"));
                                highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                                highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("priceVip"));
                                highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                                highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                                highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                                highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                            }
                            highGasOilPriceService.editGasOilPrice(highGasOilPrice);

                            for (Object o : gasGunList) {
                                JSONObject gunNoObject = (JSONObject) o;
                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), gunNoObject.getString("gunNo"));
                                if (gasOilGunNo == null) {
                                    gasOilGunNo = new HighGasOilGunNo();
                                    gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
                                    gasOilGunNo.setStoreId(highGasOilPrice.getMerchantStoreId());
                                    gasOilGunNo.setOilNo(highGasOilPrice.getOilNo());
                                    gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                    gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                    gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
                                    gasOilGunNo.setGunNo(gunNoObject.getString("gunNo"));
                                    gasOilGunNo.setStatus(1);
                                    gasOilGunNoService.editGunNo(gasOilGunNo);
                                }
                            }
                        }
                    } else {
                        highMerchantStore = new HighMerchantStore();
                        highMerchantStore.setType(1);
                        highMerchantStore.setSourceType(2);
                        highMerchantStore.setMerchantId(merchant.getId());
                        highMerchantStore.setCompanyId(merchant.getCompanyId());
                        highMerchantStore.setStoreKey(object.getString("gasId"));
                        highMerchantStore.setStoreName(object.getString("gasName"));
                        highMerchantStore.setStoreLogo(object.getString("gasLogoSmall"));
                        highMerchantStore.setRegionId(object.getLong("provinceCode"));
                        highMerchantStore.setRegionName(object.getString("provinceName"));
                        highMerchantStore.setAddress(object.getString("gasAddress"));
                        highMerchantStore.setLongitude(object.getString("gasAddressLongitude"));
                        highMerchantStore.setLatitude(object.getString("gasAddressLatitude"));
                        highMerchantStore.setStatus(1);
                        highMerchantStore.setPrestoreType(0);
                        highMerchantStore.setOperatorId(0L);
                        highMerchantStore.setOperatorName("系统创建");
                        highMerchantStore.setCreateTime(new Date());
                        highMerchantStore.setUpdateTime(new Date());
                        highMerchantStore.setExt1(object.getString("gasSourceId"));
                        HighMerchantStoreModel merchantStoreModel = new HighMerchantStoreModel();
                        BeanUtils.copyProperties(highMerchantStore, merchantStoreModel);
                        highMerchantStoreService.insertMerchantStore(merchantStoreModel);

                        JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                        for (Object oilPrice : oilPriceList) {
                            JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                            highGasOilPrice = new HighGasOilPrice();
                            highGasOilPrice.setMerchantStoreId(merchantStoreModel.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getString("oilNo"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                            highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                            highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                            highGasOilPriceService.editGasOilPrice(highGasOilPrice);

                            for (Object o : gasGunList) {
                                JSONObject gunNoObject = (JSONObject) o;
                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), gunNoObject.getString("gunNo"));
                                if (gasOilGunNo == null) {
                                    gasOilGunNo = new HighGasOilGunNo();
                                    gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
                                    gasOilGunNo.setStoreId(highGasOilPrice.getMerchantStoreId());
                                    gasOilGunNo.setOilNo(highGasOilPrice.getOilNo());
                                    gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                    gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                    gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
                                    gasOilGunNo.setGunNo(gunNoObject.getString("gunNo"));
                                    gasOilGunNo.setStatus(1);
                                    gasOilGunNoService.editGunNo(gasOilGunNo);
                                }
                            }
                        }
                    }
                }
            }

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

    @RequestMapping(value = "/test", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "测试")
    public ResponseData test(@RequestParam(name = "no", required = true) String no) {
        try {

            JSONObject jsonObject = DianConfig.getGasInfoByGasId(no);

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

    @RequestMapping(value = "/getGasInfoAll", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取全量油站")
    public ResponseData getGasInfoAll() {
        try {
            HighMerchantModel merchant = highMerchantService.getMerchantById(39L);
            JSONObject jsonObject = DianConfig.getGasInfoAll();

            JSONArray resultObject = jsonObject.getObject("result", JSONArray.class);

            for (int i = 0; i < resultObject.size();i++) {
                Object objectData =  resultObject.get(i);
                JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(objectData));
                HighMerchantStore highMerchantStore;
                HighGasOilPrice highGasOilPrice;
                HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("jyzid"));
                SecRegion region = commonService.getRegionsByName(object.getString("province"));
                if (store != null) {
                    store.setType(1);
                    store.setSourceType(6);
                    store.setMerchantId(merchant.getId());
                    store.setCompanyId(merchant.getCompanyId());
                    store.setStoreKey(object.getString("jyzid"));
                    store.setStoreName(object.getString("mingcheng"));
                    store.setStoreLogo(object.getString("tupian"));
                    store.setRegionId(region.getRegionId());
                    store.setRegionName(object.getString("province"));
                    store.setAddress(object.getString("dizhi"));
                    store.setLongitude(object.getString("lng"));
                    store.setLatitude(object.getString("lat"));
                    store.setStatus(object.getInteger("zhuangtai"));
                    store.setPrestoreType(0);
                    store.setOperatorId(0L);
                    store.setOperatorName("系统创建");
                    store.setUpdateTime(new Date());
                    store.setExt1(object.getString("gasSourceId"));
                    highMerchantStoreService.updateMerchantStoreDetail(store);

                    JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                    for (Object oilPrice : oilPriceList) {
                        JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                        // 查询门店油号
                        highGasOilPrice = highGasOilPriceService.getGasOilPriceByStoreAndOilNo(store.getId(), oilPriceObject.getString("youhao"));
                        if (highGasOilPrice == null) {
                            highGasOilPrice = new HighGasOilPrice();
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getString("youhao"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("youhao") + "#");
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oiltype"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oiltype").equals("1") ? "汽油": "柴油");
                            highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                        } else {
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getString("youhao"));
                            highGasOilPrice.setOilNoName( oilPriceObject.getString("youhao") + "#");
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oiltype"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oiltype").equals("1") ? "汽油": "柴油");
                        }
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                } else {
                    highMerchantStore = new HighMerchantStore();
                    highMerchantStore.setType(1);
                    highMerchantStore.setSourceType(6);
                    highMerchantStore.setMerchantId(merchant.getId());
                    highMerchantStore.setCompanyId(merchant.getCompanyId());
                    highMerchantStore.setStoreKey(object.getString("jyzid"));
                    highMerchantStore.setStoreName(object.getString("mingcheng"));
                    highMerchantStore.setStoreLogo(object.getString("tupian"));
                    highMerchantStore.setRegionId(region.getRegionId());
                    highMerchantStore.setRegionName(object.getString("province"));
                    highMerchantStore.setAddress(object.getString("dizhi"));
                    highMerchantStore.setLongitude(object.getString("lng"));
                    highMerchantStore.setLatitude(object.getString("lat"));
                    highMerchantStore.setStatus(1);
                    highMerchantStore.setPrestoreType(0);
                    highMerchantStore.setOperatorId(0L);
                    highMerchantStore.setOperatorName("系统创建");
                    highMerchantStore.setCreateTime(new Date());
                    highMerchantStore.setUpdateTime(new Date());
                    highMerchantStore.setExt1(object.getString("gasSourceId"));
                    HighMerchantStoreModel merchantStoreModel = new HighMerchantStoreModel();
                    BeanUtils.copyProperties(highMerchantStore, merchantStoreModel);
                    highMerchantStoreService.insertMerchantStore(merchantStoreModel);

                    JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                    for (Object oilPrice : oilPriceList) {
                        JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                        highGasOilPrice = new HighGasOilPrice();
                        highGasOilPrice.setMerchantStoreId(merchantStoreModel.getId());
                        highGasOilPrice.setOilNo(oilPriceObject.getString("youhao"));
                        highGasOilPrice.setOilNoName(oilPriceObject.getString("youhao") + "#");
                        highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                        highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                        highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceGun"));
                        highGasOilPrice.setOilType(oilPriceObject.getInteger("oiltype"));
                        highGasOilPrice.setOilTypeName(oilPriceObject.getString("oiltype").equals("1") ? "汽油": "柴油");
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                }

            }

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

    @RequestMapping(value = "/getOrderPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getOrderPay")
    public ResponseData getOrderPay(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {


            HighOilCardOrder highOilCardOrder = highOilCardOrderService.findOrder(orderNo);

            highOilCardOrder.setStatus(2);

            JSONObject object = KytcService.getOrderPay(highOilCardOrder.getThirdOrderNo()  , highOilCardOrder.getPrice() , highOilCardOrder.getCardNo());

            highOilCardOrder.setExt1(object.toJSONString());

            highOilCardOrderService.updateOilCardOrder(highOilCardOrder);

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

    @RequestMapping(value = "/getOrderInfo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getOrderInfo")
    public ResponseData getOrderInfo(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {


            HighOilCardOrder highOilCardOrder = highOilCardOrderService.findOrder(orderNo);

            JSONObject object = KytcService.getOrderInfo(highOilCardOrder.getThirdOrderNo());

            highOilCardOrder.setExt2(object.toJSONString());

            if (object.getBoolean("State") == true) {
                JSONObject jsonObject = object.getJSONObject("Data");
                if (jsonObject.getInteger("OilOrderState") == 2) {
                    highOilCardOrder.setStatus(3);

                    HighOrder highOrder = highOrderService.getOrderByOrderNo(highOilCardOrder.getOrderNo());
                    highOrder.setOrderStatus(3);
                    highOrder.getHighChildOrderList().get(0).setChildOrderStatus(3);

                    highOrderService.updateOrder(highOrder);

                }
            }

            highOilCardOrderService.updateOilCardOrder(highOilCardOrder);

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

    @RequestMapping(value = "/getLogisticsMsg", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取物流")
    public ResponseData getLogisticsMsg(@RequestParam(name = "no", required = true) String no) {
        try {
            JSONObject jsonObjects = CommonConfig.getLogisticsMsg(no);
            return ResponseMsgUtil.success(jsonObjects);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

//    @RequestMapping(value = "/synCouponRule", method = RequestMethod.GET)
//    @ResponseBody
//    @ApiOperation(value = "获取卡券")
//    public ResponseData synCouponRule() {
//        try {
//            return ResponseMsgUtil.success(PetroConfig.synCouponRule());
//        } catch (Exception e) {
//            log.error("HighOrderController --> getBackendToken() error!", e);
//            return ResponseMsgUtil.exception(e);
//        }
//    }

//    @RequestMapping(value = "/getCoupon", method = RequestMethod.GET)
//    @ResponseBody
//    @ApiOperation(value = "卡券下单")
//    public ResponseData getCoupon() {
//        try {
//
//            JSONObject jsonObject = PetroConfig.getCoupon("16000443991501" , "18090580471" , OrderUtil.generateOrderNo());
//            String data = PetroConfig.decrypt(jsonObject.getString("biz_content"));
//            JSONObject object = JSONObject.parseObject(data);
//
//            return ResponseMsgUtil.success(object);
//        } catch (Exception e) {
//            log.error("HighOrderController --> getBackendToken() error!", e);
//            return ResponseMsgUtil.exception(e);
//        }
//    }


    @RequestMapping(value = "/deleteOilNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "删除油品")
    public ResponseData deleteOilNo() {
        try {

            gasService.deleteOilNo();
            return ResponseMsgUtil.success("1231243");
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
    @RequestMapping(value = "/getJiaHaoYouAllStation", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "加好油油站刷新")
    public ResponseData getJiaHaoYouAllStation() {
        try {
            gasService.getJiaHaoYouAllStation();
            return ResponseMsgUtil.success("1231243");
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
    @RequestMapping(value = "/getDianAllStation", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "点点网络")
    public ResponseData getDianAllStation() {
        try {

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

    @RequestMapping(value = "/integralRebateOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "积分返利")
    public ResponseData integralRebateOrder() {
        try {

            // 查询满足初步返利条件订单
            List<HighOrder> order = highOrderService.integralRebateOrder();
            for (HighOrder highOrder : order) {

                // 查询是否存在积分记录
                Map<String, Object> map = new HashMap<>();
                map.put("goldType", 1);
                map.put("resType", 4);
                map.put("userId", highOrder.getMemId());
                map.put("resId", highOrder.getId());

                List<HighGoldRec> goldRecs = highGoldRecService.getGoldRec(map);

                // 判断是否重复赠送积分
                if (goldRecs.size() == 0) {
                    bsOrderRebateService.insertOrderRebate(highOrder);
                }

                highOrder.setWhetherRebate(true);
                highOrderService.updateOrderDetail(highOrder);

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


    @RequestMapping(value = "/getApiCoupon", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取卡券")
    public ResponseData getApiCoupon() {
        try {

            // 查询满足初步返利条件订单
            List<HighOrder> order = highOrderService.integralRebateOrder();
            for (HighOrder highOrder : order) {

                // 查询是否存在积分记录
                Map<String, Object> map = new HashMap<>();
                map.put("goldType", 1);
                map.put("resType", 4);
                map.put("userId", highOrder.getMemId());
                map.put("resId", highOrder.getId());

                List<HighGoldRec> goldRecs = highGoldRecService.getGoldRec(map);

                // 判断是否重复赠送积分
                if (goldRecs.size() == 0) {
                    bsOrderRebateService.insertOrderRebate(highOrder);
                }

                highOrder.setWhetherRebate(true);
                highOrderService.updateOrderDetail(highOrder);

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

    @RequestMapping(value = "/couponDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据订单号查询中石油卡券详情")
    public ResponseData couponDetail(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("mchOrderNo" , mchOrderNo);
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/apiCoupon/getCheckCode" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getCouponList", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取卡券")
    public ResponseData getCouponList() {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230394901");
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "B94B5E62807FA56A7260AB581D8A1B48", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/apiCoupon/getCouponList" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/refundApi", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "支付退款")
    public ResponseData refundApi(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {

            ApiOrder apiOrder = apiOrderService.findByOrderNo(mchOrderNo , null);
            // 查询APi
            HighOrder order = highOrderService.getOrderByOrderNo(apiOrder.getOrderNo());

            orderService.refundOrder(order, "商户退款退款", OrderRefundOpUserType.TYPE1,
                    null,
                    "系统自动退款");

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

    @RequestMapping(value = "/checkAccountBalance", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询余额")
    public ResponseData checkAccountBalance() {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20240133101");
//            mapPost.put("mchOrderNo" , mchOrderNo);
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "1F43EEC88D0F99FC201D81143F9EED85", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/apiMerchants/checkAccountBalance" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getStationStore", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询油站")
    public ResponseData getStationStore() {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20240587402");
//            mapPost.put("mchOrderNo" , mchOrderNo);
//            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "1A566F46B57830C45A06AD0AA387435C", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/refuelOnline/getStationStore" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }




    @RequestMapping(value = "/decryptPetroConfig", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "解码")
    public ResponseData decryptPetroConfig(@RequestParam(name = "content", required = true) String content) {
        try {

            PetroConfig.init(1);

            String data = PetroConfig.decrypt(content);
            JSONObject object = JSONObject.parseObject(data);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }



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

            PetroConfig.init(2);

            JSONObject jsonObject = petroConfig.synCouponRule();
            String data = PetroConfig.decrypt(jsonObject.getString("jsonResult"));
            JSONArray jsonArray = JSONArray.parseArray(data);

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

    @RequestMapping(value = "/getCoupon", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getCoupon")
    public ResponseData getCoupon(@RequestParam(name = "code", required = true) String code) {
        try {

            PetroConfig.init(2);

            // 发放卡券
            JSONObject jsonObject = petroConfig.getCoupon(code ,"18090580471");
            String data = PetroConfig.decrypt(jsonObject.getString("jsonResult"));
            JSONObject object = JSONObject.parseObject(data);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/decrypt", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "decrypt")
    public ResponseData decrypt(@RequestParam(name = "jsonResult", required = true) String jsonResult) {
        try {

            PetroConfig.init(2);
            String data = PetroConfig.decrypt(jsonResult);
            JSONObject object = JSONObject.parseObject(data);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

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

            JSONObject object = RechargeConfig.jNiuGoodsList();
            JSONArray array = object.getJSONArray("data");
            List<JSONObject> list = new ArrayList<>();
            for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                JSONArray jsonArray = jsonObject.getJSONArray("goodsOption");
                for (int j = 0; j < jsonArray.size(); j++) {
                    JSONObject goodsOption = jsonArray.getJSONObject(j);
                    JSONArray childArray = goodsOption.getJSONArray("child");
                    for (int t = 0; t < childArray.size(); t++) {
                        JSONObject child = childArray.getJSONObject(j);
                        JSONObject data = new JSONObject();
                        data.put("title" , jsonObject.getString("sort_title") + goodsOption.getString("name"));
                        data.put("goodsId" ,  child.getString("goods_id"));
                        data.put("goodsOptionId" ,  child.getString("goods_option_id"));
                        data.put("platPrice" ,  child.getString("plat_price"));
                        data.put("officialPrice" ,  child.getString("official_price"));
                        list.add(data);
                    }

                }

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


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

            JSONObject object = new JSONObject();

            object.put("orderNo", OrderUtil.generateOrderNo());
            object.put("option_id", "632");
            object.put("phone", "18090580471");
            JSONObject returnObject = RechargeConfig.rechargeOrderByJn(object);

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

    @RequestMapping(value = "/checkOrderByJn", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "checkOrderByJn")
    public ResponseData checkOrderByJn(@RequestParam(name = "order_no", required = true) String order_no) {
        try {

            JSONObject object = new JSONObject();

            object.put("orderNo" , order_no);
            int status = 0;
            JSONObject jsonObject = RechargeConfig.checkOrderByJn(object);
            if (jsonObject.getJSONObject("data") != null) {
                JSONObject  objectData= jsonObject.getJSONObject("data");
                // // 10充值中 20充值完成 -10 充值失败
                // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                if (objectData.getInteger("status") == 10) {
                    status = 0;
                } else if (objectData.getInteger("status") == 20) {
                    status =  1;
                } else if (objectData.getInteger("status") == -10) {
                    status = 2;
                }
            }

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


    @RequestMapping(value = "/getListRechargeOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getListRechargeOrder")
    public ResponseData getListRechargeOrder(@RequestParam(name = "order_no", required = true) String order_no) {
        try {

            log.info("处理话费订单定时任务开始");
            Map<String, Object> map = new HashMap<>();
            map.put("payStatus", String.valueOf(102));
            map.put("rechargeStatus", String.valueOf(201));
            List<OutRechargeOrder> orderList = outRechargeOrderService.getListRechargeOrder(map);
            log.info("处理话费订单条数:" + orderList.size());
            if (orderList.size() > 0) {
                for (OutRechargeOrder order : orderList) {
                    try {
                        outRechargeOrderService.prepaidRechargeHandle(order);
                    } catch (Exception e) {
                        log.info("话费定时任务订单业务出现异常", e);
                    }
                }
            }
            return ResponseMsgUtil.success("");
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/etcOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "etcOrder")
    public ResponseData etcOrder() {
        try {
            String mobile = "18090580471";
            Map<String, Object> map = new TreeMap<>();
            map.put("requestId" , System.nanoTime());
            map.put("channelCode" , CommonSysConst.getSysConfig().getEtcChannelCode());
            map.put("timestamp" , new Date().getTime() / 1000);
            map.put("productNo" , "GZETCFXQD_GZETCCSCP");
            map.put("mobile" , RSAUtil.encryptBASE64(RSAUtil.encryptByPublicKey(mobile.getBytes(StandardCharsets.UTF_8), CommonSysConst.getSysConfig().getEtcPublicKey())));
            map.put("num" , 1);
            map.put("thirdOrderId" , OrderUtil.generateOrderNo());
            String s = StringUtils.join(map.values(), "");
            String sign = RSAUtil.sign(s.getBytes(), CommonSysConst.getSysConfig().getEtcPrivateKey());
            map.put("sign", sign);

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

    @RequestMapping(value = "/couJointDist", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "商户派发电子券")
    public ResponseData couJointDist(@RequestParam(name = "order_no", required = true) String order_no) {
        try {

            // 购买卡券
            JSONObject returnParam = HuiLianTongConfig.costRechargeOrder(order_no);
            // 解密
            JSONObject jsonObject = HuiLianTongUnionCardConfig.resolveResponse(returnParam.getString("data"));
            JSONArray dataArray = JSONObject.parseObject(jsonObject.getString("data"), JSONArray.class);

            return ResponseMsgUtil.success(dataArray);

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

    @RequestMapping(value = "/getCarNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询车牌订单号")
    public ResponseData getCarNo(@RequestParam(name = "carNo", required = true) String carNo) {
        try {

            JSONObject jsonObject = new JSONObject();
            jsonObject.put("carNo" , carNo);
            jsonObject.put("orderStatus" , "03");

            JSONObject data = blxConfig.queryJsOrderList(jsonObject);

            return ResponseMsgUtil.success(data);

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

    @RequestMapping(value="/getGasDetailByStoreKey",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据门店key 查询")
    public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey) {
        try {

            JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(storeKey);
            return ResponseMsgUtil.success(jsonObject.get("result"));
        } catch (Exception e) {
            log.error("HighGasController -> getGasDetailByStoreKey() error!",e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value="/getSphCoupon",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取卡券")
    public ResponseData getSphCoupon() {
        try {

            JSONObject jsonObject = PetroCouponConfig.getCouponList();
            return ResponseMsgUtil.success(jsonObject);
        } catch (Exception e) {
            log.error("HighGasController -> getGasDetailByStoreKey() error!",e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value="/mchBalance",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "处理扣款")
    public ResponseData mchBalance(@RequestParam(name = "merchId", required = true) String merchId,
                                   @RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        ApiMerchants apiMerchants = apiMerchantsService.findByMchId(merchId);

        ApiOrder apiOrder = apiOrderService.findByOrderNo(mchOrderNo , null);

        String key = "apiMerchant" + apiMerchants.getMchId();
        try {

            // 分布式锁占坑
            Boolean lock = redisTemplate.opsForValue().setIfAbsent(key, apiOrder.getOrderNo());

            HighOrder order = highOrderService.getOrderByOrderNo(apiOrder.getOrderNo());

            if(Boolean.TRUE.equals(lock)) {

                // 判断金额是否充足
                if (!priceComputeConfig.mchBalance(apiMerchants , apiOrder.getCostPrice() , apiOrder.getMchOrderNo())) {
                    throw ErrorHelp.genException(SysCode.System, ErrorCode.INSUFFICIENT_BALANCE);
                }

                apiOrder.setStatus(3);
                apiOrderService.updateOrder(apiOrder);

                order.setOrderStatus(3);
                order.getHighChildOrderList().get(0).setChildOrderStatus(3);

                highOrderService.updateOrder(order);

            } else {
                // 加锁失败，重试
                Thread.sleep(100);
                mchBalance(merchId , mchOrderNo);
            }
            return null;
        } catch (Exception e) {
            log.error("HighGasController -> getGasDetailByStoreKey() error!",e);
            return ResponseMsgUtil.exception(e);
        } finally {
            // 删除key，释放锁
            redisTemplate.delete(key);
        }
    }

    @RequestMapping(value = "/getMerchantStoreList", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "下架团油")
    public ResponseData getMerchantStoreList() {
        try {

            // 客户端
            Map<String, Object> param = new HashMap<>();
            param.put("sourceType", 2);
//        param.put("regionId", "500000");
//        param.put("storeName", "壳牌");
            param.put("status", 1);
            List<HighMerchantStore> merchantStoreList = merchantStoreService.getMerchantStoreList(param);

            for (HighMerchantStore merchantStore : merchantStoreList) {
                merchantStore.setUpdateTime(new Date());
                merchantStore.setStatus(0);
                merchantStoreService.updateMerchantStoreDetail(merchantStore);
            }
            return ResponseMsgUtil.success("成功");

        } catch (Exception 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.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.enum_type.GasOilPriceStatusEnum;
import com.hai.model.HighMerchantModel;
import com.hai.model.HighMerchantStoreModel;
import com.hai.model.ResponseData;

import com.hai.openApi.config.BlxConfig;
import com.hai.openApi.config.PriceComputeConfig;
import com.hai.openApi.service.ApiOrderService;
import com.hai.order.service.OrderPaySuccessService;
import com.hai.order.service.OrderService;
import com.hai.order.service.impl.OrderPaySuccessServiceImpl;
import com.hai.order.type.OrderPayType;
import com.hai.order.type.OrderProductType;
import com.hai.order.type.OrderRefundOpUserType;
import com.hai.order.type.OrderStatus;
import com.hai.order.utils.OrderUtil;
import com.hai.pay.channel.huipay.config.HuiConfig;
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.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
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.nio.charset.StandardCharsets;
import java.util.*;

/**
 * @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 BsOrderRebateService bsOrderRebateService;



    @Resource
    private PetroConfig petroConfig;


    @Resource
    private HighGoldRecService highGoldRecService;

    @Resource
    private OrderService orderService;
    @Resource
    private HighUserCardService highUserCardService;

    @Resource
    private HighOrderService highOrderService;

    @Resource
    private HighUserService highUserService;

    @Resource
    private HighGasService gasService;

    @Resource
    private HighMerchantService highMerchantService;

    @Resource
    private HighMerchantStoreService highMerchantStoreService;

    @Resource
    private ApiProductService apiProductService;

    @Resource
    private HighGasOilPriceService highGasOilPriceService;

    @Resource
    private OutRechargeOrderService outRechargeOrderService;

    @Resource
    private HuiConfig huiConfig;

    @Resource
    private CommonService commonService;

    @Resource
    private HighOilCardOrderService highOilCardOrderService;

    @Resource
    private HighGasOrderService gasOrderService;
    @Resource
    private ShellGroupService shellGroupService;
    @Resource
    private HighMerchantStoreService merchantStoreService;

    @Resource
    private ApiOrderService apiOrderService;

    @Resource
    private ApiMerchantsService apiMerchantsService;

    @Resource
    private BlxConfig blxConfig;

    @Resource
    private HighGasOilGunNoService gasOilGunNoService;

    @Autowired
    private RedisTemplate redisTemplate;

    @Resource
    private PriceComputeConfig priceComputeConfig;

    @Resource
    private OrderPaySuccessServiceImpl orderPaySuccessService = new OrderPaySuccessServiceImpl();
    @RequestMapping(value = "/orderBusHandle", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "")
    public ResponseData orderBusHandle(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            orderPaySuccessService.orderBusHandle(orderService.getOrderDetailByNo(orderNo));
       /* HighOrder order = orderService.getOrderDetailByNo(orderNo);
        if (order != null) {
            // orderService.refundOrder(orderNo, DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
            // order.setRefundTime(new Date());
            // orderService.updateOrderData(order);
            return ResponseMsgUtil.success("修改成功");
        }*/
            return ResponseMsgUtil.success(null);

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


    @RequestMapping(value = "/gasSyncPayment", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "重庆壳牌推送")
    public ResponseData gasSyncPayment(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            HighGasOrder order = gasOrderService.getDetailByOrderNo(orderNo);
            if (order != null) {
                // 查询油站
                HighMerchantStore store = merchantStoreService.getDetailById(order.getStoreId());
                if (store == null) {
                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到门店");
                }

                return ResponseMsgUtil.success(
                        // 推送加好油
                        shellGroupService.gasSyncPayment(order.getOrderNo(),
                                store.getStoreKey(),
                                order.getPayTime(),
                                order.getGasRefuelPrice(),
                                order.getGasOilNo(),
                                order.getGasGunNo(),
                                order.getPayPrice(),
                                order.getTotalDeductionPrice()
                        )
                );
            }

            return ResponseMsgUtil.success(null);

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


    @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 = "/createOrder", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "创建订单")
    public ResponseData createOrder(@RequestBody JSONObject object) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("orderNo" , OrderUtil.generateOrderNo());
            mapPost.put("productType" , object.getString("productType"));
            mapPost.put("content" , object.getString("content"));

            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/createOrder" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/payOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "支付订单")
    public ResponseData payOrder(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {




            Map<String , Object> map = new HashMap<>();
            map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645");
            map.put("merchId" , "20230258302");
            map.put("mchOrderNo" , mchOrderNo);

            map.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsgcs.dctpay.com/v1/order/orderPay" , map , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/queryOrderDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询订单详情")
    public ResponseData queryOrderDetail(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645");
            mapPost.put("merchId" , "20230258302");
            mapPost.put("mchOrderNo" , mchOrderNo);


            Map<String , Object> map = new HashMap<>();
            map.put("apiKey" , "0C7897EA3BD96156A5881618FF2FF645");
            map.put("merchId" , "20230258302");
            map.put("mchOrderNo" , mchOrderNo);

            System.out.println(map);

            mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/order/queryOrderDetail" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/deposit", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "工会卡充值")
    public ResponseData deposit(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            HighChildOrder highChildOrder = order.getHighChildOrderList().get(0);

            if (order.getOrderStatus() != 2) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误");
            }

            // 汇联通充值
            String goodsDesc = "汇联通充值"+order.getPayPrice()+"元";
            String tranDesc = "";
            String businessType = "ghk_deposit";

            String orderNoAgain = OrderUtil.generateOrderNo();

            order.setOrderStatus(Integer.valueOf(3));
            order.setRemarks("工会卡再次充值订单号" + orderNoAgain);

            highOrderService.updateOrder(order);

            // 汇联通卡充值
            JSONObject deposit = HuiLianTongUnionCardConfig.deposit(orderNoAgain, highChildOrder.getGoodsSpecName(), order.getPayPrice(), businessType, order.getPaySerialNo(), goodsDesc);

            return ResponseMsgUtil.success( HuiLianTongUnionCardConfig.resolveResponse(deposit.getString("data")));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/getHuiLianTongCardByCardNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据卡号查询汇联通工会卡详情")
    public ResponseData getHuiLianTongCardByCardNo(@RequestParam(name = "cardNo", required = true) String cardNo) {
        try {
            // 查询工会卡
            JSONObject cardInfo = HuiLianTongUnionCardConfig.queryBalance(cardNo);
            JSONObject resolveResponse = HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data"));
            return ResponseMsgUtil.success(resolveResponse);

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

    @RequestMapping(value = "/consumption", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "工会卡支付")
    public ResponseData consumption(@RequestParam(name = "payRealPrice", required = true) BigDecimal payRealPrice,
                                    @RequestParam(name = "cardNo", required = true) String cardNo) {
        try {


            String goodsDesc = "";
            String tranDesc = "";
            String instCode = "11101652";
            String businessType = "hisen_consume";


            // 工会卡支付
            JSONObject consumption = HuiLianTongUnionCardConfig.consumption(OrderUtil.generateOrderNo(), cardNo, payRealPrice, businessType, instCode, goodsDesc, tranDesc);
            if (!consumption.getString("respCode").equals("0000")) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumption.getString("respMessage"));
            }
            // 响应参数
            JSONObject consumptionResult = HuiLianTongUnionCardConfig.resolveResponse(consumption.getString("data"));
            if (consumptionResult.getBoolean("success") != true) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, consumptionResult.getString("message"));
            }
            return ResponseMsgUtil.success(consumptionResult);

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


    @RequestMapping(value = "/refundOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "工会卡退款")
    public ResponseData refundOrder(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);

            if (order.getOrderStatus() != 2) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单状态错误");
            }

            orderService.refundOrder(order, OrderProductType.getDataByType(order.getProductType()).getName() + "退款",OrderRefundOpUserType.TYPE1,
                    null,
                    "系统自动退款");

            if (order.getProductType().equals(4)) {
                HighUser user = highUserService.findByUserId(order.getMemId());

                // 获取应退款积分
                int integralNum = order.getTotalPrice().multiply(new BigDecimal(100)).intValue();

                if ( integralNum> user.getGold()) {
                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "积分数量不足");
                }

                String remark = "订单" + order.getOrderNo() + "退还积分：" + integralNum;
                // 积分退款
                highUserService.goldHandle(user.getId(), integralNum,2, 3, order.getId() , remark , order.getOrderNo());
            }


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


    @RequestMapping(value = "/externalOrderRefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "对外订单退款")
    public ResponseData externalOrderRefund(@RequestParam(name = "paySerialNo", required = true) String paySerialNo,
                                            @RequestParam(name = "WxMchId", required = true) String WxMchId,
                                            @RequestParam(name = "payRealPrice", required = true) String payRealPrice) {
        try {


            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48");
            mapPost.put("merchId" , "20230394901");
            mapPost.put("paySerialNo" , paySerialNo);
            mapPost.put("wxMchId" , WxMchId);
            mapPost.put("payRealPrice" , payRealPrice);
            mapPost.put("refundPrice" , payRealPrice);

            Map<String , Object> map = new HashMap<>();
            map.put("apiKey" , "B94B5E62807FA56A7260AB581D8A1B48");
            map.put("merchId" , "20230394901");
            map.put("paySerialNo" , paySerialNo);
            map.put("wxMchId" , WxMchId);
            map.put("payRealPrice" , payRealPrice);
            map.put("refundPrice" , payRealPrice);

            System.out.println(map);

            mapPost.put("sign" , WxUtils.generateSignApi(map, MapUtils.getString(map, "apiKey"), WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/order/externalOrderRefund" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getBlxCouponBalance", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询停车券")
    public ResponseData getBlxCouponBalance(@RequestParam(name = "phone", required = true) String phone) {
        try {


            highUserCardService.getBlxCouponBalance(phone);

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


    @RequestMapping(value = "/queryJsParking", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询捷顺停车场")
    public ResponseData queryJsParking(@RequestParam(name = "packageId", required = true) String packageId ,@RequestParam(name = "phone", required = true) String phone ) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20240694600");
            mapPost.put("packageId" , packageId);
            mapPost.put("phone" , phone);


            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "B1C8316D09969BD7F6534AC1676B4EFB", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/discount/presentDiscount" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getUserCouponPage", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询捷顺停车场")
    public ResponseData getUserCouponPage(@RequestParam(name = "phone", required = true) String phone) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("phone" , phone);


            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/blxCoupon/getUserCouponPage" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/queryJsOrderList", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询车牌订单列表信息")
    public ResponseData queryJsOrderList(@RequestParam(name = "carNo", required = true) String carNo,
                                         @RequestParam(name = "orderStatus", required = true) String orderStatus) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("orderStatus" , orderStatus);
            mapPost.put("carNo" , carNo);
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));
            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/blxCoupon/queryJsOrderList" , mapPost , new HashMap<>()));

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



    @RequestMapping(value = "/sendCoupon", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "发放券")
    public ResponseData sendCoupon(@RequestParam(name = "couponCode", required = true) String couponCode,
                                   @RequestParam(name = "receiverCount", required = true) Integer receiverCount,
                                   @RequestParam(name = "orderNo", required = true) String orderNo,
                                      @RequestParam(name = "receiverPhone", required = true) String receiverPhone) {
        try {


            // 下单请求
            JSONObject rechargeObject = HuiLianTongConfig.recharge(orderNo,
                    receiverCount,
                    couponCode,
                    receiverPhone);
            if (!rechargeObject.getString("respCode").equals("0000")) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "下单失败");
            }
            JSONObject response = HuiLianTongUnionCardConfig.resolveResponse(rechargeObject.getString("data"));

            // 购买卡券
            JSONObject returnParam = HuiLianTongConfig.costRechargeOrder(response.getJSONObject("data").getString("rechargeOrderId"));

            if (returnParam != null && returnParam.getString("respCode").equals("0000")) {
                // 解密
                JSONObject jsonObject = HuiLianTongUnionCardConfig.resolveResponse(returnParam.getString("data"));
                JSONArray dataArray = JSONObject.parseObject(jsonObject.getString("data"), JSONArray.class);

                return ResponseMsgUtil.success(dataArray);
            } else {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "下单失败");
            }

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

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


            JSONObject object = new JSONObject();
            object.put("outTradeNo" , "HUI" + OrderUtil.generateOrderNo());
            object.put("transType" , "JSAPI");
            object.put("payMode" , "WECHAT");
            object.put("totalAmount" , "0.01");
            object.put("profitSharing" , 0);
            object.put("subject" , "测试");
            object.put("userId" , "oUGn_4unIjp90MY-oEXluY4laDrQ");

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

    @RequestMapping(value = "/queryGasInfoListByPage", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询团油门店")
    public ResponseData queryGasInfoListByPage() {
        try {


            HighMerchantModel merchant = highMerchantService.getMerchantById(39L);
            if (merchant == null) {
                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户");
            }
            JSONObject jsonObjectP = TuanYouConfig.queryGasInfoListByPage(1, 1000);
            JSONObject resultObjectP = jsonObjectP.getObject("result", JSONObject.class);

            for (int i = 1; i <= resultObjectP.getInteger("totalPageNum").intValue();i++) {
                JSONObject jsonObject = TuanYouConfig.queryGasInfoListByPage(i, 1000);
                JSONObject resultObject = jsonObject.getObject("result", JSONObject.class);
                JSONArray jsonArray = resultObject.getJSONArray("gasInfoList");
                HighMerchantStore highMerchantStore;
                HighGasOilPrice highGasOilPrice;
                for (Object gasObject : jsonArray) {
                    JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(gasObject));
                    HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("gasId"));
                    JSONArray gasGunList = object.getJSONArray("gasGunList");
                    if (store != null) {
                        store.setType(1);
                        store.setSourceType(2);
                        store.setMerchantId(merchant.getId());
                        store.setCompanyId(merchant.getCompanyId());
                        store.setStoreKey(object.getString("gasId"));
                        store.setStoreName(object.getString("gasName"));
                        store.setStoreLogo(object.getString("gasLogoSmall"));
                        store.setRegionId(object.getLong("provinceCode"));
                        store.setRegionName(object.getString("provinceName"));
                        store.setAddress(object.getString("gasAddress"));
                        store.setLongitude(object.getString("gasAddressLongitude"));
                        store.setLatitude(object.getString("gasAddressLatitude"));
                        store.setStatus(object.getInteger("gasStatus"));
                        store.setPrestoreType(0);
                        store.setOperatorId(0L);
                        store.setOperatorName("系统创建");
                        store.setUpdateTime(new Date());
                        store.setExt1(object.getString("gasSourceId"));
                        highMerchantStoreService.updateMerchantStoreDetail(store);

                        JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                        for (Object oilPrice : oilPriceList) {
                            JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                            // 查询门店油号
                            highGasOilPrice = highGasOilPriceService.getGasOilPriceByStoreAndOilNo(store.getId(), oilPriceObject.getString("oilNo"));
                            if (highGasOilPrice == null) {
                                highGasOilPrice = new HighGasOilPrice();
                                highGasOilPrice.setMerchantStoreId(store.getId());
                                highGasOilPrice.setOilNo(oilPriceObject.getString("oilNo"));
                                highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                                highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("priceVip"));
                                highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                                highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                                highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                                highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                            } else {
                                highGasOilPrice.setMerchantStoreId(store.getId());
                                highGasOilPrice.setOilNo(oilPriceObject.getString("oilNo"));
                                highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                                highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("priceVip"));
                                highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                                highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                                highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                                highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                                highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                            }
                            highGasOilPriceService.editGasOilPrice(highGasOilPrice);

                            for (Object o : gasGunList) {
                                JSONObject gunNoObject = (JSONObject) o;
                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), gunNoObject.getString("gunNo"));
                                if (gasOilGunNo == null) {
                                    gasOilGunNo = new HighGasOilGunNo();
                                    gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
                                    gasOilGunNo.setStoreId(highGasOilPrice.getMerchantStoreId());
                                    gasOilGunNo.setOilNo(highGasOilPrice.getOilNo());
                                    gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                    gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                    gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
                                    gasOilGunNo.setGunNo(gunNoObject.getString("gunNo"));
                                    gasOilGunNo.setStatus(1);
                                    gasOilGunNoService.editGunNo(gasOilGunNo);
                                }
                            }
                        }
                    } else {
                        highMerchantStore = new HighMerchantStore();
                        highMerchantStore.setType(1);
                        highMerchantStore.setSourceType(2);
                        highMerchantStore.setMerchantId(merchant.getId());
                        highMerchantStore.setCompanyId(merchant.getCompanyId());
                        highMerchantStore.setStoreKey(object.getString("gasId"));
                        highMerchantStore.setStoreName(object.getString("gasName"));
                        highMerchantStore.setStoreLogo(object.getString("gasLogoSmall"));
                        highMerchantStore.setRegionId(object.getLong("provinceCode"));
                        highMerchantStore.setRegionName(object.getString("provinceName"));
                        highMerchantStore.setAddress(object.getString("gasAddress"));
                        highMerchantStore.setLongitude(object.getString("gasAddressLongitude"));
                        highMerchantStore.setLatitude(object.getString("gasAddressLatitude"));
                        highMerchantStore.setStatus(1);
                        highMerchantStore.setPrestoreType(0);
                        highMerchantStore.setOperatorId(0L);
                        highMerchantStore.setOperatorName("系统创建");
                        highMerchantStore.setCreateTime(new Date());
                        highMerchantStore.setUpdateTime(new Date());
                        highMerchantStore.setExt1(object.getString("gasSourceId"));
                        HighMerchantStoreModel merchantStoreModel = new HighMerchantStoreModel();
                        BeanUtils.copyProperties(highMerchantStore, merchantStoreModel);
                        highMerchantStoreService.insertMerchantStore(merchantStoreModel);

                        JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                        for (Object oilPrice : oilPriceList) {
                            JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                            highGasOilPrice = new HighGasOilPrice();
                            highGasOilPrice.setMerchantStoreId(merchantStoreModel.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getString("oilNo"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                            highGasOilPrice.setPriceCost(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                            highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                            highGasOilPriceService.editGasOilPrice(highGasOilPrice);

                            for (Object o : gasGunList) {
                                JSONObject gunNoObject = (JSONObject) o;
                                HighGasOilGunNo gasOilGunNo = gasOilGunNoService.getDetailByStoreAndGunNo(highGasOilPrice.getMerchantStoreId(), gunNoObject.getString("gunNo"));
                                if (gasOilGunNo == null) {
                                    gasOilGunNo = new HighGasOilGunNo();
                                    gasOilGunNo.setGasOilPriceId(highGasOilPrice.getId());
                                    gasOilGunNo.setStoreId(highGasOilPrice.getMerchantStoreId());
                                    gasOilGunNo.setOilNo(highGasOilPrice.getOilNo());
                                    gasOilGunNo.setOilNoName(highGasOilPrice.getOilNoName());
                                    gasOilGunNo.setOilType(highGasOilPrice.getOilType());
                                    gasOilGunNo.setOilTypeName(highGasOilPrice.getOilTypeName());
                                    gasOilGunNo.setGunNo(gunNoObject.getString("gunNo"));
                                    gasOilGunNo.setStatus(1);
                                    gasOilGunNoService.editGunNo(gasOilGunNo);
                                }
                            }
                        }
                    }
                }
            }

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

    @RequestMapping(value = "/test", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "测试")
    public ResponseData test(@RequestParam(name = "no", required = true) String no) {
        try {

            JSONObject jsonObject = DianConfig.getGasInfoByGasId(no);

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

    @RequestMapping(value = "/getGasInfoAll", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取全量油站")
    public ResponseData getGasInfoAll() {
        try {
            HighMerchantModel merchant = highMerchantService.getMerchantById(39L);
            JSONObject jsonObject = DianConfig.getGasInfoAll();

            JSONArray resultObject = jsonObject.getObject("result", JSONArray.class);

            for (int i = 0; i < resultObject.size();i++) {
                Object objectData =  resultObject.get(i);
                JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(objectData));
                HighMerchantStore highMerchantStore;
                HighGasOilPrice highGasOilPrice;
                HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("jyzid"));
                SecRegion region = commonService.getRegionsByName(object.getString("province"));
                if (store != null) {
                    store.setType(1);
                    store.setSourceType(6);
                    store.setMerchantId(merchant.getId());
                    store.setCompanyId(merchant.getCompanyId());
                    store.setStoreKey(object.getString("jyzid"));
                    store.setStoreName(object.getString("mingcheng"));
                    store.setStoreLogo(object.getString("tupian"));
                    store.setRegionId(region.getRegionId());
                    store.setRegionName(object.getString("province"));
                    store.setAddress(object.getString("dizhi"));
                    store.setLongitude(object.getString("lng"));
                    store.setLatitude(object.getString("lat"));
                    store.setStatus(object.getInteger("zhuangtai"));
                    store.setPrestoreType(0);
                    store.setOperatorId(0L);
                    store.setOperatorName("系统创建");
                    store.setUpdateTime(new Date());
                    store.setExt1(object.getString("gasSourceId"));
                    highMerchantStoreService.updateMerchantStoreDetail(store);

                    JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                    for (Object oilPrice : oilPriceList) {
                        JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                        // 查询门店油号
                        highGasOilPrice = highGasOilPriceService.getGasOilPriceByStoreAndOilNo(store.getId(), oilPriceObject.getString("youhao"));
                        if (highGasOilPrice == null) {
                            highGasOilPrice = new HighGasOilPrice();
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getString("youhao"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("youhao") + "#");
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oiltype"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oiltype").equals("1") ? "汽油": "柴油");
                            highGasOilPrice.setStatus(GasOilPriceStatusEnum.status1.getStatus());
                        } else {
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getString("youhao"));
                            highGasOilPrice.setOilNoName( oilPriceObject.getString("youhao") + "#");
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oiltype"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oiltype").equals("1") ? "汽油": "柴油");
                        }
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                } else {
                    highMerchantStore = new HighMerchantStore();
                    highMerchantStore.setType(1);
                    highMerchantStore.setSourceType(6);
                    highMerchantStore.setMerchantId(merchant.getId());
                    highMerchantStore.setCompanyId(merchant.getCompanyId());
                    highMerchantStore.setStoreKey(object.getString("jyzid"));
                    highMerchantStore.setStoreName(object.getString("mingcheng"));
                    highMerchantStore.setStoreLogo(object.getString("tupian"));
                    highMerchantStore.setRegionId(region.getRegionId());
                    highMerchantStore.setRegionName(object.getString("province"));
                    highMerchantStore.setAddress(object.getString("dizhi"));
                    highMerchantStore.setLongitude(object.getString("lng"));
                    highMerchantStore.setLatitude(object.getString("lat"));
                    highMerchantStore.setStatus(1);
                    highMerchantStore.setPrestoreType(0);
                    highMerchantStore.setOperatorId(0L);
                    highMerchantStore.setOperatorName("系统创建");
                    highMerchantStore.setCreateTime(new Date());
                    highMerchantStore.setUpdateTime(new Date());
                    highMerchantStore.setExt1(object.getString("gasSourceId"));
                    HighMerchantStoreModel merchantStoreModel = new HighMerchantStoreModel();
                    BeanUtils.copyProperties(highMerchantStore, merchantStoreModel);
                    highMerchantStoreService.insertMerchantStore(merchantStoreModel);

                    JSONArray oilPriceList = object.getJSONArray("oilPriceList");
                    for (Object oilPrice : oilPriceList) {
                        JSONObject oilPriceObject = JSONObject.parseObject(JSONObject.toJSONString(oilPrice));
                        highGasOilPrice = new HighGasOilPrice();
                        highGasOilPrice.setMerchantStoreId(merchantStoreModel.getId());
                        highGasOilPrice.setOilNo(oilPriceObject.getString("youhao"));
                        highGasOilPrice.setOilNoName(oilPriceObject.getString("youhao") + "#");
                        highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                        highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                        highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceGun"));
                        highGasOilPrice.setOilType(oilPriceObject.getInteger("oiltype"));
                        highGasOilPrice.setOilTypeName(oilPriceObject.getString("oiltype").equals("1") ? "汽油": "柴油");
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                }

            }

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

    @RequestMapping(value = "/getOrderPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getOrderPay")
    public ResponseData getOrderPay(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {


            HighOilCardOrder highOilCardOrder = highOilCardOrderService.findOrder(orderNo);

            highOilCardOrder.setStatus(2);

            JSONObject object = KytcService.getOrderPay(highOilCardOrder.getThirdOrderNo()  , highOilCardOrder.getPrice() , highOilCardOrder.getCardNo());

            highOilCardOrder.setExt1(object.toJSONString());

            highOilCardOrderService.updateOilCardOrder(highOilCardOrder);

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

    @RequestMapping(value = "/getOrderInfo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getOrderInfo")
    public ResponseData getOrderInfo(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {


            HighOilCardOrder highOilCardOrder = highOilCardOrderService.findOrder(orderNo);

            JSONObject object = KytcService.getOrderInfo(highOilCardOrder.getThirdOrderNo());

            highOilCardOrder.setExt2(object.toJSONString());

            if (object.getBoolean("State") == true) {
                JSONObject jsonObject = object.getJSONObject("Data");
                if (jsonObject.getInteger("OilOrderState") == 2) {
                    highOilCardOrder.setStatus(3);

                    HighOrder highOrder = highOrderService.getOrderByOrderNo(highOilCardOrder.getOrderNo());
                    highOrder.setOrderStatus(3);
                    highOrder.getHighChildOrderList().get(0).setChildOrderStatus(3);

                    highOrderService.updateOrder(highOrder);

                }
            }

            highOilCardOrderService.updateOilCardOrder(highOilCardOrder);

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

    @RequestMapping(value = "/getLogisticsMsg", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取物流")
    public ResponseData getLogisticsMsg(@RequestParam(name = "no", required = true) String no) {
        try {
            JSONObject jsonObjects = CommonConfig.getLogisticsMsg(no);
            return ResponseMsgUtil.success(jsonObjects);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

//    @RequestMapping(value = "/synCouponRule", method = RequestMethod.GET)
//    @ResponseBody
//    @ApiOperation(value = "获取卡券")
//    public ResponseData synCouponRule() {
//        try {
//            return ResponseMsgUtil.success(PetroConfig.synCouponRule());
//        } catch (Exception e) {
//            log.error("HighOrderController --> getBackendToken() error!", e);
//            return ResponseMsgUtil.exception(e);
//        }
//    }

//    @RequestMapping(value = "/getCoupon", method = RequestMethod.GET)
//    @ResponseBody
//    @ApiOperation(value = "卡券下单")
//    public ResponseData getCoupon() {
//        try {
//
//            JSONObject jsonObject = PetroConfig.getCoupon("16000443991501" , "18090580471" , OrderUtil.generateOrderNo());
//            String data = PetroConfig.decrypt(jsonObject.getString("biz_content"));
//            JSONObject object = JSONObject.parseObject(data);
//
//            return ResponseMsgUtil.success(object);
//        } catch (Exception e) {
//            log.error("HighOrderController --> getBackendToken() error!", e);
//            return ResponseMsgUtil.exception(e);
//        }
//    }


    @RequestMapping(value = "/deleteOilNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "删除油品")
    public ResponseData deleteOilNo() {
        try {

            gasService.deleteOilNo();
            return ResponseMsgUtil.success("1231243");
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
    @RequestMapping(value = "/getJiaHaoYouAllStation", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "加好油油站刷新")
    public ResponseData getJiaHaoYouAllStation() {
        try {
            gasService.getJiaHaoYouAllStation();
            return ResponseMsgUtil.success("1231243");
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
    @RequestMapping(value = "/getDianAllStation", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "点点网络")
    public ResponseData getDianAllStation() {
        try {

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

    @RequestMapping(value = "/integralRebateOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "积分返利")
    public ResponseData integralRebateOrder() {
        try {

            // 查询满足初步返利条件订单
            List<HighOrder> order = highOrderService.integralRebateOrder();
            for (HighOrder highOrder : order) {

                // 查询是否存在积分记录
                Map<String, Object> map = new HashMap<>();
                map.put("goldType", 1);
                map.put("resType", 4);
                map.put("userId", highOrder.getMemId());
                map.put("resId", highOrder.getId());

                List<HighGoldRec> goldRecs = highGoldRecService.getGoldRec(map);

                // 判断是否重复赠送积分
                if (goldRecs.size() == 0) {
                    bsOrderRebateService.insertOrderRebate(highOrder);
                }

                highOrder.setWhetherRebate(true);
                highOrderService.updateOrderDetail(highOrder);

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


    @RequestMapping(value = "/getApiCoupon", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取卡券")
    public ResponseData getApiCoupon() {
        try {

            // 查询满足初步返利条件订单
            List<HighOrder> order = highOrderService.integralRebateOrder();
            for (HighOrder highOrder : order) {

                // 查询是否存在积分记录
                Map<String, Object> map = new HashMap<>();
                map.put("goldType", 1);
                map.put("resType", 4);
                map.put("userId", highOrder.getMemId());
                map.put("resId", highOrder.getId());

                List<HighGoldRec> goldRecs = highGoldRecService.getGoldRec(map);

                // 判断是否重复赠送积分
                if (goldRecs.size() == 0) {
                    bsOrderRebateService.insertOrderRebate(highOrder);
                }

                highOrder.setWhetherRebate(true);
                highOrderService.updateOrderDetail(highOrder);

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

    @RequestMapping(value = "/couponDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据订单号查询中石油卡券详情")
    public ResponseData couponDetail(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230258302");
            mapPost.put("mchOrderNo" , mchOrderNo);
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "0C7897EA3BD96156A5881618FF2FF645", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("http://localhost:9902/v1/apiCoupon/getCheckCode" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getCouponList", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取卡券")
    public ResponseData getCouponList() {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20230394901");
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "B94B5E62807FA56A7260AB581D8A1B48", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/apiCoupon/getCouponList" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/refundApi", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "支付退款")
    public ResponseData refundApi(@RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        try {

            ApiOrder apiOrder = apiOrderService.findByOrderNo(mchOrderNo , null);
            // 查询APi
            HighOrder order = highOrderService.getOrderByOrderNo(apiOrder.getOrderNo());

            orderService.refundOrder(order, "商户退款退款", OrderRefundOpUserType.TYPE1,
                    null,
                    "系统自动退款");

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

    @RequestMapping(value = "/checkAccountBalance", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询余额")
    public ResponseData checkAccountBalance() {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20240133101");
//            mapPost.put("mchOrderNo" , mchOrderNo);
            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "1F43EEC88D0F99FC201D81143F9EED85", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/apiMerchants/checkAccountBalance" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getStationStore", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询油站")
    public ResponseData getStationStore() {
        try {

            Map<String , Object> mapPost = new HashMap<>();
            mapPost.put("merchId" , "20240587402");
//            mapPost.put("mchOrderNo" , mchOrderNo);
//            mapPost.put("timetable" , new Date().getTime());
            mapPost.put("sign" , WxUtils.generateSignApi(mapPost, "1A566F46B57830C45A06AD0AA387435C", WXPayConstants.SignType.MD5));

            return ResponseMsgUtil.success(HttpsUtils.doPost("https://hsg.dctpay.com/v1/refuelOnline/getStationStore" , mapPost , new HashMap<>()));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/getKfcStore", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取kfc门店")
    public ResponseData getKfcStore() {
        try {

            JSONObject jsonObject = QianZhuConfig.getKfcStore();

            JSONArray object = jsonObject.getJSONArray("data");
            for (Object data : object) {
                JSONObject dataObject = (JSONObject) data;
                Map<String, Object> mapStore = new HashMap<>();
                mapStore.put("storeCode" , dataObject.getString("storeCode"));
                ApiKfcStores apiKfcStores = apiProductService.findKfcStores(mapStore);

                if (apiKfcStores == null) {
                    apiKfcStores = new ApiKfcStores();
                }
                apiKfcStores.setProvinceCode(dataObject.getString("provinceCode"));
                apiKfcStores.setProvinceName(dataObject.getString("provinceName"));
                apiKfcStores.setCityCode(dataObject.getString("cityCode"));
                apiKfcStores.setCityName(dataObject.getString("cityName"));
                apiKfcStores.setCityNameFirstLetter(dataObject.getString("cityNameFirstLetter"));
                apiKfcStores.setKfcCityId(dataObject.getInteger("kfcCityId"));
                apiKfcStores.setKfcCityCode(dataObject.getString("kfcCityCode"));
                apiKfcStores.setStoreName(dataObject.getString("storeName"));
                apiKfcStores.setStoreCode(dataObject.getString("storeCode"));
                apiKfcStores.setLon(dataObject.getString("lon"));
                apiKfcStores.setLat(dataObject.getString("lat"));
                apiKfcStores.setAddress(dataObject.getString("address"));
                apiKfcStores.setStartTime(dataObject.getString("startTime"));
                apiKfcStores.setEndTime(dataObject.getString("endTime"));
                apiKfcStores.setStoreStatus(dataObject.getInteger("storeStatus"));
                apiKfcStores.setShelfStatus(dataObject.getInteger("shelfStatus"));

                if (apiKfcStores.getId() == null) {
                    apiKfcStores.setCreateTime(new Date());
                    apiKfcStores.setOperatorId(9999L);
                    apiKfcStores.setOperatorName("系统生成");
                    apiKfcStores.setStatus(100);
                    apiProductService.insertKfcStore(apiKfcStores);
                } else {
                    apiKfcStores.setUpdateTime(new Date());
                    apiProductService.updateKfcStore(apiKfcStores);
                }
            }

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




    @RequestMapping(value = "/decryptPetroConfig", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "解码")
    public ResponseData decryptPetroConfig(@RequestParam(name = "content", required = true) String content) {
        try {

            PetroConfig.init(1);

            String data = PetroConfig.decrypt(content);
            JSONObject object = JSONObject.parseObject(data);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }



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

            PetroConfig.init(2);

            JSONObject jsonObject = petroConfig.synCouponRule();
            String data = PetroConfig.decrypt(jsonObject.getString("jsonResult"));
            JSONArray jsonArray = JSONArray.parseArray(data);

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

    @RequestMapping(value = "/getCoupon", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getCoupon")
    public ResponseData getCoupon(@RequestParam(name = "code", required = true) String code) {
        try {

            PetroConfig.init(2);

            // 发放卡券
            JSONObject jsonObject = petroConfig.getCoupon(code ,"18090580471");
            String data = PetroConfig.decrypt(jsonObject.getString("jsonResult"));
            JSONObject object = JSONObject.parseObject(data);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/decrypt", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "decrypt")
    public ResponseData decrypt(@RequestParam(name = "jsonResult", required = true) String jsonResult) {
        try {

            PetroConfig.init(2);
            String data = PetroConfig.decrypt(jsonResult);
            JSONObject object = JSONObject.parseObject(data);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

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

            JSONObject object = RechargeConfig.jNiuGoodsList();
            JSONArray array = object.getJSONArray("data");
            List<JSONObject> list = new ArrayList<>();
            for (int i = 0; i < array.size(); i++) {
                JSONObject jsonObject = array.getJSONObject(i);
                JSONArray jsonArray = jsonObject.getJSONArray("goodsOption");
                for (int j = 0; j < jsonArray.size(); j++) {
                    JSONObject goodsOption = jsonArray.getJSONObject(j);
                    JSONArray childArray = goodsOption.getJSONArray("child");
                    for (int t = 0; t < childArray.size(); t++) {
                        JSONObject child = childArray.getJSONObject(j);
                        JSONObject data = new JSONObject();
                        data.put("title" , jsonObject.getString("sort_title") + goodsOption.getString("name"));
                        data.put("goodsId" ,  child.getString("goods_id"));
                        data.put("goodsOptionId" ,  child.getString("goods_option_id"));
                        data.put("platPrice" ,  child.getString("plat_price"));
                        data.put("officialPrice" ,  child.getString("official_price"));
                        list.add(data);
                    }

                }

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


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

            JSONObject object = new JSONObject();

            object.put("orderNo", OrderUtil.generateOrderNo());
            object.put("option_id", "632");
            object.put("phone", "18090580471");
            JSONObject returnObject = RechargeConfig.rechargeOrderByJn(object);

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

    @RequestMapping(value = "/checkOrderByJn", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "checkOrderByJn")
    public ResponseData checkOrderByJn(@RequestParam(name = "order_no", required = true) String order_no) {
        try {

            JSONObject object = new JSONObject();

            object.put("orderNo" , order_no);
            int status = 0;
            JSONObject jsonObject = RechargeConfig.checkOrderByJn(object);
            if (jsonObject.getJSONObject("data") != null) {
                JSONObject  objectData= jsonObject.getJSONObject("data");
                // // 10充值中 20充值完成 -10 充值失败
                // -1取消，0充值中 ，1充值成功，2充值失败，3部分成功
                if (objectData.getInteger("status") == 10) {
                    status = 0;
                } else if (objectData.getInteger("status") == 20) {
                    status =  1;
                } else if (objectData.getInteger("status") == -10) {
                    status = 2;
                }
            }

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


    @RequestMapping(value = "/getListRechargeOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "getListRechargeOrder")
    public ResponseData getListRechargeOrder(@RequestParam(name = "order_no", required = true) String order_no) {
        try {

            log.info("处理话费订单定时任务开始");
            Map<String, Object> map = new HashMap<>();
            map.put("payStatus", String.valueOf(102));
            map.put("rechargeStatus", String.valueOf(201));
            List<OutRechargeOrder> orderList = outRechargeOrderService.getListRechargeOrder(map);
            log.info("处理话费订单条数:" + orderList.size());
            if (orderList.size() > 0) {
                for (OutRechargeOrder order : orderList) {
                    try {
                        outRechargeOrderService.prepaidRechargeHandle(order);
                    } catch (Exception e) {
                        log.info("话费定时任务订单业务出现异常", e);
                    }
                }
            }
            return ResponseMsgUtil.success("");
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/etcOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "etcOrder")
    public ResponseData etcOrder() {
        try {
            String mobile = "18090580471";
            Map<String, Object> map = new TreeMap<>();
            map.put("requestId" , System.nanoTime());
            map.put("channelCode" , CommonSysConst.getSysConfig().getEtcChannelCode());
            map.put("timestamp" , new Date().getTime() / 1000);
            map.put("productNo" , "GZETCFXQD_GZETCCSCP");
            map.put("mobile" , RSAUtil.encryptBASE64(RSAUtil.encryptByPublicKey(mobile.getBytes(StandardCharsets.UTF_8), CommonSysConst.getSysConfig().getEtcPublicKey())));
            map.put("num" , 1);
            map.put("thirdOrderId" , OrderUtil.generateOrderNo());
            String s = StringUtils.join(map.values(), "");
            String sign = RSAUtil.sign(s.getBytes(), CommonSysConst.getSysConfig().getEtcPrivateKey());
            map.put("sign", sign);

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

    @RequestMapping(value = "/couJointDist", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "商户派发电子券")
    public ResponseData couJointDist(@RequestParam(name = "order_no", required = true) String order_no) {
        try {

            // 购买卡券
            JSONObject returnParam = HuiLianTongConfig.costRechargeOrder(order_no);
            // 解密
            JSONObject jsonObject = HuiLianTongUnionCardConfig.resolveResponse(returnParam.getString("data"));
            JSONArray dataArray = JSONObject.parseObject(jsonObject.getString("data"), JSONArray.class);

            return ResponseMsgUtil.success(dataArray);

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

    @RequestMapping(value = "/getCarNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询车牌订单号")
    public ResponseData getCarNo(@RequestParam(name = "carNo", required = true) String carNo) {
        try {

            JSONObject jsonObject = new JSONObject();
            jsonObject.put("carNo" , carNo);
            jsonObject.put("orderStatus" , "03");

            JSONObject data = blxConfig.queryJsOrderList(jsonObject);

            return ResponseMsgUtil.success(data);

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

    @RequestMapping(value="/getGasDetailByStoreKey",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据门店key 查询")
    public ResponseData getGasDetailByStoreKey(@RequestParam(name = "storeKey", required = true) String storeKey) {
        try {

            JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(storeKey);
            return ResponseMsgUtil.success(jsonObject.get("result"));
        } catch (Exception e) {
            log.error("HighGasController -> getGasDetailByStoreKey() error!",e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value="/getSphCoupon",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取卡券")
    public ResponseData getSphCoupon() {
        try {

            JSONObject jsonObject = PetroCouponConfig.getCouponList();
            return ResponseMsgUtil.success(jsonObject);
        } catch (Exception e) {
            log.error("HighGasController -> getGasDetailByStoreKey() error!",e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value="/mchBalance",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "处理扣款")
    public ResponseData mchBalance(@RequestParam(name = "merchId", required = true) String merchId,
                                   @RequestParam(name = "mchOrderNo", required = true) String mchOrderNo) {
        ApiMerchants apiMerchants = apiMerchantsService.findByMchId(merchId);

        ApiOrder apiOrder = apiOrderService.findByOrderNo(mchOrderNo , null);

        String key = "apiMerchant" + apiMerchants.getMchId();
        try {

            // 分布式锁占坑
            Boolean lock = redisTemplate.opsForValue().setIfAbsent(key, apiOrder.getOrderNo());

            HighOrder order = highOrderService.getOrderByOrderNo(apiOrder.getOrderNo());

            if(Boolean.TRUE.equals(lock)) {

                // 判断金额是否充足
                if (!priceComputeConfig.mchBalance(apiMerchants , apiOrder.getCostPrice() , apiOrder.getMchOrderNo())) {
                    throw ErrorHelp.genException(SysCode.System, ErrorCode.INSUFFICIENT_BALANCE);
                }

                apiOrder.setStatus(3);
                apiOrderService.updateOrder(apiOrder);

                order.setOrderStatus(3);
                order.getHighChildOrderList().get(0).setChildOrderStatus(3);

                highOrderService.updateOrder(order);

            } else {
                // 加锁失败，重试
                Thread.sleep(100);
                mchBalance(merchId , mchOrderNo);
            }
            return null;
        } catch (Exception e) {
            log.error("HighGasController -> getGasDetailByStoreKey() error!",e);
            return ResponseMsgUtil.exception(e);
        } finally {
            // 删除key，释放锁
            redisTemplate.delete(key);
        }
    }

    @RequestMapping(value = "/getMerchantStoreList", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "下架团油")
    public ResponseData getMerchantStoreList() {
        try {

            // 客户端
            Map<String, Object> param = new HashMap<>();
            param.put("sourceType", 2);
//        param.put("regionId", "500000");
//        param.put("storeName", "壳牌");
            param.put("status", 1);
            List<HighMerchantStore> merchantStoreList = merchantStoreService.getMerchantStoreList(param);

            for (HighMerchantStore merchantStore : merchantStoreList) {
                merchantStore.setUpdateTime(new Date());
                merchantStore.setStatus(0);
                merchantStoreService.updateMerchantStoreDetail(merchantStore);
            }
            return ResponseMsgUtil.success("成功");

        } catch (Exception e) {
            return ResponseMsgUtil.exception(e);
        }
    }

}


\ No newline at end of file
diff --git a/hai-order/src/main/java/com/web/controller/OrderController.java b/hai-order/src/main/java/com/web/controller/OrderController.java
index bcc5b022..8269bdda 100644
--- a/hai-order/src/main/java/com/web/controller/OrderController.java
+++ b/hai-order/src/main/java/com/web/controller/OrderController.java
@@ -98,10 +98,10 @@ public class OrderController {
                 log.error("OrderController -> create() error!","");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.USE_VISIT_ILLEGAL, "");
             }
-            if (StringUtils.isBlank(userModel.getHighUser().getPhone())) {
-                log.error("OrderController -> create() error!","");
-                throw ErrorHelp.genException(SysCode.System, ErrorCode.NO_BIND_PHONE, "");
-            }
+//            if (StringUtils.isBlank(userModel.getHighUser().getPhone())) {
+//                log.error("OrderController -> create() error!","");
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.NO_BIND_PHONE, "");
+//            }
             body.setMemId(userModel.getHighUser().getId());
             body.setMemName(userModel.getHighUser().getName());
             body.setMemPhone(userModel.getHighUser().getPhone());
@@ -312,7 +312,11 @@ public class OrderController {
 
                     GoodsLogistics logistics = goodsLogisticsService.findGoodsLogistics(childOrder.getId());
                     if (logistics != null) {
-                        childOrder.setExt6(logistics.getLogisticsStatusDesc());
+                        if (logistics.getLogisticsStatusDesc() == null ) {
+                            childOrder.setExt6("待揽收");
+                        } else {
+                            childOrder.setExt6(logistics.getLogisticsStatusDesc());
+                        }
                         childOrder.setExt4(logistics.getNumber());
                     }
 
diff --git a/hai-schedule/src/main/java/com/hai/schedule/ApiThirdProductSchedule.java b/hai-schedule/src/main/java/com/hai/schedule/ApiThirdProductSchedule.java
index e46378a9..0eaea54c 100644
--- a/hai-schedule/src/main/java/com/hai/schedule/ApiThirdProductSchedule.java
+++ b/hai-schedule/src/main/java/com/hai/schedule/ApiThirdProductSchedule.java
@@ -72,7 +72,7 @@ public class ApiThirdProductSchedule {
         }
     }
 
-    @Scheduled(cron = "0 0 1 * * ?")   // 获取肯德基门店 每日凌晨1点执行一次
+    @Scheduled(cron = "0 0 10 * * ?")   // 获取肯德基门店 每日10点执行一次
     public void getKfcStore() throws Exception {
 
         JSONObject jsonObject = QianZhuConfig.getKfcStore();
diff --git a/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java b/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java
index a329c96b..91bfa457 100644
--- a/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java
+++ b/hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java
@@ -147,10 +147,9 @@ public class HighGasSchedule {
 //            }
 //        }
 //    }
-
     @Scheduled(cron = "5 0 0 * * ?")   // 每日凌晨00:00:5执行一次
     public void getJiaHaoYouAllStation() throws Exception {
-        gasService.getJiaHaoYouAllStation();
+//        gasService.getJiaHaoYouAllStation();
     }
 
 //    @Scheduled(cron = "5 0 0 * * ?")   // 每日凌晨00:00:5执行一次
diff --git a/hai-service/src/main/java/com/hai/service/HighUserService.java b/hai-service/src/main/java/com/hai/service/HighUserService.java
index c4a09552..d63a03f2 100644
--- a/hai-service/src/main/java/com/hai/service/HighUserService.java
+++ b/hai-service/src/main/java/com/hai/service/HighUserService.java
@@ -31,6 +31,18 @@ public interface HighUserService {
      */
     SessionObject loginAndRegister(LoginPlatform platForm, String phone, Long popularizeUserId, Map<String, Object> other, HttpServletRequest request, HttpServletResponse response) throws Exception;
 
+    /**
+     * @MethodName loginAndRegister
+     * @Description: 登录并注册
+     * @param unionId
+     * @param request
+     * @param response
+     * @return: com.hai.common.security.SessionObject
+     * @Author: Sum1Dream
+     * @Date: 2024/7/2 下午3:13
+     */
+    SessionObject loginAndRegister(String phone , String unionId,  HttpServletRequest request, HttpServletResponse response) throws Exception;
+
     /**
      * 查询用户列表
      * @param param
diff --git a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
index 58aeeaaf..c6e155ca 100644
--- a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java
@@ -434,6 +434,7 @@ public class ApiProductServiceImpl implements ApiProductService {
         if (StringUtils.isNotBlank(MapUtils.getString(map , "cityCode"))) {
             criteria.andCityCodeEqualTo(MapUtils.getString(map , "cityCode"));
         }
+        criteria.andStoreStatusEqualTo(1).andShelfStatusEqualTo(1);
 
         return apiKfcStoresMapper.selectByExample(example);
     }
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
index 0362b015..0f569a6f 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
@@ -168,6 +168,38 @@ public class HighUserServiceImpl implements HighUserService {
         return so;
     }
 
+    @Override
+    public SessionObject loginAndRegister(String phone , String unionId, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        HighUser user = findByUnionId(unionId);
+
+        if (user == null) {
+            user = new HighUser();
+            user.setName("嗨用户");
+            user.setRegTime(new Date());
+            user.setGold(0);
+            user.setStatus(1);
+            user.setPhone(phone);
+            user.setInfoCompleteStatus(1); // 用户信息完整状态  0：完整  1：需要填写用户信息 2：需要填写手机号
+            user.setUnionId(unionId);
+            highUserMapper.insert(user);
+
+        } else {
+            user.setPhone(phone);
+            user.setUnionId(unionId);
+            highUserMapper.updateByPrimaryKeySelective(user);
+        }
+
+
+
+        // 缓存登录信息
+        HighUserModel highUserModel = new HighUserModel();
+        highUserModel.setHighUser(getDetailDataByUser(user.getId()));
+        SessionObject so = new SessionObject(unionId, 1 , highUserModel);
+        userCenter.save(request,response,so);
+
+        return so;
+    }
+
     @Override
     public List<HighUser> getUserList(Map<String, Object> param) {
         HighUserExample example = new HighUserExample();
diff --git a/hai-service/src/main/resources/dev/commonConfig.properties b/hai-service/src/main/resources/dev/commonConfig.properties
index 203d48d6..1df2b445 100644
--- a/hai-service/src/main/resources/dev/commonConfig.properties
+++ b/hai-service/src/main/resources/dev/commonConfig.properties
@@ -36,13 +36,13 @@ jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
 jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
 
 # ????
-qinzhuUrl=https://live-test.qianzhu8.com
-qinzhuUrlToken=https://live-test.qianzhu8.com/gateway
-qinzhuHtmlUrl=https://m-test.qianzhu8.com
-qianzhuH5url=https://nf-test.qianzhu8.com/gateway
-qinzhuPlatformId=10376
-qinzhuSecret=ktxb49sh2jfhgn8g
-qianzhuOrderNotify=https://hsgcs.dctpay.com/crest/qianzhu/orderNotify
+qinzhuUrl=https://live.qianzhu8.com
+qinzhuUrlToken=https://live.qianzhu8.com/gateway
+qinzhuHtmlUrl=https://qz.dctpay.com
+qianzhuH5url=https://nf.qianzhu8.com/gateway
+qinzhuPlatformId=10458
+qinzhuSecret=nnl3gg4ss0pka11t
+qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify
 
 thirdAppKey=211394653
 thirdAppSecret=cyQpQKMaGUG186iEZRt1uQ==
diff --git a/hai-user/src/main/java/com/web/controller/WechatController.java b/hai-user/src/main/java/com/web/controller/WechatController.java
index 958f9d02..44b1fc2e 100644
--- a/hai-user/src/main/java/com/web/controller/WechatController.java
+++ b/hai-user/src/main/java/com/web/controller/WechatController.java
@@ -49,8 +49,9 @@ public class WechatController {
 
     @RequestMapping(value = "/loginBySilence", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "【H5】根据手机号登录")
-    public ResponseData loginBySilence(@RequestParam(value = "phone", required = true) String phone ,
+    @ApiOperation(value = "【H5】根据unionId登录")
+    public ResponseData loginBySilence(@RequestParam(value = "unionId", required = true) String unionId ,
+                                       @RequestParam(value = "phone", required = false) String phone ,
                                        HttpServletRequest request, HttpServletResponse response) {
         try {
 
@@ -60,7 +61,7 @@ public class WechatController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知客户端");
             }
 
-            return ResponseMsgUtil.success(userService.loginAndRegister(platform, phone, null, new HashMap<>(), request, response));
+            return ResponseMsgUtil.success(userService.loginAndRegister( phone , unionId,  request, response));
 
         } catch (Exception e) {
             return ResponseMsgUtil.exception(e);
diff --git a/v1/src/main/java/com/v1/controller/orderController.java b/v1/src/main/java/com/v1/controller/orderController.java
index b8a65d7a..f560cfa4 100644
--- a/v1/src/main/java/com/v1/controller/orderController.java
+++ b/v1/src/main/java/com/v1/controller/orderController.java
@@ -86,11 +86,11 @@ public class orderController {
             }  else  {
                 ip = request.getHeader("x-forwarded-for");
             }
-//
-//            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
-//                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
-//                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
-//            }
+
+            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
+                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
+            }
 
             if (
                     StringUtils.isBlank(object.getString("productType")) ||
@@ -233,7 +233,6 @@ public class orderController {
                 log.error("getRechargeProduct error!", "帐户错误！");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_NOT_EXIST);
             }
-
             Map<String , Object> map = new HashMap<>();
             map.put("mchOrderNo" , object.getString("mchOrderNo"));
             map.put("apiKey" , apiMerchants.getApiKey());
@@ -279,11 +278,11 @@ public class orderController {
             }  else  {
                 ip = request.getHeader("x-forwarded-for");
             }
-//
-//            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
-//                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
-//                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
-//            }
+
+            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
+                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
+            }
 
             if (
                             StringUtils.isBlank(object.getString("mchOrderNo")) ||
@@ -333,10 +332,10 @@ public class orderController {
                 ip = request.getHeader("x-forwarded-for");
             }
 
-//            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
-//                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
-//                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
-//            }
+            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
+                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
+            }
 
             if (
                     StringUtils.isBlank(object.getString("mchOrderNo")) ||
@@ -406,10 +405,10 @@ public class orderController {
                 ip = request.getHeader("x-forwarded-for");
             }
 
-//            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
-//                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
-//                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
-//            }
+            if (!apiIpAddressService.validationIpAddressLegal(object.getString("merchId") , ip)) {
+                log.error("getRechargeProduct error!", "非法ip地址，请联系管理人员！");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.IP_ERROR, "非法ip地址，请联系管理人员！");
+            }
 
             if (
                             StringUtils.isBlank(object.getString("paySerialNo")) ||