diff --git a/hai-bweb/src/main/java/com/bweb/controller/ApiMemberProductController.java b/hai-bweb/src/main/java/com/bweb/controller/ApiMemberProductController.java
index 97d22405..5debc697 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/ApiMemberProductController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/ApiMemberProductController.java
@@ -93,6 +93,7 @@ public class ApiMemberProductController {
                 apiMemberProduct.getTypeId() == null ||
                     StringUtils.isBlank(apiMemberProduct.getProductId()) ||
                     apiMemberProduct.getBrandId() == null ||
+                    apiMemberProduct.getCostPrice() == null ||
                     apiMemberProduct.getPrice() == null ) {
                 log.error("ApiMemberProductController -> insertMemberProduct() error!","参数错误");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
@@ -129,6 +130,7 @@ public class ApiMemberProductController {
                     apiMemberProduct.getTypeId() == null ||
                     StringUtils.isBlank(apiMemberProduct.getProductId()) ||
                     apiMemberProduct.getBrandId() == null ||
+                    apiMemberProduct.getCostPrice() == null ||
                     apiMemberProduct.getPrice() == null ) {
                 log.error("ApiMemberProductController -> insertMemberProduct() error!","参数错误");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
diff --git a/hai-bweb/src/main/resources/dev/application.yml b/hai-bweb/src/main/resources/dev/application.yml
index 59fb1869..08ddc6e6 100644
--- a/hai-bweb/src/main/resources/dev/application.yml
+++ b/hai-bweb/src/main/resources/dev/application.yml
@@ -9,7 +9,7 @@ debug: false
 #datasource数据源设置
 spring:
   datasource:
-    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://139.159.177.244:3306/hsg_yy?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: HF123456.
     type: com.alibaba.druid.pool.DruidDataSource
diff --git a/hai-bweb/src/main/resources/dev/config.properties b/hai-bweb/src/main/resources/dev/config.properties
index 25674f3d..da0992f7 100644
--- a/hai-bweb/src/main/resources/dev/config.properties
+++ b/hai-bweb/src/main/resources/dev/config.properties
@@ -1,5 +1,5 @@
-#fileUrl=/home/project/hsg/filesystem
-fileUrl=/Volumes/work/code/filesystem/
+fileUrl=/home/project/hsg/filesystem
+#fileUrl=/Volumes/work/code/filesystem/
 cmsPath=/home/project/hsg/filesystem/cmsPath
 agentQrCode=/home/project/hsg/filesystem/agentQrCode
 agentQrCodeWxUrl=https://hsgcs.dctpay.com/wx/?action=ic&id=
diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighGoodsTypeController.java b/hai-cweb/src/main/java/com/cweb/controller/HighGoodsTypeController.java
index be13de46..bd0c7808 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighGoodsTypeController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighGoodsTypeController.java
@@ -50,12 +50,14 @@ public class HighGoodsTypeController {
     @ApiOperation(value = "获取商品类型列表")
     public ResponseData getListGoodsType(@RequestParam(name = "pageNum", required = true) Integer pageNum,
                                          @RequestParam(name = "pageSize", required = true) Integer pageSize,
+                                         @RequestParam(name = "userService", required = false) String userService,
                                          @RequestParam(name = "title", required = false) String title,
                                          HttpServletRequest request) {
         try {
 
             Map<String,String> map = new HashMap<>();
             map.put("title", title);
+            map.put("userService", userService);
 
             PageHelper.startPage(pageNum,pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(highGoodsTypeService.getListGoodsType(map)));
diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
index b139da8d..6e68f933 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
@@ -1 +1 @@
-package com.cweb.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cweb.config.SysConst;
import com.hai.common.Base64Util;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.security.SessionObject;
import com.hai.common.utils.*;
import com.hai.config.*;
import com.hai.dao.HighGasOrderPushMapper;
import com.hai.entity.*;
import com.hai.model.*;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContexts;
import org.apache.http.util.EntityUtils;
import org.bouncycastle.util.encoders.UrlBase64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.IdGenerator;
import org.springframework.web.bind.annotation.*;
import sun.nio.cs.StreamEncoder;

import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
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 HighMerchantService highMerchantService;

    @Resource
    private HighMerchantStoreService highMerchantStoreService;

    @Resource
    private HighGasOilPriceService highGasOilPriceService;

    @Resource
    private HighOrderService highOrderService;

    @Resource
    private HighProfitSharingRecordService highProfitSharingRecordService;

    @Resource
    private HighGasOrderPushMapper highGasOrderPushMapper;

    @Resource
    private HuiLianTongConfig huiLianTongConfig;

    @Resource
    private UnionPayConfig unionPayConfig;

    @Resource
    private UnionStagingPayConfig unionStagingPayConfig;

    @Resource
    private UnionUserConfig unionUserConfig;

    @Resource
    private OutRechargeOrderService outRechargeOrderService;

    @Resource
    private HighOilCardService oilCardService;

    @Resource
    private BaiduVoiceService baiduVoiceService;

    @Resource
    private MqttProviderConfig mqttProviderConfig;

    @Autowired
    private WebSocket webSocket;

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

            // 查询订单
            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);

            BigDecimal rake = new BigDecimal("0.05");

            // 计算微信收取的手续费     支付金额 * 0.002      注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
            BigDecimal wxHandlingFee = order.getPayRealPrice().multiply(new BigDecimal("0.002")).setScale(2,BigDecimal.ROUND_HALF_DOWN);
            BigDecimal price = order.getPayRealPrice().subtract(wxHandlingFee);

            // 计算分账金额    手续费后的价格 * 0.05  注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
            BigDecimal profitSharingAmount = price.multiply(rake).setScale(2,BigDecimal.ROUND_DOWN);
            this.wxGasProfitsharing(order.getExt1(), order.getPaySerialNo(),order.getOrderNo(),profitSharingAmount);
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    public void wxGasProfitsharing(String appid,String transaction_id,String out_order_no, BigDecimal amount) {
        try {
            Map<String,String> param = new LinkedHashMap<>();
            param.put("appid", appid);
            param.put("mch_id", "1289663601");
            param.put("sub_mch_id" , "1624126902"); // 个体户黎杨珍
            param.put("transaction_id" , transaction_id);
            param.put("out_order_no" , out_order_no);
            param.put("nonce_str" , WxUtils.makeNonStr());

            // 分账金额
            BigDecimal porofitSharingAmount = amount;

            List<Map<String,Object>> receiversList = new ArrayList<>();
            Map<String,Object> receiversMap = new LinkedHashMap<>();
            receiversMap.put("type", "MERCHANT_ID");
            receiversMap.put("account", "1603942866");
            receiversMap.put("amount", porofitSharingAmount.multiply(new BigDecimal("100")).intValue());
            receiversMap.put("description", "分给商户【惠昕石化】");
            receiversList.add(receiversMap);
            param.put("receivers" , JSONObject.toJSONString(receiversList));
            String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256);
            param.put("sign" , signStr);
            String resultXmL = this.doRefundRequest(param.get("mch_id"),null, WxUtils.mapToXml(param));

            // 请求分账返回的结果
            ResultProfitSharing resultProfitSharing = XmlUtil.getObjectFromXML(resultXmL, ResultProfitSharing.class);

            HighProfitSharingRecord sharingRecord = new HighProfitSharingRecord();
            sharingRecord.setOutOrderNo(out_order_no);
            sharingRecord.setTransactionId(transaction_id);
            sharingRecord.setOrderId(resultProfitSharing.getOrder_id());
            sharingRecord.setStatus(resultProfitSharing.getResult_code());
            sharingRecord.setPrice(amount);
            sharingRecord.setCreateTime(new Date());
            sharingRecord.setContent(resultXmL);
            highProfitSharingRecordService.insert(sharingRecord);

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


    @RequestMapping(value = "/addPrinter", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询汇联通工会卡详情")
    public ResponseData addPrinter(HttpServletRequest request) {
        try {
            SpPrinterConfig spPrinterConfig = new SpPrinterConfig();
            return ResponseMsgUtil.success(
                    spPrinterConfig.addPrinter(
                            "1540500213",
                            "bxpjpnh4",
                            "丹凤加油站打印机"
                    )
            );

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

    @RequestMapping(value = "/queryThirdOrderDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "订单结果查询")
    public ResponseData queryThirdOrderDretail(HttpServletRequest request) {
        try {
            return ResponseMsgUtil.success(TuanYouConfig.queryThirdOrderDetail("HF2022051214411536507"));

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

    @RequestMapping(value = "/spPrint", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "发送打印机消息")
    public ResponseData spPrint(@RequestParam(name = "orderNo", required = true) String orderNo, HttpServletRequest request) {
        try {

            HighOrder highOrder = highOrderService.getOrderByOrderNo(orderNo);
            for (HighChildOrder highChildOrder : highOrder.getHighChildOrderList()) {
                HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId());
                new Thread(() -> {
                    try {
                        SpPrinterConfig sp = new SpPrinterConfig();
                        sp.print(store.getDeviceSn(),
                                SpPrinterTemplate.oilCashierStubTemp(
                                        highChildOrder.getGoodsName(),
                                        highOrder.getOrderNo(),
                                        DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
                                        "嗨森逛",
                                        highChildOrder.getGasGunNo(),
                                        highChildOrder.getGasOilNo(),
                                        highChildOrder.getGasOilLiters().toString(),
                                        highOrder.getTotalPrice().toString()
                                ), 1);

                        Thread.sleep(6000);

                        sp.print(store.getDeviceSn(),
                                SpPrinterTemplate.oilClientStubTemp(
                                        highChildOrder.getGoodsName(),
                                        highOrder.getOrderNo(),
                                        DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
                                        "嗨森逛",
                                        highChildOrder.getGasGunNo(),
                                        highChildOrder.getGasOilNo(),
                                        highChildOrder.getGasOilLiters().toString(),
                                        highOrder.getTotalPrice().toString()
                                ), 1);
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }).start();
            }

            return ResponseMsgUtil.success("发送成功");

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

    @RequestMapping(value = "/text2audio", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "文本转语音")
    public ResponseData text2audio(HttpServletRequest request) {
        try {

            return ResponseMsgUtil.success(baiduVoiceService.text2audio("加油站收款400元"));

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

    @RequestMapping(value = "/getGasDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询汇联通工会卡详情")
    public ResponseData getGasDetail(@RequestParam(name = "cardNo", required = true) String cardNo, HttpServletRequest request) {
        try {
            return ResponseMsgUtil.success(TuanYouConfig.queryGasInfoByGasId(cardNo));

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


    @RequestMapping(value = "/queryGasInfoByGasId", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据油站 id 拉取最新的油站数据")
    public ResponseData queryGasInfoByGasId(@RequestParam(name = "gasId", required = true) String gasId, HttpServletRequest request) {
        try {
            return ResponseMsgUtil.success(TuanYouConfig.queryGasInfoByGasId(gasId));

        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
//
//    @RequestMapping(value = "/getMobile", method = RequestMethod.GET)
//    @ResponseBody
//    @ApiOperation(value = "话费充值")
//    public ResponseData getMobile(
//            @RequestParam(name = "orderNo", required = true) String orderNo,
//            @RequestParam(name = "amount", required = true) Integer amount,
//            @RequestParam(name = "phone", required = true) String phone,
//                                  HttpServletRequest request) {
//        try {
//            return ResponseMsgUtil.success(outRechargeOrderService.getMobile(phone,amount,orderNo));
//
//        } catch (Exception e) {
//            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
//            return ResponseMsgUtil.exception(e);
//        }
//    }

    @RequestMapping(value = "/initTYMerchantStore", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "初始化加油站")
    public ResponseData initTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception {

        HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId);
        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"));
                if (store != null) {
                    store.setType(1);
                    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.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.getInteger("oilNo"));
                        if (highGasOilPrice == null) {
                            highGasOilPrice = new HighGasOilPrice();
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                        } else {
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                        }
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                } else {
                    highMerchantStore = new HighMerchantStore();
                    highMerchantStore.setType(1);
                    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.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.getInteger("oilNo"));
                        highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                        highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                        highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                        highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                        highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                        highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                }
            }
        }
        return ResponseMsgUtil.success("初始化完成");
    }

    @RequestMapping(value = "/detectTYMerchantStore", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "检测加油站")
    public ResponseData detectTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception {

        HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId);
        if (merchant == null) {
            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户");
        }

        Map<String, Object> param = new HashMap<>();
        param.put("merchantId", merchant.getId());
        List<HighMerchantStore> stores = highMerchantStoreService.getMerchantStoreList(param);

        for (HighMerchantStore store : stores) {
            JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(store.getStoreKey());
            if (jsonObject != null && jsonObject.getString("code").equals("200")) {
                JSONObject result = jsonObject.getJSONObject("result");
                store.setStatus(result.getInteger("gasStatus"));
            } else {
                store.setStatus(0);
            }
            highMerchantStoreService.updateMerchantStoreDetail(store);
        }
        return ResponseMsgUtil.success("初始化完成");
    }

 /*   @RequestMapping(value = "/pushTuanYouOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "推送团油订单")
    public ResponseData pushTuanYouOrder(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            for (HighChildOrder highChildOrder : order.getHighChildOrderList()) {
                HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId());
                // 推送团油订单
                Map<String, Object> paramMap = new HashMap<>();
                paramMap.put("gasId", store.getStoreKey());
                paramMap.put("oilNo", highChildOrder.getGasOilNo());
                paramMap.put("gunNo", highChildOrder.getGasGunNo());
                BigDecimal priceGun = highChildOrder.getGasPriceGun();
                BigDecimal priceVip = highChildOrder.getGasPriceVip();
                paramMap.put("priceGun", priceGun);  // 枪单价
                paramMap.put("priceVip", priceVip);  // 优惠价
                paramMap.put("driverPhone", order.getMemPhone());
                // paramMap.put("driverPhone", "17726395120");
                paramMap.put("thirdSerialNo", order.getOrderNo());
                paramMap.put("refuelingAmount", highChildOrder.getTotalPrice());

                // 油品类型 1:汽油:2:柴油;3:天然气
                if (highChildOrder.getGasOilType() == 1) {
                    paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount());
                } else if (highChildOrder.getGasOilType() == 2) {
                    paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount());
                }
                JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap);
                // 推送团油订单记录
                HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
                highGasOrderPush.setCreateTime(new Date());
                highGasOrderPush.setCode(orderPushObject.getString("code"));
                highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap));
                highGasOrderPush.setReturnContent(orderPushObject.toJSONString());
                highGasOrderPushMapper.insert(highGasOrderPush);

                if (orderPushObject != null && orderPushObject.getString("code").equals("200")) {
                    highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo"));
                }
                highOrderService.updateOrder(order);
            }
            return ResponseMsgUtil.success(order);
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
*/
    @RequestMapping(value = "/queryCompanyAccountInfo2JD", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询团油余额")
    public ResponseData queryCompanyAccountInfo2JD() {
        try {

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

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

            return ResponseMsgUtil.success(TuanYouConfig.queryCompanyPriceDetail("LW000115995", "92"));
        } catch (Exception e) {
            log.error("HighOrderController --> queryCompanyAccountInfo2JD() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/couJointDist", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "派发贵州卡券")
    public ResponseData couJointDist(@RequestParam(name = "token", required = true) String token) {
        try {
            return ResponseMsgUtil.success(HuiLianTongConfig.couJointDist(token,"HF2022031509263475105","20JY000575",1,"18385214742", "oArhO6QZSIJAcawo1Wwx5cKKZ0ns"));
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/tradeQuery", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "派发贵州卡券")
    public ResponseData tradeQuery(@RequestParam(name = "token", required = true) String token) {
        try {
            return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF2022031215130820400"));
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/zwrefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "派发贵州卡券")
    public ResponseData zwrefund() {
        try {
            return ResponseMsgUtil.success(UnionPayConfig.cancel(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF" + System.currentTimeMillis(), "31720220622093814132759"));
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/unionPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "银联支付") 
    public ResponseData unionPay(HttpServletRequest request) {
        try {
            // return ResponseMsgUtil.success(RequestUtils.getIpAddress(request));
            return ResponseMsgUtil.success(unionPayConfig.upPreOrder(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, "HF"+System.currentTimeMillis(), new BigDecimal("1"), "test",CommonSysConst.getSysConfig().getUnionPayNotifyUrl(), request));
        } catch (Exception e) {
            log.error("HighOrderController --> unionPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getToken", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取贵州中石化token")
    public ResponseData getToken() {
        try {
            return ResponseMsgUtil.success(huiLianTongConfig.getToken());
        } catch (Exception e) {
            log.error("HighOrderController --> getToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/unionTradeQuery", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "银联交易查询")
    public ResponseData unionTradeQuery(@RequestParam(name = "paySerialNo", required = true) String paySerialNo) {
        try {
            return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID1, UnionPayConfig.TERM_ID1, paySerialNo));
        } catch (Exception e) {
            log.error("HighOrderController --> unionTradeQuery() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/starbucksOrdersPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "星巴克支付")
    public ResponseData starbucksOrdersPay(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.starbucksOrdersPay(orderNo));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/payKfcOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "肯德基支付")
    public ResponseData payKfcOrder(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.payKfcOrder(orderNo));
        } 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 {


            // 汇联通充值
            String goodsDesc = "汇联通充值1元";
            String tranDesc = "";
            String businessType = "ghk_deposit";

            // 汇联通卡充值
            JSONObject deposit = HuiLianTongUnionCardConfig.deposit("TEST2022334532783", "8800030115015135432", new BigDecimal(1), businessType, "1231231223", tranDesc);


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


    @RequestMapping(value = "/wxSplitAccount", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "微信分账")
    public ResponseData wxSplitAccount() {
        try {
            HighOrder orderNo = highOrderService.getOrderByOrderNo("HF2021101812025050304");
            wxProfitsharing(orderNo.getOrderNo(),orderNo.getPaySerialNo(),orderNo.getPayRealPrice());
            return ResponseMsgUtil.success("分账成功");
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/unionStagingPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "银联分期支付")
    public ResponseData unionStagingPay(HttpServletRequest request) {
        try {

/*            String orderNo = DateUtil.format(new Date(), DateUtil.YMDHMS);
            orderNo += IDGenerator.nextId(28 - orderNo.length());*/

            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4)
                    +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    +DateUtil.format(new Date(), DateUtil.YMDHMS)
                    +IDGenerator.nextId(6);

            return ResponseMsgUtil.success(unionStagingPayConfig.advancePay(
                    orgTrace,
                    orgTrace,
                    new BigDecimal("1"),
                    CommonSysConst.getSysConfig().getUnionStagingPayNotifyUrl(), request));
        } catch (Exception e) {
            log.error("HighOrderController --> unionStagingPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/queryStaging", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "分期查询")
    public ResponseData queryStaging(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4)
                    +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    +DateUtil.format(new Date(), DateUtil.YMDHMS)
                    +IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.queryStaging(orgTrace,oriOrgTrace ,"", new Date(), request));

        } catch (Exception e) {
            log.error("HighOrderController --> unionStagingPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
/*
    @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "退款")
    public ResponseData orderToRefund(HttpServletRequest request) {
        try {
            OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund("4200001301202202035413938093", new BigDecimal("30.80"), new BigDecimal("16.90"));

            return ResponseMsgUtil.success(orderRefundModel);

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

    @RequestMapping(value = "/query", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "订单查询")
    public ResponseData query(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4)
                    +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    +DateUtil.format(new Date(), DateUtil.YMDHMS)
                    +IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.query(orgTrace,oriOrgTrace ,"", new Date(), request));

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

    @RequestMapping(value = "/mposrefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "分期退款")
    public ResponseData mposrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4)
                    +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    +DateUtil.format(new Date(), DateUtil.YMDHMS)
                    +IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.standardRefund(orgTrace,oriOrgTrace ,new BigDecimal("1"), "", new Date(), request));

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

    @RequestMapping(value = "/mposfindrefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "分期退款查询")
    public ResponseData mposfindrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace,HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0,4)
                    +CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4,CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    +DateUtil.format(new Date(), DateUtil.YMDHMS)
                    +IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.mposfindrefund(orgTrace,oriOrgTrace ,"", new Date(), request));

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

    public void wxProfitsharing(String transaction_id,String out_order_no, BigDecimal amount) {
        try {
            Map<String,String> param = new LinkedHashMap<>();
            param.put("appid", "wx637bd6f7314daa46");
            param.put("mch_id", "1289663601");
            param.put("sub_mch_id" , "1609882817"); // 个体户黎杨珍
            param.put("transaction_id" , transaction_id);
            param.put("out_order_no" , out_order_no);
            param.put("nonce_str" , WxUtils.makeNonStr());

            // 分账金额
            BigDecimal porofitSharingAmount = amount;

            List<Map<String,Object>> receiversList = new ArrayList<>();
            Map<String,Object> receiversMap = new LinkedHashMap<>();
            receiversMap.put("type", "MERCHANT_ID");
            receiversMap.put("account", "1603942866");
            receiversMap.put("amount", porofitSharingAmount.multiply(new BigDecimal("100")).intValue());
            receiversMap.put("description", "分给商户【惠昕石化】");
            receiversList.add(receiversMap);
            param.put("receivers" , JSONObject.toJSONString(receiversList));
            String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256);
            param.put("sign" , signStr);
            String resultXmL = this.doRefundRequest(param.get("mch_id"),null, WxUtils.mapToXml(param));

            // 请求分账返回的结果
            ResultProfitSharing resultProfitSharing = XmlUtil.getObjectFromXML(resultXmL, ResultProfitSharing.class);

            if (!resultProfitSharing.getResult_code().equals("FAIL")) {
                HighProfitSharingRecord sharingRecord = new HighProfitSharingRecord();
                sharingRecord.setOutOrderNo(resultProfitSharing.getOut_order_no());
                sharingRecord.setTransactionId(resultProfitSharing.getTransaction_id());
                sharingRecord.setOrderId(resultProfitSharing.getOrder_id());
                sharingRecord.setStatus(resultProfitSharing.getResult_code());
                sharingRecord.setPrice(amount);
                sharingRecord.setCreateTime(new Date());
                sharingRecord.setContent(resultXmL);
                highProfitSharingRecordService.insert(sharingRecord);
            }

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

    public CloseableHttpClient readCertificate(String mchId) throws Exception{
        /**
         * 注意PKCS12证书 是从微信商户平台-》账户设置-》 API安全 中下载的
         */
        KeyStore keyStore = KeyStore.getInstance("PKCS12");
        //P12文件目录 证书路径，这里需要你自己修改，linux下还是windows下的根路径
        FileInputStream instream = new FileInputStream("/home/project/wx_cert/1289663601_apiclient_cert.p12");
        // FileInputStream instream = new FileInputStream("G:\\hurui-project/hai-parent/hai-service/src/main/java/privatekey/1289663601_apiclient_cert.p12");
        try {
            keyStore.load(instream, "1289663601".toCharArray());//这里写密码..默认是你的MCHID
        } finally {
            instream.close();
        }
        SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, "1289663601".toCharArray()).build();//这里也是写密码的
        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.getDefaultHostnameVerifier());
        // Allow TLSv1 protocol only
        return HttpClients.custom().setSSLSocketFactory(sslsf).build();
    }

    public String doRefundRequest(String mchId, String url, String data) throws Exception {

        //小程序退款需要调用双向证书的认证
        CloseableHttpClient httpClient = readCertificate(mchId);
        try {
            HttpPost httpost = new HttpPost("https://api.mch.weixin.qq.com/secapi/pay/profitsharing"); // 设置响应头信息
            httpost.addHeader("Connection", "keep-alive");
            httpost.addHeader("Accept", "*/*");
            httpost.addHeader("Content-Type", "text/xml");
            httpost.addHeader("Host", "api.mch.weixin.qq.com");
            httpost.addHeader("X-Requested-With", "XMLHttpRequest");
            httpost.addHeader("Cache-Control", "max-age=0");
            httpost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) ");
            httpost.setEntity(new StringEntity(data, "UTF-8"));
            CloseableHttpResponse response = httpClient.execute(httpost);
            try {
                HttpEntity entity = response.getEntity();
                String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8");
                EntityUtils.consume(entity);
                return jsonStr;
            } finally {
                response.close();
            }
        } catch (Exception e){
            throw new RuntimeException(e);
        } finally {
            httpClient.close();
        }
    }

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

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            if (order.getHighChildOrderList().get(0).getGoodsType().equals(3)) {
                Map<String, Object> pushMsg = new HashMap<>();
                pushMsg.put("userId", order.getHighChildOrderList().get(0).getGoodsId());

                Map<String, Object> msgContent = new HashMap<>();
                msgContent.put("order", highOrderService.getGasOrderDetail(order.getOrderNo()));
                msgContent.put("voice", baiduVoiceService.text2audio(order.getHighChildOrderList().get(0).getGoodsName() + "加油站，收款：" + order.getTotalPrice()));
                pushMsg.put("message", JSONObject.toJSONString(msgContent));
                HttpsUtils.doPost("http://127.0.0.1:9901/msg/test/websocket", pushMsg, new HashMap<>());
            }

            return ResponseMsgUtil.success("null");

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

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

/*            HighOrder order = highOrderService.getOrderByOrderNo("HF2022061411034235002");
            for (HighChildOrder childOrder : order.getHighChildOrderList()) {
                String printText = ZkcPrinterTemplate.oilCashierStubTemp(
                        childOrder.getGoodsName(),
                        order.getOrderNo(),
                        DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"),
                        "嗨森逛",
                        childOrder.getGasGunNo(),
                        childOrder.getGasOilNo(),
                        childOrder.getGasOilLiters().toString(),
                        order.getTotalPrice().toString()
                );
                System.out.println(printText);
                mqttProviderConfig.publish(2, false, topic, ZkcPrinterTemplate.hexStringToString(printText));
            }*/

/*            for (int i = 1; i < 100; i++) {
                ByteArrayOutputStream stream = new ByteArrayOutputStream();
                stream.write(("序号：" + i + " ，打印时间：" + DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss")).getBytes("UTF-8"));
                stream.write(0x0A);
                stream.write(0x0A);
                stream.write(0x0A);
                stream.write(0x0A);
                // 发送消息
                mqttProviderConfig.publish(2, false, topic, getPrinterBytes(stream.toByteArray(), 1, "UTF-8"));
            }*/

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            for (HighChildOrder childOrder : order.getHighChildOrderList()) {
                // highOrderService.printGasOrder(childOrder.getGoodsId(), order.getOrderNo());
                mqttProviderConfig.publish(2, false, topic, ZkcPrinterTemplate.oilCashierStubTemp(
                        childOrder.getGoodsName(),
                        order.getOrderNo(),
                        DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
                        "嗨森逛",
                        childOrder.getGasGunNo(),
                        childOrder.getGasOilNo(),
                        childOrder.getGasOilLiters().toString(),
                        order.getTotalPrice().toString()
                ));
            }

            // Thread.sleep(6000);

            // return ResponseMsgUtil.success(null);

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


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

            return ResponseMsgUtil.success(ShellGroupService.gasPageQueryAllStation(1, 50));

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

    public static String hexStringToString(String s) {
        if (s == null || s.equals("")) {
            return null;
        }
        s = s.replace(" ", "");
        byte[] baKeyword = new byte[s.length() / 2];
        for (int i = 0; i < baKeyword.length; i++) {
            try {
                baKeyword[i] = (byte) (0xff & Integer.parseInt(s.substring(i * 2, i * 2 + 2), 16));
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
        try {
            s = new String(baKeyword, "UTF-8");
        } catch (Exception e1) {
            e1.printStackTrace();
        }
        return s;
    }

    /**
     * 获取打印内容，适用于云打印机
     * @param printText 打印文本
     * @param pageCount 打印联数
     * @param encodingStr 编码方式，默认UTF-8
     * @return
     */
    public byte[] getPrinterBytes(final byte[] printText,
                                  final int pageCount, String encodingStr) {
        try {

            byte[] array = new byte[printText.length + 9];
            array[0] = 30;
            array[1] = 16;
            array[2] =(byte) pageCount;//打印份数
            int num = array.length - 5;
            array[3] = (byte)(num >> 8);
//array[4] = (byte)((uint)num & 0xFFu);
            array[4] = (byte)(num & 0xFF);

            for (int i = 0; i < printText.length; i++)
            {
                array[i+ 5] = printText[i];
            }

            array[array.length - 4] = 27;
            array[array.length - 3] = 99;
            byte[] crc16CodeArray =getCRC(printText);
            array[array.length - 2] = crc16CodeArray[0];
            array[array.length - 1] = crc16CodeArray[1];

            return array;

     /*       if(encodingStr.equals("")){
                encodingStr="UTF-8";
            }
            byte[] msgByte = printText;
            // 消息数组
            final byte[] dataByte = new byte[msgByte.length + 9];
            dataByte[0] = 0x1E;
            dataByte[1] = 0x10;
            dataByte[2] = (byte) pageCount;// 打印多联
            // 有效数据长度
            final int len = dataByte.length - 5;
            dataByte[3] = (byte) (len >> 8);
            dataByte[4] = (byte) (len & 0xff);
            // 数据内容
            System.arraycopy(msgByte, 0, dataByte, 5, msgByte.length);
            // 标识字节
            dataByte[dataByte.length - 4] = 0x1b;
            dataByte[dataByte.length - 3] = 0x63;
            // 打印内容CRC校验
            final byte[] dtCRC = getCRC(msgByte);
            dataByte[dataByte.length - 2] = (byte) (dtCRC[0]);
            dataByte[dataByte.length - 1] = (byte) (dtCRC[1]);
            msgByte = dataByte;
            return msgByte;*/
        } catch (Exception ex) {
            System.out.println(ex.getStackTrace());
        }
        return null;
    }

    /**
     * 获取打印内容，适用于云打印机
     * @param printText 打印文本
     * @param pageCount 打印联数
     * @param encodingStr 编码方式，默认UTF-8
     * @return
     */
    public byte[] getPrinterBytes(final String printText,
                                         final int pageCount, String encodingStr) {
        try {
            if(encodingStr.equals("")){
                encodingStr="UTF-8";
            }
            byte[] msgByte = printText.getBytes(encodingStr);
            // 消息数组
            final byte[] dataByte = new byte[msgByte.length + 9];
            dataByte[0] = 0x1E;
            dataByte[1] = 0x10;
            dataByte[2] = (byte) pageCount;// 打印多联
            // 有效数据长度
            final int len = dataByte.length - 5;
            dataByte[3] = (byte) (len >> 8);
            dataByte[4] = (byte) (len & 0xff);
            // 数据内容
            System.arraycopy(msgByte, 0, dataByte, 5, msgByte.length);
            // 标识字节
            dataByte[dataByte.length - 4] = 0x1b;
            dataByte[dataByte.length - 3] = 0x63;
            // 打印内容CRC校验
            final byte[] dtCRC = getCRC(msgByte);
            dataByte[dataByte.length - 2] = (byte) (dtCRC[0]);
            dataByte[dataByte.length - 1] = (byte) (dtCRC[1]);
            msgByte = dataByte;
            return msgByte;
        } catch (Exception ex) {
            System.out.println(ex.getStackTrace());
        }
        return null;
    }

    private static int[] CRC16Table = { 0x0000, 0x1189, 0x2312, 0x329b, 0x4624,
            0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c,
            0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5,
            0x472c, 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed,
            0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399, 0x6726,
            0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e,
            0xfae7, 0xc87c, 0xd9f5, 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7,
            0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef,
            0xea66, 0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420,
            0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868,
            0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1,
            0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9,
            0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522,
            0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a,
            0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3,
            0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb,
            0xa862, 0x9af9, 0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c,
            0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64,
            0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad,
            0xc324, 0xf1bf, 0xe036, 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5,
            0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e,
            0xf2a7, 0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66,
            0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af,
            0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7,
            0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028,
            0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60,
            0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9,
            0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1,
            0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a,
            0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62,
            0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab,
            0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3,
            0x2c6a, 0x1ef1, 0x0f78 };

    private static byte[] getCRC(byte[] bytes) {
        int crc = 0xFFFF; // 初始值
        for (byte b : bytes) {
            crc = (crc >> 8) ^ CRC16Table[(crc ^ b) & 0xff];
        }
        byte[] b = new byte[2];
        b[0] = (byte) ((crc >> 8)^0xff);
        b[1] = (byte) ((crc & 0xff)^0xff);
        return b;
    }
    private static final char[] HEXES = { '0', '1', '2', '3', '4', '5', '6',
            '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
    /**
     * byte数组 转换成 16进制小写字符串
     */
    private String bytes2Hex(byte[] bytes) {
        if (bytes == null || bytes.length == 0) {
            return null;
        }
        StringBuilder hex = new StringBuilder();
        for (byte b : bytes) {
            hex.append(HEXES[(b >> 4) & 0x0F]);
            hex.append(HEXES[b & 0x0F]);
        }
        return hex.toString();
    }


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

            String orderNo = "HF" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5);
            JSONObject object = QianZhuConfig.insertV2("PLM100068" ,  orderNo , "18090580471");
            object.put("orderNo" , orderNo);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

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

            return ResponseMsgUtil.success(QianZhuConfig.QueryV2(orderNo));

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

    @RequestMapping(value = "/getKfcOrderByOrderNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询肯德基订单")
    public ResponseData getKfcOrderByOrderNo(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.getKfcOrderByOrderNo(orderNo));

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

    @RequestMapping(value = "/starbucksOrderByOrderNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询星巴克订单")
    public ResponseData starbucksOrderByOrderNo(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.starbucksOrderByOrderNo(orderNo));

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

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

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cweb.config.SysConst;
import com.hai.common.Base64Util;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.security.SessionObject;
import com.hai.common.utils.*;
import com.hai.config.*;
import com.hai.dao.HighGasOrderPushMapper;
import com.hai.entity.*;
import com.hai.model.*;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContexts;
import org.apache.http.util.EntityUtils;
import org.bouncycastle.util.encoders.UrlBase64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.util.IdGenerator;
import org.springframework.web.bind.annotation.*;
import sun.nio.cs.StreamEncoder;

import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.security.KeyStore;
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 HighMerchantService highMerchantService;

    @Resource
    private HighMerchantStoreService highMerchantStoreService;

    @Resource
    private HighGasOilPriceService highGasOilPriceService;

    @Resource
    private HighOrderService highOrderService;

    @Resource
    private HighProfitSharingRecordService highProfitSharingRecordService;

    @Resource
    private HighGasOrderPushMapper highGasOrderPushMapper;

    @Resource
    private HuiLianTongConfig huiLianTongConfig;

    @Resource
    private UnionPayConfig unionPayConfig;

    @Resource
    private UnionStagingPayConfig unionStagingPayConfig;

    @Resource
    private UnionUserConfig unionUserConfig;

    @Resource
    private OutRechargeOrderService outRechargeOrderService;

    @Resource
    private HighOilCardService oilCardService;

    @Resource
    private BaiduVoiceService baiduVoiceService;

    @Resource
    private MqttProviderConfig mqttProviderConfig;

    @Autowired
    private WebSocket webSocket;

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

            // 查询订单
            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);

            BigDecimal rake = new BigDecimal("0.05");

            // 计算微信收取的手续费     支付金额 * 0.002      注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
            BigDecimal wxHandlingFee = order.getPayRealPrice().multiply(new BigDecimal("0.002")).setScale(2, BigDecimal.ROUND_HALF_DOWN);
            BigDecimal price = order.getPayRealPrice().subtract(wxHandlingFee);

            // 计算分账金额    手续费后的价格 * 0.05  注：如果与两个相邻数字的距离相等，则为上舍入的舍入模式。
            BigDecimal profitSharingAmount = price.multiply(rake).setScale(2, BigDecimal.ROUND_DOWN);
            this.wxGasProfitsharing(order.getExt1(), order.getPaySerialNo(), order.getOrderNo(), profitSharingAmount);
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    public void wxGasProfitsharing(String appid, String transaction_id, String out_order_no, BigDecimal amount) {
        try {
            Map<String, String> param = new LinkedHashMap<>();
            param.put("appid", appid);
            param.put("mch_id", "1289663601");
            param.put("sub_mch_id", "1624126902"); // 个体户黎杨珍
            param.put("transaction_id", transaction_id);
            param.put("out_order_no", out_order_no);
            param.put("nonce_str", WxUtils.makeNonStr());

            // 分账金额
            BigDecimal porofitSharingAmount = amount;

            List<Map<String, Object>> receiversList = new ArrayList<>();
            Map<String, Object> receiversMap = new LinkedHashMap<>();
            receiversMap.put("type", "MERCHANT_ID");
            receiversMap.put("account", "1603942866");
            receiversMap.put("amount", porofitSharingAmount.multiply(new BigDecimal("100")).intValue());
            receiversMap.put("description", "分给商户【惠昕石化】");
            receiversList.add(receiversMap);
            param.put("receivers", JSONObject.toJSONString(receiversList));
            String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5", WXPayConstants.SignType.HMACSHA256);
            param.put("sign", signStr);
            String resultXmL = this.doRefundRequest(param.get("mch_id"), null, WxUtils.mapToXml(param));

            // 请求分账返回的结果
            ResultProfitSharing resultProfitSharing = XmlUtil.getObjectFromXML(resultXmL, ResultProfitSharing.class);

            HighProfitSharingRecord sharingRecord = new HighProfitSharingRecord();
            sharingRecord.setOutOrderNo(out_order_no);
            sharingRecord.setTransactionId(transaction_id);
            sharingRecord.setOrderId(resultProfitSharing.getOrder_id());
            sharingRecord.setStatus(resultProfitSharing.getResult_code());
            sharingRecord.setPrice(amount);
            sharingRecord.setCreateTime(new Date());
            sharingRecord.setContent(resultXmL);
            highProfitSharingRecordService.insert(sharingRecord);

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


    @RequestMapping(value = "/addPrinter", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询汇联通工会卡详情")
    public ResponseData addPrinter(HttpServletRequest request) {
        try {
            SpPrinterConfig spPrinterConfig = new SpPrinterConfig();
            return ResponseMsgUtil.success(
                    spPrinterConfig.addPrinter(
                            "1540500213",
                            "bxpjpnh4",
                            "丹凤加油站打印机"
                    )
            );

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

    @RequestMapping(value = "/queryThirdOrderDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "订单结果查询")
    public ResponseData queryThirdOrderDretail(HttpServletRequest request) {
        try {
            return ResponseMsgUtil.success(TuanYouConfig.queryThirdOrderDetail("HF2022051214411536507"));

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

    @RequestMapping(value = "/spPrint", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "发送打印机消息")
    public ResponseData spPrint(@RequestParam(name = "orderNo", required = true) String orderNo, HttpServletRequest request) {
        try {

            HighOrder highOrder = highOrderService.getOrderByOrderNo(orderNo);
            for (HighChildOrder highChildOrder : highOrder.getHighChildOrderList()) {
                HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId());
                new Thread(() -> {
                    try {
                        SpPrinterConfig sp = new SpPrinterConfig();
                        sp.print(store.getDeviceSn(),
                                SpPrinterTemplate.oilCashierStubTemp(
                                        highChildOrder.getGoodsName(),
                                        highOrder.getOrderNo(),
                                        DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
                                        "嗨森逛",
                                        highChildOrder.getGasGunNo(),
                                        highChildOrder.getGasOilNo(),
                                        highChildOrder.getGasOilLiters().toString(),
                                        highOrder.getTotalPrice().toString()
                                ), 1);

                        Thread.sleep(6000);

                        sp.print(store.getDeviceSn(),
                                SpPrinterTemplate.oilClientStubTemp(
                                        highChildOrder.getGoodsName(),
                                        highOrder.getOrderNo(),
                                        DateUtil.date2String(highOrder.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
                                        "嗨森逛",
                                        highChildOrder.getGasGunNo(),
                                        highChildOrder.getGasOilNo(),
                                        highChildOrder.getGasOilLiters().toString(),
                                        highOrder.getTotalPrice().toString()
                                ), 1);
                    } catch (Exception e) {
                        e.printStackTrace();
                    }
                }).start();
            }

            return ResponseMsgUtil.success("发送成功");

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

    @RequestMapping(value = "/text2audio", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "文本转语音")
    public ResponseData text2audio(HttpServletRequest request) {
        try {

            return ResponseMsgUtil.success(baiduVoiceService.text2audio("加油站收款400元"));

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

    @RequestMapping(value = "/getGasDetail", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询汇联通工会卡详情")
    public ResponseData getGasDetail(@RequestParam(name = "cardNo", required = true) String cardNo, HttpServletRequest request) {
        try {
            return ResponseMsgUtil.success(TuanYouConfig.queryGasInfoByGasId(cardNo));

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


    @RequestMapping(value = "/queryGasInfoByGasId", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "根据油站 id 拉取最新的油站数据")
    public ResponseData queryGasInfoByGasId(@RequestParam(name = "gasId", required = true) String gasId, HttpServletRequest request) {
        try {
            return ResponseMsgUtil.success(TuanYouConfig.queryGasInfoByGasId(gasId));

        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
//
//    @RequestMapping(value = "/getMobile", method = RequestMethod.GET)
//    @ResponseBody
//    @ApiOperation(value = "话费充值")
//    public ResponseData getMobile(
//            @RequestParam(name = "orderNo", required = true) String orderNo,
//            @RequestParam(name = "amount", required = true) Integer amount,
//            @RequestParam(name = "phone", required = true) String phone,
//                                  HttpServletRequest request) {
//        try {
//            return ResponseMsgUtil.success(outRechargeOrderService.getMobile(phone,amount,orderNo));
//
//        } catch (Exception e) {
//            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
//            return ResponseMsgUtil.exception(e);
//        }
//    }

    @RequestMapping(value = "/initTYMerchantStore", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "初始化加油站")
    public ResponseData initTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception {

        HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId);
        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"));
                if (store != null) {
                    store.setType(1);
                    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.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.getInteger("oilNo"));
                        if (highGasOilPrice == null) {
                            highGasOilPrice = new HighGasOilPrice();
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                        } else {
                            highGasOilPrice.setMerchantStoreId(store.getId());
                            highGasOilPrice.setOilNo(oilPriceObject.getInteger("oilNo"));
                            highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                            highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                            highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                            highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                            highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                            highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                        }
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                } else {
                    highMerchantStore = new HighMerchantStore();
                    highMerchantStore.setType(1);
                    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.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.getInteger("oilNo"));
                        highGasOilPrice.setOilNoName(oilPriceObject.getString("oilNoName"));
                        highGasOilPrice.setPriceVip(oilPriceObject.getBigDecimal("priceVip"));
                        highGasOilPrice.setPriceGun(oilPriceObject.getBigDecimal("priceGun"));
                        highGasOilPrice.setPriceOfficial(oilPriceObject.getBigDecimal("priceOfficial"));
                        highGasOilPrice.setOilType(oilPriceObject.getInteger("oilType"));
                        highGasOilPrice.setOilTypeName(oilPriceObject.getString("oilTypeName"));
                        highGasOilPriceService.editGasOilPrice(highGasOilPrice);
                    }
                }
            }
        }
        return ResponseMsgUtil.success("初始化完成");
    }

    @RequestMapping(value = "/detectTYMerchantStore", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "检测加油站")
    public ResponseData detectTYMerchantStore(@RequestParam(name = "merchantId", required = true) Long merchantId) throws Exception {

        HighMerchantModel merchant = highMerchantService.getMerchantById(merchantId);
        if (merchant == null) {
            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户");
        }

        Map<String, Object> param = new HashMap<>();
        param.put("merchantId", merchant.getId());
        List<HighMerchantStore> stores = highMerchantStoreService.getMerchantStoreList(param);

        for (HighMerchantStore store : stores) {
            JSONObject jsonObject = TuanYouConfig.queryGasInfoByGasId(store.getStoreKey());
            if (jsonObject != null && jsonObject.getString("code").equals("200")) {
                JSONObject result = jsonObject.getJSONObject("result");
                store.setStatus(result.getInteger("gasStatus"));
            } else {
                store.setStatus(0);
            }
            highMerchantStoreService.updateMerchantStoreDetail(store);
        }
        return ResponseMsgUtil.success("初始化完成");
    }

    /*   @RequestMapping(value = "/pushTuanYouOrder", method = RequestMethod.GET)
       @ResponseBody
       @ApiOperation(value = "推送团油订单")
       public ResponseData pushTuanYouOrder(@RequestParam(name = "orderNo", required = true) String orderNo) {
           try {
               HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
               for (HighChildOrder highChildOrder : order.getHighChildOrderList()) {
                   HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreById(highChildOrder.getGoodsId());
                   // 推送团油订单
                   Map<String, Object> paramMap = new HashMap<>();
                   paramMap.put("gasId", store.getStoreKey());
                   paramMap.put("oilNo", highChildOrder.getGasOilNo());
                   paramMap.put("gunNo", highChildOrder.getGasGunNo());
                   BigDecimal priceGun = highChildOrder.getGasPriceGun();
                   BigDecimal priceVip = highChildOrder.getGasPriceVip();
                   paramMap.put("priceGun", priceGun);  // 枪单价
                   paramMap.put("priceVip", priceVip);  // 优惠价
                   paramMap.put("driverPhone", order.getMemPhone());
                   // paramMap.put("driverPhone", "17726395120");
                   paramMap.put("thirdSerialNo", order.getOrderNo());
                   paramMap.put("refuelingAmount", highChildOrder.getTotalPrice());

                   // 油品类型 1:汽油:2:柴油;3:天然气
                   if (highChildOrder.getGasOilType() == 1) {
                       paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouGasolineAccount());
                   } else if (highChildOrder.getGasOilType() == 2) {
                       paramMap.put("accountNo", CommonSysConst.getSysConfig().getTuanYouDieselAccount());
                   }
                   JSONObject orderPushObject = TuanYouConfig.refuelingOrderPush(paramMap);
                   // 推送团油订单记录
                   HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
                   highGasOrderPush.setCreateTime(new Date());
                   highGasOrderPush.setCode(orderPushObject.getString("code"));
                   highGasOrderPush.setRequestContent(JSONObject.toJSONString(paramMap));
                   highGasOrderPush.setReturnContent(orderPushObject.toJSONString());
                   highGasOrderPushMapper.insert(highGasOrderPush);

                   if (orderPushObject != null && orderPushObject.getString("code").equals("200")) {
                       highChildOrder.setGasOrderNo(orderPushObject.getJSONObject("result").getString("orderNo"));
                   }
                   highOrderService.updateOrder(order);
               }
               return ResponseMsgUtil.success(order);
           } catch (Exception e) {
               log.error("HighOrderController --> getOrderById() error!", e);
               return ResponseMsgUtil.exception(e);
           }
       }
   */
    @RequestMapping(value = "/queryCompanyAccountInfo2JD", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询团油余额")
    public ResponseData queryCompanyAccountInfo2JD() {
        try {

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

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

            return ResponseMsgUtil.success(TuanYouConfig.queryCompanyPriceDetail("LW000115995", "92"));
        } catch (Exception e) {
            log.error("HighOrderController --> queryCompanyAccountInfo2JD() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/couJointDist", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "派发贵州卡券")
    public ResponseData couJointDist(@RequestParam(name = "token", required = true) String token) {
        try {
            return ResponseMsgUtil.success(HuiLianTongConfig.couJointDist(token, "HF2022031509263475105", "20JY000575", 1, "18385214742", "oArhO6QZSIJAcawo1Wwx5cKKZ0ns"));
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/tradeQuery", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "派发贵州卡券")
    public ResponseData tradeQuery(@RequestParam(name = "token", required = true) String token) {
        try {
            return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, "HF2022031215130820400"));
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/zwrefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "派发贵州卡券")
    public ResponseData zwrefund() {
        try {
            return ResponseMsgUtil.success(UnionPayConfig.cancel(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, "HF" + System.currentTimeMillis(), "31720220622093814132759"));
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/unionPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "银联支付")
    public ResponseData unionPay(HttpServletRequest request) {
        try {
            // return ResponseMsgUtil.success(RequestUtils.getIpAddress(request));
            return ResponseMsgUtil.success(unionPayConfig.upPreOrder(UnionPayConfig.MER_ID3, UnionPayConfig.TERM_ID3, "HF" + System.currentTimeMillis(), new BigDecimal("1"), "test", CommonSysConst.getSysConfig().getUnionPayNotifyUrl(), request));
        } catch (Exception e) {
            log.error("HighOrderController --> unionPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/getToken", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取贵州中石化token")
    public ResponseData getToken() {
        try {
            return ResponseMsgUtil.success(huiLianTongConfig.getToken());
        } catch (Exception e) {
            log.error("HighOrderController --> getToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/unionTradeQuery", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "银联交易查询")
    public ResponseData unionTradeQuery(@RequestParam(name = "paySerialNo", required = true) String paySerialNo) {
        try {
            return ResponseMsgUtil.success(UnionPayConfig.tradeQuery(UnionPayConfig.MER_ID1, UnionPayConfig.TERM_ID1, paySerialNo));
        } catch (Exception e) {
            log.error("HighOrderController --> unionTradeQuery() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/starbucksOrdersPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "星巴克支付")
    public ResponseData starbucksOrdersPay(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.starbucksOrdersPay(orderNo));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/payKfcOrder", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "肯德基支付")
    public ResponseData payKfcOrder(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.payKfcOrder(orderNo));
        } 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 {


            // 汇联通充值
            String goodsDesc = "汇联通充值1元";
            String tranDesc = "";
            String businessType = "ghk_deposit";

            // 汇联通卡充值
            JSONObject deposit = HuiLianTongUnionCardConfig.deposit("TEST2022334532783", "8800030115015135432", new BigDecimal(1), businessType, "1231231223", tranDesc);


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


    @RequestMapping(value = "/wxSplitAccount", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "微信分账")
    public ResponseData wxSplitAccount() {
        try {
            HighOrder orderNo = highOrderService.getOrderByOrderNo("HF2021101812025050304");
            wxProfitsharing(orderNo.getOrderNo(), orderNo.getPaySerialNo(), orderNo.getPayRealPrice());
            return ResponseMsgUtil.success("分账成功");
        } catch (Exception e) {
            log.error("HighOrderController --> getOrderById() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/unionStagingPay", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "银联分期支付")
    public ResponseData unionStagingPay(HttpServletRequest request) {
        try {

/*            String orderNo = DateUtil.format(new Date(), DateUtil.YMDHMS);
            orderNo += IDGenerator.nextId(28 - orderNo.length());*/

            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0, 4)
                    + CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4, CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    + DateUtil.format(new Date(), DateUtil.YMDHMS)
                    + IDGenerator.nextId(6);

            return ResponseMsgUtil.success(unionStagingPayConfig.advancePay(
                    orgTrace,
                    orgTrace,
                    new BigDecimal("1"),
                    CommonSysConst.getSysConfig().getUnionStagingPayNotifyUrl(), request));
        } catch (Exception e) {
            log.error("HighOrderController --> unionStagingPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/queryStaging", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "分期查询")
    public ResponseData queryStaging(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace, HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0, 4)
                    + CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4, CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    + DateUtil.format(new Date(), DateUtil.YMDHMS)
                    + IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.queryStaging(orgTrace, oriOrgTrace, "", new Date(), request));

        } catch (Exception e) {
            log.error("HighOrderController --> unionStagingPay() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }
/*
    @RequestMapping(value = "/orderToRefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "退款")
    public ResponseData orderToRefund(HttpServletRequest request) {
        try {
            OrderRefundModel orderRefundModel = WxOrderConfig.orderToRefund("4200001301202202035413938093", new BigDecimal("30.80"), new BigDecimal("16.90"));

            return ResponseMsgUtil.success(orderRefundModel);

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

    @RequestMapping(value = "/query", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "订单查询")
    public ResponseData query(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace, HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0, 4)
                    + CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4, CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    + DateUtil.format(new Date(), DateUtil.YMDHMS)
                    + IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.query(orgTrace, oriOrgTrace, "", new Date(), request));

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

    @RequestMapping(value = "/mposrefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "分期退款")
    public ResponseData mposrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace, HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0, 4)
                    + CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4, CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    + DateUtil.format(new Date(), DateUtil.YMDHMS)
                    + IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.standardRefund(orgTrace, oriOrgTrace, new BigDecimal("1"), "", new Date(), request));

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

    @RequestMapping(value = "/mposfindrefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "分期退款查询")
    public ResponseData mposfindrefund(@RequestParam(name = "oriOrgTrace", required = true) String oriOrgTrace, HttpServletRequest request) {
        try {
            String orgTrace = CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(0, 4)
                    + CommonSysConst.getSysConfig().getUnionStagingPayOrgId().substring(CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length() - 4, CommonSysConst.getSysConfig().getUnionStagingPayOrgId().length())
                    + DateUtil.format(new Date(), DateUtil.YMDHMS)
                    + IDGenerator.nextId(6);
            return ResponseMsgUtil.success(UnionStagingPayConfig.mposfindrefund(orgTrace, oriOrgTrace, "", new Date(), request));

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

    public void wxProfitsharing(String transaction_id, String out_order_no, BigDecimal amount) {
        try {
            Map<String, String> param = new LinkedHashMap<>();
            param.put("appid", "wx637bd6f7314daa46");
            param.put("mch_id", "1289663601");
            param.put("sub_mch_id", "1609882817"); // 个体户黎杨珍
            param.put("transaction_id", transaction_id);
            param.put("out_order_no", out_order_no);
            param.put("nonce_str", WxUtils.makeNonStr());

            // 分账金额
            BigDecimal porofitSharingAmount = amount;

            List<Map<String, Object>> receiversList = new ArrayList<>();
            Map<String, Object> receiversMap = new LinkedHashMap<>();
            receiversMap.put("type", "MERCHANT_ID");
            receiversMap.put("account", "1603942866");
            receiversMap.put("amount", porofitSharingAmount.multiply(new BigDecimal("100")).intValue());
            receiversMap.put("description", "分给商户【惠昕石化】");
            receiversList.add(receiversMap);
            param.put("receivers", JSONObject.toJSONString(receiversList));
            String signStr = WxUtils.generateSignature(param, "Skufk5oi85wDFGl888i6wsRSTkdd5df5", WXPayConstants.SignType.HMACSHA256);
            param.put("sign", signStr);
            String resultXmL = this.doRefundRequest(param.get("mch_id"), null, WxUtils.mapToXml(param));

            // 请求分账返回的结果
            ResultProfitSharing resultProfitSharing = XmlUtil.getObjectFromXML(resultXmL, ResultProfitSharing.class);

            if (!resultProfitSharing.getResult_code().equals("FAIL")) {
                HighProfitSharingRecord sharingRecord = new HighProfitSharingRecord();
                sharingRecord.setOutOrderNo(resultProfitSharing.getOut_order_no());
                sharingRecord.setTransactionId(resultProfitSharing.getTransaction_id());
                sharingRecord.setOrderId(resultProfitSharing.getOrder_id());
                sharingRecord.setStatus(resultProfitSharing.getResult_code());
                sharingRecord.setPrice(amount);
                sharingRecord.setCreateTime(new Date());
                sharingRecord.setContent(resultXmL);
                highProfitSharingRecordService.insert(sharingRecord);
            }

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

    public CloseableHttpClient readCertificate(String mchId) throws Exception {
        /**
         * 注意PKCS12证书 是从微信商户平台-》账户设置-》 API安全 中下载的
         */
        KeyStore keyStore = KeyStore.getInstance("PKCS12");
        //P12文件目录 证书路径，这里需要你自己修改，linux下还是windows下的根路径
        FileInputStream instream = new FileInputStream("/home/project/wx_cert/1289663601_apiclient_cert.p12");
        // FileInputStream instream = new FileInputStream("G:\\hurui-project/hai-parent/hai-service/src/main/java/privatekey/1289663601_apiclient_cert.p12");
        try {
            keyStore.load(instream, "1289663601".toCharArray());//这里写密码..默认是你的MCHID
        } finally {
            instream.close();
        }
        SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, "1289663601".toCharArray()).build();//这里也是写密码的
        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.getDefaultHostnameVerifier());
        // Allow TLSv1 protocol only
        return HttpClients.custom().setSSLSocketFactory(sslsf).build();
    }

    public String doRefundRequest(String mchId, String url, String data) throws Exception {

        //小程序退款需要调用双向证书的认证
        CloseableHttpClient httpClient = readCertificate(mchId);
        try {
            HttpPost httpost = new HttpPost("https://api.mch.weixin.qq.com/secapi/pay/profitsharing"); // 设置响应头信息
            httpost.addHeader("Connection", "keep-alive");
            httpost.addHeader("Accept", "*/*");
            httpost.addHeader("Content-Type", "text/xml");
            httpost.addHeader("Host", "api.mch.weixin.qq.com");
            httpost.addHeader("X-Requested-With", "XMLHttpRequest");
            httpost.addHeader("Cache-Control", "max-age=0");
            httpost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) ");
            httpost.setEntity(new StringEntity(data, "UTF-8"));
            CloseableHttpResponse response = httpClient.execute(httpost);
            try {
                HttpEntity entity = response.getEntity();
                String jsonStr = EntityUtils.toString(response.getEntity(), "UTF-8");
                EntityUtils.consume(entity);
                return jsonStr;
            } finally {
                response.close();
            }
        } catch (Exception e) {
            throw new RuntimeException(e);
        } finally {
            httpClient.close();
        }
    }

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

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            if (order.getHighChildOrderList().get(0).getGoodsType().equals(3)) {
                Map<String, Object> pushMsg = new HashMap<>();
                pushMsg.put("userId", order.getHighChildOrderList().get(0).getGoodsId());

                Map<String, Object> msgContent = new HashMap<>();
                msgContent.put("order", highOrderService.getGasOrderDetail(order.getOrderNo()));
                msgContent.put("voice", baiduVoiceService.text2audio(order.getHighChildOrderList().get(0).getGoodsName() + "加油站，收款：" + order.getTotalPrice()));
                pushMsg.put("message", JSONObject.toJSONString(msgContent));
                HttpsUtils.doPost("http://127.0.0.1:9901/msg/test/websocket", pushMsg, new HashMap<>());
            }

            return ResponseMsgUtil.success("null");

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

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

/*            HighOrder order = highOrderService.getOrderByOrderNo("HF2022061411034235002");
            for (HighChildOrder childOrder : order.getHighChildOrderList()) {
                String printText = ZkcPrinterTemplate.oilCashierStubTemp(
                        childOrder.getGoodsName(),
                        order.getOrderNo(),
                        DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"),
                        "嗨森逛",
                        childOrder.getGasGunNo(),
                        childOrder.getGasOilNo(),
                        childOrder.getGasOilLiters().toString(),
                        order.getTotalPrice().toString()
                );
                System.out.println(printText);
                mqttProviderConfig.publish(2, false, topic, ZkcPrinterTemplate.hexStringToString(printText));
            }*/

/*            for (int i = 1; i < 100; i++) {
                ByteArrayOutputStream stream = new ByteArrayOutputStream();
                stream.write(("序号：" + i + " ，打印时间：" + DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss")).getBytes("UTF-8"));
                stream.write(0x0A);
                stream.write(0x0A);
                stream.write(0x0A);
                stream.write(0x0A);
                // 发送消息
                mqttProviderConfig.publish(2, false, topic, getPrinterBytes(stream.toByteArray(), 1, "UTF-8"));
            }*/

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            for (HighChildOrder childOrder : order.getHighChildOrderList()) {
                // highOrderService.printGasOrder(childOrder.getGoodsId(), order.getOrderNo());
                mqttProviderConfig.publish(2, false, topic, ZkcPrinterTemplate.oilCashierStubTemp(
                        childOrder.getGoodsName(),
                        order.getOrderNo(),
                        DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
                        "嗨森逛",
                        childOrder.getGasGunNo(),
                        childOrder.getGasOilNo(),
                        childOrder.getGasOilLiters().toString(),
                        order.getTotalPrice().toString()
                ));
            }

            // Thread.sleep(6000);

            // return ResponseMsgUtil.success(null);

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


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

            return ResponseMsgUtil.success(ShellGroupService.gasPageQueryAllStation(1, 50));

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

    public static String hexStringToString(String s) {
        if (s == null || s.equals("")) {
            return null;
        }
        s = s.replace(" ", "");
        byte[] baKeyword = new byte[s.length() / 2];
        for (int i = 0; i < baKeyword.length; i++) {
            try {
                baKeyword[i] = (byte) (0xff & Integer.parseInt(s.substring(i * 2, i * 2 + 2), 16));
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
        try {
            s = new String(baKeyword, "UTF-8");
        } catch (Exception e1) {
            e1.printStackTrace();
        }
        return s;
    }

    /**
     * 获取打印内容，适用于云打印机
     *
     * @param printText   打印文本
     * @param pageCount   打印联数
     * @param encodingStr 编码方式，默认UTF-8
     * @return
     */
    public byte[] getPrinterBytes(final byte[] printText,
                                  final int pageCount, String encodingStr) {
        try {

            byte[] array = new byte[printText.length + 9];
            array[0] = 30;
            array[1] = 16;
            array[2] = (byte) pageCount;//打印份数
            int num = array.length - 5;
            array[3] = (byte) (num >> 8);
//array[4] = (byte)((uint)num & 0xFFu);
            array[4] = (byte) (num & 0xFF);

            for (int i = 0; i < printText.length; i++) {
                array[i + 5] = printText[i];
            }

            array[array.length - 4] = 27;
            array[array.length - 3] = 99;
            byte[] crc16CodeArray = getCRC(printText);
            array[array.length - 2] = crc16CodeArray[0];
            array[array.length - 1] = crc16CodeArray[1];

            return array;

     /*       if(encodingStr.equals("")){
                encodingStr="UTF-8";
            }
            byte[] msgByte = printText;
            // 消息数组
            final byte[] dataByte = new byte[msgByte.length + 9];
            dataByte[0] = 0x1E;
            dataByte[1] = 0x10;
            dataByte[2] = (byte) pageCount;// 打印多联
            // 有效数据长度
            final int len = dataByte.length - 5;
            dataByte[3] = (byte) (len >> 8);
            dataByte[4] = (byte) (len & 0xff);
            // 数据内容
            System.arraycopy(msgByte, 0, dataByte, 5, msgByte.length);
            // 标识字节
            dataByte[dataByte.length - 4] = 0x1b;
            dataByte[dataByte.length - 3] = 0x63;
            // 打印内容CRC校验
            final byte[] dtCRC = getCRC(msgByte);
            dataByte[dataByte.length - 2] = (byte) (dtCRC[0]);
            dataByte[dataByte.length - 1] = (byte) (dtCRC[1]);
            msgByte = dataByte;
            return msgByte;*/
        } catch (Exception ex) {
            System.out.println(ex.getStackTrace());
        }
        return null;
    }

    /**
     * 获取打印内容，适用于云打印机
     *
     * @param printText   打印文本
     * @param pageCount   打印联数
     * @param encodingStr 编码方式，默认UTF-8
     * @return
     */
    public byte[] getPrinterBytes(final String printText,
                                  final int pageCount, String encodingStr) {
        try {
            if (encodingStr.equals("")) {
                encodingStr = "UTF-8";
            }
            byte[] msgByte = printText.getBytes(encodingStr);
            // 消息数组
            final byte[] dataByte = new byte[msgByte.length + 9];
            dataByte[0] = 0x1E;
            dataByte[1] = 0x10;
            dataByte[2] = (byte) pageCount;// 打印多联
            // 有效数据长度
            final int len = dataByte.length - 5;
            dataByte[3] = (byte) (len >> 8);
            dataByte[4] = (byte) (len & 0xff);
            // 数据内容
            System.arraycopy(msgByte, 0, dataByte, 5, msgByte.length);
            // 标识字节
            dataByte[dataByte.length - 4] = 0x1b;
            dataByte[dataByte.length - 3] = 0x63;
            // 打印内容CRC校验
            final byte[] dtCRC = getCRC(msgByte);
            dataByte[dataByte.length - 2] = (byte) (dtCRC[0]);
            dataByte[dataByte.length - 1] = (byte) (dtCRC[1]);
            msgByte = dataByte;
            return msgByte;
        } catch (Exception ex) {
            System.out.println(ex.getStackTrace());
        }
        return null;
    }

    private static int[] CRC16Table = {0x0000, 0x1189, 0x2312, 0x329b, 0x4624,
            0x57ad, 0x6536, 0x74bf, 0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c,
            0xdbe5, 0xe97e, 0xf8f7, 0x1081, 0x0108, 0x3393, 0x221a, 0x56a5,
            0x472c, 0x75b7, 0x643e, 0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed,
            0xcb64, 0xf9ff, 0xe876, 0x2102, 0x308b, 0x0210, 0x1399, 0x6726,
            0x76af, 0x4434, 0x55bd, 0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e,
            0xfae7, 0xc87c, 0xd9f5, 0x3183, 0x200a, 0x1291, 0x0318, 0x77a7,
            0x662e, 0x54b5, 0x453c, 0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef,
            0xea66, 0xd8fd, 0xc974, 0x4204, 0x538d, 0x6116, 0x709f, 0x0420,
            0x15a9, 0x2732, 0x36bb, 0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868,
            0x99e1, 0xab7a, 0xbaf3, 0x5285, 0x430c, 0x7197, 0x601e, 0x14a1,
            0x0528, 0x37b3, 0x263a, 0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9,
            0x8960, 0xbbfb, 0xaa72, 0x6306, 0x728f, 0x4014, 0x519d, 0x2522,
            0x34ab, 0x0630, 0x17b9, 0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a,
            0xb8e3, 0x8a78, 0x9bf1, 0x7387, 0x620e, 0x5095, 0x411c, 0x35a3,
            0x242a, 0x16b1, 0x0738, 0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb,
            0xa862, 0x9af9, 0x8b70, 0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c,
            0xd3a5, 0xe13e, 0xf0b7, 0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64,
            0x5fed, 0x6d76, 0x7cff, 0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad,
            0xc324, 0xf1bf, 0xe036, 0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5,
            0x4f6c, 0x7df7, 0x6c7e, 0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e,
            0xf2a7, 0xc03c, 0xd1b5, 0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66,
            0x7eef, 0x4c74, 0x5dfd, 0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af,
            0xe226, 0xd0bd, 0xc134, 0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7,
            0x6e6e, 0x5cf5, 0x4d7c, 0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028,
            0x91a1, 0xa33a, 0xb2b3, 0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60,
            0x1de9, 0x2f72, 0x3efb, 0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9,
            0x8120, 0xb3bb, 0xa232, 0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1,
            0x0d68, 0x3ff3, 0x2e7a, 0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a,
            0xb0a3, 0x8238, 0x93b1, 0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62,
            0x3ceb, 0x0e70, 0x1ff9, 0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab,
            0xa022, 0x92b9, 0x8330, 0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3,
            0x2c6a, 0x1ef1, 0x0f78};

    private static byte[] getCRC(byte[] bytes) {
        int crc = 0xFFFF; // 初始值
        for (byte b : bytes) {
            crc = (crc >> 8) ^ CRC16Table[(crc ^ b) & 0xff];
        }
        byte[] b = new byte[2];
        b[0] = (byte) ((crc >> 8) ^ 0xff);
        b[1] = (byte) ((crc & 0xff) ^ 0xff);
        return b;
    }

    private static final char[] HEXES = {'0', '1', '2', '3', '4', '5', '6',
            '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};

    /**
     * byte数组 转换成 16进制小写字符串
     */
    private String bytes2Hex(byte[] bytes) {
        if (bytes == null || bytes.length == 0) {
            return null;
        }
        StringBuilder hex = new StringBuilder();
        for (byte b : bytes) {
            hex.append(HEXES[(b >> 4) & 0x0F]);
            hex.append(HEXES[b & 0x0F]);
        }
        return hex.toString();
    }


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

            String orderNo = "HF" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5);
            JSONObject object = QianZhuConfig.insertV2("PLM100068", orderNo, "18090580471");
            object.put("orderNo", orderNo);
            return ResponseMsgUtil.success(object);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

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

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);

            JSONObject orderObject = QianZhuConfig.QueryV2(orderNo);

            if (orderObject != null && orderObject.getLong("Code") == 999) {
                // 订单失败  // 订单状态 1:订单正在处理中 2;订单成功:	3 订单失败
                if (orderObject.getJSONObject("Data").getInteger("OrderState") == 3) {
                    // 订单失败
                    if (order.getOrderStatus() == 2) {
                        highOrderService.thirdOrderToRefund(order.getId());
                    } else {
                        highOrderService.thirdCancelOrder(order.getId());
                    }
                }
                // 订单状态 1:订单正在处理中 2;订单成功:	3 订单失败
                if (orderObject.getJSONObject("Data").getInteger("OrderState") == 2) {
                    for (HighChildOrder childOrder : order.getHighChildOrderList()) {
                        childOrder.setChildOrdeStatus(3);
                    }
                    order.setOrderStatus(3);
                    order.setFinishTime(new Date());
                    highOrderService.updateOrder(order);
                }
            }

            return ResponseMsgUtil.success(QianZhuConfig.QueryV2(orderNo));

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

    @RequestMapping(value = "/getKfcOrderByOrderNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询肯德基订单")
    public ResponseData getKfcOrderByOrderNo(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.getKfcOrderByOrderNo(orderNo));

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

    @RequestMapping(value = "/starbucksOrderByOrderNo", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询星巴克订单")
    public ResponseData starbucksOrderByOrderNo(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {
            return ResponseMsgUtil.success(QianZhuConfig.starbucksOrderByOrderNo(orderNo));

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

    @RequestMapping(value = "/thirdOrderToRefund", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "第三方退款")
    public ResponseData thirdOrderToRefund(@RequestParam(name = "orderNo", required = true) String orderNo) {
        try {

            HighOrder order = highOrderService.getOrderByOrderNo(orderNo);
            highOrderService.thirdOrderToRefund(order.getId());
            return ResponseMsgUtil.success("");

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


}

\ No newline at end of file
diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
index 314030d9..af34a2bd 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java
@@ -64,6 +64,9 @@ public class HighThirdPartyController {
     @Autowired
     private UserCenter userCenter;
 
+    @Resource
+    private ApiMemberProductService apiMemberProductService;
+
 
     @RequestMapping(value = "/getAllCity", method = RequestMethod.GET)
     @ResponseBody
@@ -281,7 +284,6 @@ public class HighThirdPartyController {
 
             if (StringUtils.isBlank(object.getString("customerMobile")) ||
                     StringUtils.isBlank(object.getString("regionId")) ||
-                    StringUtils.isBlank(object.getString("storeCode")) ||
                     object.getInteger("productType") == null ||
                     object.getInteger("platformId") == null
             ) {
@@ -330,7 +332,7 @@ public class HighThirdPartyController {
                     BeanUtils.copyProperties(order, partyModel);
                     partyModel.setCode(object.getJSONObject("data").getString("ticket"));
                     partyModel.setThirdOrderStatus(object.getJSONObject("data").getInteger("status"));
-
+                    partyModel.setStatusDesc(object.getJSONObject("data").getString("statusDesc"));
                     if (object.getJSONObject("data").getString("ticket") != null) {
                         String[] s =  object.getJSONObject("data").getString("ticket").split(",");
 
@@ -359,7 +361,7 @@ public class HighThirdPartyController {
                 if (object.getBoolean("success")) {
                     BeanUtils.copyProperties(order, partyModel);
                     partyModel.setCode(object.getJSONObject("data").getString("ticket"));
-                    partyModel.setThirdOrderStatus(object.getJSONObject("data").getInteger("status"));
+                    partyModel.setStatusDesc(object.getJSONObject("data").getString("statusDesc"));
                     partyModel.setObject(object.getJSONObject("data"));
 
 
@@ -396,12 +398,12 @@ public class HighThirdPartyController {
                         partyModel.setList(list);
                     }
 
-
-
-                } else {
+                }else {
                     log.error("getThirdOrderByOrderId error!", "查询失败！");
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, object.getString("message"));
                 }
+            } else if (order.getHighChildOrderList().get(0).getGoodsType() == 10) {
+                BeanUtils.copyProperties(order, partyModel);
             }
 
             return ResponseMsgUtil.success(partyModel);
@@ -434,4 +436,44 @@ public class HighThirdPartyController {
         }
     }
 
+    @RequestMapping(value = "/getMemberProducts", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "查询会员产品")
+    public ResponseData getMemberProducts(@RequestParam(name = "name", required = false) String name,
+                                          @RequestParam(value = "typeId", required = true) Integer typeId,
+                                          @RequestParam(value = "brandId", required = true) Integer brandId,
+                                             @RequestParam(value = "regionId", required = true) String regionId) {
+        try {
+
+            SecRegion region = commonService.getParentByRegion(Long.valueOf(regionId));
+            BigDecimal productDiscount = null;
+            if (region != null) {
+                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
+                productDiscount = thirdProductConfig.getProductConfigNum(3, bsCompany.getId());
+            }
+
+            if (productDiscount == null) {
+                log.error("getRechargeProduct error!", "查询失败！");
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前地区未配置产品");
+            }
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("name" , name);
+            map.put("typeId" , typeId);
+            map.put("brandId" , brandId);
+
+            List<ApiMemberProduct> list = apiMemberProductService.getListApiMemberProduct(map);
+
+            for (ApiMemberProduct memberProduct : list) {
+                memberProduct.setCostPrice(memberProduct.getCostPrice().add(memberProduct.getCostPrice().multiply(productDiscount.divide(new BigDecimal(100)))).setScale(2, RoundingMode.HALF_UP));
+            }
+
+            return ResponseMsgUtil.success(list);
+
+        } catch (Exception e) {
+            log.error("HighUserCardController --> oilCardRefund() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
 }
diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/thirdOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
similarity index 96%
rename from hai-cweb/src/main/java/com/cweb/controller/pay/thirdOrderController.java
rename to hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
index 5130f43e..b80889f7 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/thirdOrderController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java
@@ -6,6 +6,7 @@ import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.pay.WechatPayUtil;
+import com.hai.common.pay.entity.OrderType;
 import com.hai.common.pay.entity.WeChatPayReqInfo;
 import com.hai.common.pay.util.MD5Util;
 import com.hai.common.security.AESEncodeUtil;
@@ -44,7 +45,7 @@ import java.util.concurrent.ThreadLocalRandom;
 @Controller
 @RequestMapping(value = "/thirdOrder")
 @Api(value = "第三方订单支付接口")
-public class thirdOrderController {
+public class ThirdOrderController {
 
     private static Logger log = LoggerFactory.getLogger(TuanYouController.class);
 
@@ -102,9 +103,11 @@ public class thirdOrderController {
             map.put("orderNo", order.getOrderNo());
             map.put("payPrice", order.getPayRealPrice());
             if (order.getHighChildOrderList().get(0).getGoodsType() == 4) {
-                map.put("orderScene", "KFC_ORDER");
+                map.put("orderScene", OrderType.KFC_ORDER.getModuleCode());
             } else if (order.getHighChildOrderList().get(0).getGoodsType() == 9) {
-                map.put("orderScene", "STARBUCKS_ORDER");
+                map.put("orderScene", OrderType.STARBUCKS_ORDER.getModuleCode());
+            } else if (order.getHighChildOrderList().get(0).getGoodsType() == 10) {
+                map.put("orderScene", OrderType.THIRD_ORDER.getModuleCode());
             }
 
             // 肯德基订单  星巴克订单
diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
index 55c6860e..47e51c13 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/UnionPayController.java
@@ -115,6 +115,9 @@ public class UnionPayController {
     @Resource
     private OutRechargeOrderService outRechargeOrderService;
 
+    @Resource
+    private ApiMemberProductService apiMemberProductService;
+
     @RequestMapping(value = "/notify", method = RequestMethod.POST)
     @ApiOperation(value = "银联支付 -> 异步回调")
     public void notify(@RequestBody String params,HttpServletRequest request, HttpServletResponse response) {
@@ -347,14 +350,27 @@ public class UnionPayController {
                             }
                         }
 
+                        HighGasOrderPush orderPush = new HighGasOrderPush();
+                        JSONObject returnObject = new JSONObject();
+
                         if (order.getHighChildOrderList().get(0).getGoodsType() == 4) {
-                            QianZhuConfig.payKfcOrder(order.getOrderNo());
+                            returnObject = QianZhuConfig.payKfcOrder(order.getOrderNo());
                         } else if (order.getHighChildOrderList().get(0).getGoodsType() == 9) {
-                            QianZhuConfig.starbucksOrdersPay(order.getOrderNo());
+                            returnObject = QianZhuConfig.starbucksOrdersPay(order.getOrderNo());
+                        } else if (order.getHighChildOrderList().get(0).getGoodsType() == 10){
+                            orderPush.setType(OrderPushType.type9.getType());
+                            ApiMemberProduct memberProduct = apiMemberProductService.findById(order.getHighChildOrderList().get(0).getGoodsId());
+                            returnObject = QianZhuConfig.insertV2(memberProduct.getProductId() , order.getOrderNo() , order.getRemarks());
                         }
 
                         highOrderService.updateOrder(order);
 
+                        orderPush.setOrderNo(order.getOrderNo());
+                        orderPush.setCreateTime(new Date());
+                        orderPush.setRequestContent(order.getOrderNo());
+                        orderPush.setReturnContent(returnObject.toJSONString());
+                        highGasOrderPushMapper.insert(orderPush);
+
 
                         if (order.getHighChildOrderList().get(0).getGoodsType().equals(3)) {
                             new Thread(() -> {
diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/WechatPayController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/WechatPayController.java
index d4f9ea34..fd093c5b 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/WechatPayController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/WechatPayController.java
@@ -114,7 +114,6 @@ public class WechatPayController {
                         + "<return_msg><![CDATA[签名验证错误]]></return_msg>" + "</xml> ";
             }*/
 
-
             new Thread(() -> {
                 // 查询订单信息
                 HighOrder order = highOrderService.getOrderByOrderNo(map.get("out_trade_no"));
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 5686a7b6..854994db 100644
--- a/hai-schedule/src/main/java/com/hai/schedule/ApiThirdProductSchedule.java
+++ b/hai-schedule/src/main/java/com/hai/schedule/ApiThirdProductSchedule.java
@@ -3,6 +3,7 @@ package com.hai.schedule;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.hai.config.QianZhuConfig;
+import com.hai.entity.ApiKfcStores;
 import com.hai.entity.ApiStarbucksProducts;
 import com.hai.service.ApiProductService;
 import org.slf4j.Logger;
@@ -12,6 +13,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Configuration
 public class ApiThirdProductSchedule {
@@ -69,4 +72,49 @@ public class ApiThirdProductSchedule {
         }
     }
 
+    @Scheduled(cron = "0 0 1 * * ?")   // 获取星巴克产品 每日凌晨1点执行一次
+    public void getKfcStore() throws Exception {
+
+        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);
+            }
+        }
+    }
+
 }
diff --git a/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java b/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java
index 1592f97a..76755440 100644
--- a/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java
+++ b/hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java
@@ -254,6 +254,32 @@ public class HighOrderSchedule {
                                     }
                                 }
                             }
+                        } else if (highOrder.getHighChildOrderList().get(0).getGoodsType() == 10) {
+                            // 会员充值订单
+                            // 根据订单号查询订单详情
+                            JSONObject orderObject = QianZhuConfig.QueryV2(highOrder.getOrderNo());
+
+                            if (orderObject != null && orderObject.getLong("Code") == 999) {
+                                // 订单失败  // 订单状态 1:订单正在处理中 2;订单成功:	3 订单失败
+                                if (orderObject.getJSONObject("Data").getInteger("OrderState") == 3) {
+                                    // 订单失败
+                                    if (order.getOrderStatus() == 2) {
+                                        highOrderService.thirdOrderToRefund(order.getId());
+                                    } else {
+                                        highOrderService.thirdCancelOrder(order.getId());
+                                    }
+                                }
+                                // 订单状态 1:订单正在处理中 2;订单成功:	3 订单失败
+                                if (orderObject.getJSONObject("Data").getInteger("OrderState") == 2) {
+                                    for (HighChildOrder childOrder : order.getHighChildOrderList()) {
+                                        childOrder.setChildOrdeStatus(3);
+                                    }
+                                    order.setOrderStatus(3);
+                                    order.setFinishTime(new Date());
+                                    highOrderService.updateOrder(order);
+                                }
+                            }
+
                         }
                     }
                 } catch (Exception e) {
diff --git a/hai-service/src/main/java/com/hai/common/pay/entity/OrderType.java b/hai-service/src/main/java/com/hai/common/pay/entity/OrderType.java
index df1facf0..3f7bf441 100644
--- a/hai-service/src/main/java/com/hai/common/pay/entity/OrderType.java
+++ b/hai-service/src/main/java/com/hai/common/pay/entity/OrderType.java
@@ -8,6 +8,7 @@ public enum OrderType {
     STARBUCKS_ORDER("STARBUCKS", "starbucksOrderService", "星巴克订单"),
     CINEMA_ORDER("CINEMA", "cinemaOrderService", "电影票订单"),
     MOBILE_ORDER("MOBILE", "mobileOrderService", "话费充值订单"),
+    THIRD_ORDER("THIRD", "thirdOrderService", "会员充值充值订单"),
     TEST("TEST", "testPayService", "支付测试"),
     ;
 
diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
index 0e8d8057..1f24e65e 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
@@ -43,7 +43,7 @@ public interface HighOrderMapperExt {
     List<HighOrder> getCloseOrder();
 
 
-    @Select({"select distinct * from high_order a left join high_child_order b on a.id = b.order_id where order_status in (1,2) and goods_type in (4,9) group by a.id;"})
+    @Select({"select distinct * from high_order a left join high_child_order b on a.id = b.order_id where order_status in (1,2) and goods_type in (4,9,10) group by a.id;"})
     @Results({
             @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
             @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
diff --git a/hai-service/src/main/java/com/hai/enum_type/OrderPushType.java b/hai-service/src/main/java/com/hai/enum_type/OrderPushType.java
index 99d18f97..ae592c48 100644
--- a/hai-service/src/main/java/com/hai/enum_type/OrderPushType.java
+++ b/hai-service/src/main/java/com/hai/enum_type/OrderPushType.java
@@ -14,6 +14,8 @@ public enum OrderPushType {
     type5(5 , "汇联通会员卡"),
     type6(6 , "汇联通卡券"),
     type7(7 , "汇联通会员充值订单"),
+    type8(8 , "星巴克订单"),
+    type9(9 , "会员充值订单"),
             ;
 
     private Integer  type;
diff --git a/hai-service/src/main/java/com/hai/model/ThirdPartyModel.java b/hai-service/src/main/java/com/hai/model/ThirdPartyModel.java
index 087e1ad9..c7cd8288 100644
--- a/hai-service/src/main/java/com/hai/model/ThirdPartyModel.java
+++ b/hai-service/src/main/java/com/hai/model/ThirdPartyModel.java
@@ -14,6 +14,9 @@ public class ThirdPartyModel extends HighOrder {
     // 第三方订单状态
     private Integer thirdOrderStatus;
 
+    // 第三方订单状态
+    private String statusDesc;
+
     // 就餐方式
     private Integer eatType;
 
@@ -74,4 +77,12 @@ public class ThirdPartyModel extends HighOrder {
     public void setObject(JSONObject object) {
         this.object = object;
     }
+
+    public String getStatusDesc() {
+        return statusDesc;
+    }
+
+    public void setStatusDesc(String statusDesc) {
+        this.statusDesc = statusDesc;
+    }
 }
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
index a87c6820..e47bcb5b 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
@@ -163,6 +163,9 @@ public class HighOrderServiceImpl implements HighOrderService {
     private ApiOrderRecordService apiOrderRecordService;
 
 
+    @Resource
+    private ApiMemberProductService apiMemberProductService;
+
     @Override
     @Transactional(
             isolation = Isolation.SERIALIZABLE,
@@ -1452,6 +1455,12 @@ public class HighOrderServiceImpl implements HighOrderService {
                     highDiscountAgentCodeService.updateCode(code);
                 }
             }
+
+            if (order.getPayGold() != null) {
+                // 积分返回
+                highUserService.goldHandle(order.getMemId(), order.getPayGold(), 1, 3, order.getId());
+            }
+
             updateOrder(order);
         }
     }
@@ -1806,6 +1815,7 @@ public class HighOrderServiceImpl implements HighOrderService {
         HighUser user = highUserService.findByUserId(object.getLong("userId"));
 
         JSONObject jsonObject = null;
+        JSONObject requestContent = null;
 
         // 积分抵扣金额
         BigDecimal integralPrice = new BigDecimal(0);
@@ -1820,7 +1830,9 @@ public class HighOrderServiceImpl implements HighOrderService {
         JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(object.getInteger("platformId"), object.getInteger("productType"), object.getLong("companyId"));
 
 
-        // 1 星巴克 2 肯德基
+        highOrder.setProductType(object.getInteger("productType"));
+
+        // 1 星巴克 2 肯德基 3 会员充值
         if (object.getInteger("productType") == 1) {
 
             JSONObject userToken = QianZhuConfig.getTokenV2(user.getId().toString(), user.getName(), user.getPhone());
@@ -1864,9 +1876,9 @@ public class HighOrderServiceImpl implements HighOrderService {
                 List.add(JSON.toJSONString(contentMap));
             }
 
-
             // 下单
-            jsonObject = QianZhuConfig.starbucksOrders(user.getId().toString(), object.getString("storeCode"), List.toString().replace(" ", ""), object.getString("customerMobile"));
+//            jsonObject = QianZhuConfig.starbucksOrders(user.getId().toString(), object.getString("storeCode"), List.toString().replace(" ", ""), object.getString("customerMobile"));
+            jsonObject = QianZhuConfig.starbucksOrders(user.getId().toString(), "50562", List.toString().replace(" ", ""), object.getString("customerMobile"));
 
             // 判断下单是否成功
             if (!Objects.equals(jsonObject.getString("code"), "200")) {
@@ -1880,7 +1892,7 @@ public class HighOrderServiceImpl implements HighOrderService {
             // 根据订单号查询订单详情
             JSONObject orderObject = QianZhuConfig.starbucksOrderByOrderNo(jsonObject.getJSONObject("data").getString("orderNo"));
 
-            // 判断下单是否成功
+            // 判断是否成功
             if (!orderObject.getBoolean("success")) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message"));
             }
@@ -1894,7 +1906,6 @@ public class HighOrderServiceImpl implements HighOrderService {
             highOrder.setMemName(user.getName());
             highOrder.setMemPhone(user.getPhone());
             highOrder.setOrderStatus(1);
-            highOrder.setRemarks(object.getString("userRemark"));
             highOrderMapper.insert(highOrder);
 
             // 获取星巴克订单内容
@@ -1906,6 +1917,8 @@ public class HighOrderServiceImpl implements HighOrderService {
                 childOrder.setOrderId(highOrder.getId());
                 childOrder.setChildOrdeStatus(1);
                 childOrder.setGoodsType(9);
+                childOrder.setStoreId(object.getLong("storeCode"));
+                childOrder.setGoodsId(object.getLong("productId"));
                 childOrder.setStoreAddress(childObject.getString("storeAddress"));
                 childOrder.setStoreName(childObject.getString("storeName"));
                 childOrder.setGoodsName(childObject.getString("productName"));
@@ -1961,7 +1974,6 @@ public class HighOrderServiceImpl implements HighOrderService {
             highOrder.setMemName(user.getName());
             highOrder.setMemPhone(user.getPhone());
             highOrder.setOrderStatus(1);
-            highOrder.setRemarks(object.getString("userRemark"));
 
             highOrderMapper.insert(highOrder);
 
@@ -1973,6 +1985,7 @@ public class HighOrderServiceImpl implements HighOrderService {
                 childOrder.setOrderId(highOrder.getId());
                 childOrder.setChildOrdeStatus(1);
                 childOrder.setGoodsType(4);
+                childOrder.setGoodsId(object.getLong("productId"));
                 childOrder.setStoreAddress(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeAddress"));
                 childOrder.setStoreName(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeName"));
                 childOrder.setGoodsName(childObject.getString("productName"));
@@ -1993,6 +2006,45 @@ public class HighOrderServiceImpl implements HighOrderService {
 
                 highChildOrderMapper.insert(childOrder);
             }
+        } else if (object.getInteger("productType") == 3) {
+            ApiMemberProduct memberProduct = apiMemberProductService.findById(object.getLong("goodsId"));
+
+            if (memberProduct == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前产品不可购买");
+            }
+            object.put("productId", memberProduct.getProductId());
+            // 插入订单内容
+            highOrder.setOrderNo("HF" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5));
+            highOrder.setRegionId(object.getString("regionId"));
+            highOrder.setCompanyId(object.getLong("companyId"));
+            highOrder.setCreateTime(new Date());
+            highOrder.setMemId(user.getId());
+            highOrder.setMemName(user.getName());
+            highOrder.setMemPhone(user.getPhone());
+            highOrder.setOrderStatus(1);
+
+            // 计算实际支付金额
+            orderPayPrice = memberProduct.getCostPrice().add(memberProduct.getCostPrice().multiply(productDetail.getBigDecimal("priceDiscount").divide(new BigDecimal(100)))).setScale(2, RoundingMode.HALF_UP);
+            // 计算市场价金额
+            marketPrice = memberProduct.getPrice();
+
+            highOrderMapper.insert(highOrder);
+
+            HighChildOrder childOrder = new HighChildOrder();
+            childOrder.setOrderId(highOrder.getId());
+            childOrder.setChildOrdeStatus(1);
+            childOrder.setGoodsType(10);
+            childOrder.setStoreId(object.getLong("storeCode"));
+            childOrder.setGoodsId(memberProduct.getId());
+            childOrder.setGoodsName(memberProduct.getName());
+            childOrder.setSaleCount(1);
+            childOrder.setGoodsPrice(marketPrice);
+
+            childOrder.setGoodsActualPrice(orderPayPrice);
+            childOrder.setTotalPrice(orderPayPrice);
+
+            highChildOrderMapper.insert(childOrder);
+
         }
 
         // 定义优惠券
@@ -2080,7 +2132,7 @@ public class HighOrderServiceImpl implements HighOrderService {
         highOrder.setDeductionPrice(discountPrice);
         highOrder.setPayGold(object.getInteger("integralNum"));
 
-        // 使用优惠券 或者积分
+        // 使用优惠券
         if (highOrder.getMemDiscountId() != null) {
             highOrder.setTotalPrice(marketPrice);
             highOrder.setPayPrice(marketPrice.subtract(discountPrice));
@@ -2123,28 +2175,29 @@ public class HighOrderServiceImpl implements HighOrderService {
             for (HighChildOrder childOrder : highOrderList.getHighChildOrderList()) {
                 childOrder.setChildOrdeStatus(2);
             }
+
+            // 推送订单记录
+            HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
+
             // 1 星巴克 2 肯德基 3:第三方会员充值
             if (object.getInteger("productType") == 1) {
-                QianZhuConfig.starbucksOrdersPay(highOrder.getOrderNo());
+                highGasOrderPush.setType(OrderPushType.type8.getType());
+                requestContent = QianZhuConfig.starbucksOrdersPay(highOrder.getOrderNo());
             } else if (object.getInteger("productType") == 2){
-                QianZhuConfig.payKfcOrder(highOrder.getOrderNo());
+                highGasOrderPush.setType(OrderPushType.type4.getType());
+                requestContent = QianZhuConfig.payKfcOrder(highOrder.getOrderNo());
+            } else if (object.getInteger("productType") == 3){
+                highGasOrderPush.setType(OrderPushType.type9.getType());
+                requestContent = QianZhuConfig.insertV2(object.getString("productId") , highOrder.getOrderNo() , object.getString("customerMobile"));
             }
 
-        }
-
-        // 创建提交记录
-        BsRequestRecord requestRecord = new BsRequestRecord();
-        requestRecord.setCreateTime(new Date());
-        requestRecord.setUpdateTime(new Date());
-        requestRecord.setOrderNo(highOrder.getOrderNo());
-        requestRecord.setRequestContent(object.toJSONString());
-        requestRecord.setOperatorId(0L);
-        requestRecord.setOperatorName("系统生成");
-        requestRecord.setSourceId(highOrder.getId().toString());
-        requestRecord.setSourceType(1);
-
-        bsRequestRecordService.insertRequestRecord(requestRecord);
+            highGasOrderPush.setOrderNo(highOrder.getOrderNo());
+            highGasOrderPush.setCreateTime(new Date());
+            highGasOrderPush.setRequestContent(highOrder.getOrderNo());
+            highGasOrderPush.setReturnContent(requestContent.toJSONString());
+            highGasOrderPushMapper.insert(highGasOrderPush);
 
+        }
         return highOrder;
     }
 
@@ -2168,6 +2221,9 @@ public class HighOrderServiceImpl implements HighOrderService {
         } else if (order.getHighChildOrderList().get(0).getGoodsType() == 9) {
             goodsDesc = "购买星巴克产品";
             tranDesc = goodsDesc + order.getPayRealPrice() + "元";
+        } else if (order.getHighChildOrderList().get(0).getGoodsType() == 10) {
+            goodsDesc = "购买会员充值产品";
+            tranDesc = goodsDesc + order.getPayRealPrice() + "元";
         } else {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法支付，请使用其他支付方式");
         }
@@ -2209,16 +2265,33 @@ public class HighOrderServiceImpl implements HighOrderService {
         order.setPayType(4);
         order.setPayTime(new Date()); // 支付时间
         updateOrder(order);
+
+        HighGasOrderPush orderPush = new HighGasOrderPush();
+        JSONObject returnObject = new JSONObject();
+
         for (HighChildOrder childOrder : order.getHighChildOrderList()) {
             childOrder.setChildOrdeStatus(2);
         }
         if (order.getHighChildOrderList().get(0).getGoodsType() == 4) {
-            QianZhuConfig.payKfcOrder(order.getOrderNo());
+            orderPush.setType(OrderPushType.type4.getType());
+            returnObject = QianZhuConfig.payKfcOrder(order.getOrderNo());
         } else if (order.getHighChildOrderList().get(0).getGoodsType() == 9) {
-            QianZhuConfig.starbucksOrdersPay(order.getOrderNo());
+            orderPush.setType(OrderPushType.type8.getType());
+            returnObject = QianZhuConfig.starbucksOrdersPay(order.getOrderNo());
+        } else if (order.getHighChildOrderList().get(0).getGoodsType() == 10){
+            orderPush.setType(OrderPushType.type9.getType());
+            ApiMemberProduct memberProduct = apiMemberProductService.findById(order.getHighChildOrderList().get(0).getGoodsId());
+            returnObject = QianZhuConfig.insertV2(memberProduct.getProductId() , order.getOrderNo() , order.getRemarks());
         } else {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂时无法支付，请使用其他支付方式");
         }
+
+        orderPush.setOrderNo(order.getOrderNo());
+        orderPush.setCreateTime(new Date());
+        orderPush.setRequestContent(JSON.toJSONString(dataMap));
+        orderPush.setReturnContent(returnObject.toJSONString());
+        highGasOrderPushMapper.insert(orderPush);
+
     }
 
     @Override
@@ -2285,7 +2358,7 @@ public class HighOrderServiceImpl implements HighOrderService {
         }
 
         // 工会卡退款
-        if (order.getPayType() == 3) {
+        if (order.getPayType() == 4) {
             JSONObject jsonObject = HuiLianTongUnionCardConfig.refund("HFR" + new Date().getTime(), order.getOrderNo());
 
             if (jsonObject == null) {
@@ -2310,7 +2383,7 @@ public class HighOrderServiceImpl implements HighOrderService {
             }
 
             // 商户预充值 帐户退款
-            if (order.getPayType() == 6) {
+            if (order.getPayType() == 7) {
 
                 Map<String , Object> map = new HashMap<>();
                 map.put("orderNo" , order.getOrderNo());
@@ -2363,7 +2436,7 @@ public class HighOrderServiceImpl implements HighOrderService {
         }
 
         // 银联退款
-        if (order.getPayType() == 4) {
+        if (order.getPayType() == 5) {
             // 订单退款
             JSONObject refund = UnionPayConfig.zwrefund(UnionPayConfig.MER_ID2, UnionPayConfig.TERM_ID2, order.getOrderNo(), order.getPaySerialNo(), order.getPayRealPrice().multiply(new BigDecimal("100")).longValue());
             if (!refund.getString("resultcode").equals("W6")) {
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighQzOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighQzOrderServiceImpl.java
index 9dafa790..01bde449 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighQzOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighQzOrderServiceImpl.java
@@ -66,7 +66,6 @@ public class HighQzOrderServiceImpl implements HighQzOrderService {
             highOrder.setDeductionPrice(new BigDecimal("0"));
             highOrder.setOrderStatus(1);
             highOrder.setCreateTime(data.getDate("createTime"));
-            highOrder.setRemarks(data.getString("userRemark"));
 
             HighChildOrder highChildOrder;
             if (orderType.equals("KFC")) {
diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/NotifyServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/NotifyServiceImpl.java
index fdb29d39..0f128d5a 100644
--- a/hai-service/src/main/java/com/hai/service/pay/impl/NotifyServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/pay/impl/NotifyServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.sound.midi.Soundbank;
 import java.util.Map;
 
 @Service(value = "notifyService")
@@ -37,6 +38,9 @@ public class NotifyServiceImpl implements NotifyService {
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public String alipayNotify(Map<String, String> params) throws Exception {
+
+        System.out.println("-----------------------------------------------------------" + params);
+
         String result = "failure";
         String trade_status = params.get("trade_status");
         if ("TRADE_SUCCESS".equals(trade_status)) {
diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/StarbucksOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/StarbucksOrderServiceImpl.java
index f3d53860..a502c4f5 100644
--- a/hai-service/src/main/java/com/hai/service/pay/impl/StarbucksOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/pay/impl/StarbucksOrderServiceImpl.java
@@ -2,12 +2,17 @@ package com.hai.service.pay.impl;
 
 
 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.config.QianZhuConfig;
 import com.hai.dao.HighGasOrderPushMapper;
+import com.hai.entity.ApiMemberProduct;
 import com.hai.entity.HighChildOrder;
 import com.hai.entity.HighGasOrderPush;
 import com.hai.entity.HighOrder;
 import com.hai.enum_type.OrderPushType;
+import com.hai.service.ApiMemberProductService;
 import com.hai.service.HighOrderService;
 import com.hai.service.pay.PayService;
 import org.springframework.stereotype.Service;
@@ -16,6 +21,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Map;
+import java.util.Objects;
 
 @Service("starbucksOrderService")
 public class StarbucksOrderServiceImpl implements PayService {
@@ -24,6 +30,9 @@ public class StarbucksOrderServiceImpl implements PayService {
 
     @Resource
     private HighGasOrderPushMapper highGasOrderPushMapper;
+
+
+
     @Override
     public void paySuccess(Map<String, String> map, String payType) throws Exception {
         if (payType.equals("Alipay")) {
@@ -44,16 +53,16 @@ public class StarbucksOrderServiceImpl implements PayService {
                 }
                 highOrderService.updateOrder(order);
 
-                // 支付给千猪
-                JSONObject object = QianZhuConfig.starbucksOrdersPay(order.getOrderNo());
+                // 订单支付
+                JSONObject requestContent = QianZhuConfig.starbucksOrdersPay(order.getOrderNo());
 
                 // 推送订单记录
                 HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
-                highGasOrderPush.setType(OrderPushType.type3.getType());
+                highGasOrderPush.setType(OrderPushType.type8.getType());
                 highGasOrderPush.setOrderNo(order.getOrderNo());
                 highGasOrderPush.setCreateTime(new Date());
                 highGasOrderPush.setRequestContent(order.getOrderNo());
-                highGasOrderPush.setReturnContent(object.toJSONString());
+                highGasOrderPush.setReturnContent(requestContent.toJSONString());
                 highGasOrderPushMapper.insert(highGasOrderPush);
             }
         }
diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/ThirdOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/ThirdOrderServiceImpl.java
new file mode 100644
index 00000000..7d1304ff
--- /dev/null
+++ b/hai-service/src/main/java/com/hai/service/pay/impl/ThirdOrderServiceImpl.java
@@ -0,0 +1,70 @@
+package com.hai.service.pay.impl;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.hai.config.QianZhuConfig;
+import com.hai.dao.HighGasOrderPushMapper;
+import com.hai.entity.ApiMemberProduct;
+import com.hai.entity.HighChildOrder;
+import com.hai.entity.HighGasOrderPush;
+import com.hai.entity.HighOrder;
+import com.hai.enum_type.OrderPushType;
+import com.hai.service.ApiMemberProductService;
+import com.hai.service.HighOrderService;
+import com.hai.service.pay.PayService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Map;
+
+@Service("thirdOrderService")
+public class ThirdOrderServiceImpl implements PayService {
+    @Resource
+    private HighOrderService highOrderService;
+
+    @Resource
+    private HighGasOrderPushMapper highGasOrderPushMapper;
+
+
+    @Resource
+    private ApiMemberProductService apiMemberProductService;
+
+    @Override
+    public void paySuccess(Map<String, String> map, String payType) throws Exception {
+        if (payType.equals("Alipay")) {
+            return;
+        }
+        if (payType.equals("WechatPay")) {
+            HighOrder order = highOrderService.getOrderByOrderNo(map.get("out_trade_no"));
+            if (order != null && order.getOrderStatus() == 1) {
+                order.setPaySerialNo(map.get("transaction_id")); // 支付流水号
+                order.setPayRealPrice(new BigDecimal(map.get("total_fee")).divide(new BigDecimal("100"))); // 实付金额
+                order.setPayTime(new Date()); // 支付时间
+                order.setPayModel(2);         // 支付模式：1 金币，2 第三方平台，3 混合
+                order.setPayType(2);          // 支付方式： 1：支付宝  2：微信  3：金币
+                order.setOrderStatus(2);      // 订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
+
+                for (HighChildOrder childOrder : order.getHighChildOrderList()) {
+                    childOrder.setChildOrdeStatus(2);  // 子订单状态：1 待支付  2 已支付  3.已完成  4. 已退款  5.已取消
+                }
+                highOrderService.updateOrder(order);
+
+                // 下单
+                ApiMemberProduct memberProduct = apiMemberProductService.findById(order.getHighChildOrderList().get(0).getGoodsId());
+
+                JSONObject object = QianZhuConfig.insertV2(memberProduct.getProductId() , order.getOrderNo() , order.getRemarks());
+
+                // 推送订单记录
+                HighGasOrderPush highGasOrderPush = new HighGasOrderPush();
+                highGasOrderPush.setType(OrderPushType.type8.getType());
+                highGasOrderPush.setOrderNo(order.getOrderNo());
+                highGasOrderPush.setCreateTime(new Date());
+                highGasOrderPush.setRequestContent(order.getOrderNo());
+                highGasOrderPush.setReturnContent(object.toJSONString());
+                highGasOrderPushMapper.insert(highGasOrderPush);
+            }
+        }
+    }
+}