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 7b3aa8cb..d8c37ed0 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 javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.servlet.http.HttpServletRequest;
import java.io.FileInputStream;
import java.math.BigDecimal;
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;

    @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 = "content", required = true) String content, HttpServletRequest request) {
        try {
            SpPrinterConfig spPrinterConfig = new SpPrinterConfig();
            return ResponseMsgUtil.success(
                    spPrinterConfig.print(
                            "1540500213",
                            content,
                            1
                    )
            );

        } 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.zwrefund(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF2022031215130820400", "31720220312151311876232", new BigDecimal("270").multiply(new BigDecimal("100")).longValue()));
        } 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 = "/getBackendToken", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取访问令牌backendToken")
    public ResponseData getBackendToken() {
        try {
            return ResponseMsgUtil.success(unionUserConfig.getBackendToken());
        } 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);
        }
    }

}

\ 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 javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import javax.servlet.http.HttpServletRequest;
import java.io.FileInputStream;
import java.math.BigDecimal;
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;

    @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.zwrefund(UnionPayConfig.MER_ID3,UnionPayConfig.TERM_ID3,"HF2022031215130820400", "31720220312151311876232", new BigDecimal("270").multiply(new BigDecimal("100")).longValue()));
        } 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 = "/getBackendToken", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取访问令牌backendToken")
    public ResponseData getBackendToken() {
        try {
            return ResponseMsgUtil.success(unionUserConfig.getBackendToken());
        } 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);
        }
    }

}

\ No newline at end of file
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 f5b8ea93..3782c9b0 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
@@ -9,18 +9,18 @@ import com.hai.common.exception.SysCode;
 import com.hai.common.utils.DateUtil;
 import com.hai.common.utils.IDGenerator;
 import com.hai.common.utils.ResponseMsgUtil;
-import com.hai.config.CommonSysConst;
-import com.hai.config.HuiLianTongConfig;
-import com.hai.config.TuanYouConfig;
-import com.hai.config.UnionStagingPayConfig;
+import com.hai.config.*;
 import com.hai.dao.HighCouponCodeOtherMapper;
 import com.hai.dao.HighGasOrderPushMapper;
 import com.hai.dao.HighPayRecordMapper;
 import com.hai.dao.HighUserCouponMapper;
 import com.hai.entity.*;
+import com.hai.enum_type.MerStoreAmountSourceTypeEnum;
+import com.hai.enum_type.MerStoreAmountTypeEnum;
 import com.hai.enum_type.OrderPushType;
 import com.hai.model.HighMerchantStoreModel;
 import com.hai.model.ResponseData;
+import com.hai.msg.entity.MsgTopic;
 import com.hai.service.*;
 import com.hai.service.pay.NotifyService;
 import io.swagger.annotations.Api;
@@ -29,6 +29,7 @@ import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,6 +48,9 @@ public class UnionPayController {
 
     private static Logger log = LoggerFactory.getLogger(UnionPayController.class);
 
+    @Resource
+    private RedisTemplate redisTemplate;
+
     @Resource
     private HighOrderService highOrderService;
 
@@ -280,39 +284,95 @@ public class UnionPayController {
 
                             if (highChildOrder.getGoodsType() == 3) {
                                 highChildOrder.setChildOrdeStatus(3);
+                                order.setOrderStatus(3);
                                 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("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.setType(OrderPushType.type1.getType());
-                                highGasOrderPush.setOrderNo(order.getOrderNo());
-                                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"));
+
+                                // 来源类型  1：平台自建   2：团油
+                                if (store.getSourceType().equals(1)) {
+
+                                    // 预存类型  0：非预存  1：预存门店
+                                    if (store.getPrestoreType() != null && store.getPrestoreType().equals(1)) {
+                                        Map<String, Object> pushParam = new HashMap<>();
+                                        pushParam.put("businessType", MerStoreAmountTypeEnum.type2.getType());
+                                        pushParam.put("storeId", highChildOrder.getGoodsId());
+                                        pushParam.put("price", order.getTotalPrice());
+                                        pushParam.put("sourceType", MerStoreAmountSourceTypeEnum.type2.getType());
+                                        pushParam.put("sourceId", order.getId());
+                                        pushParam.put("sourceContent", "订单号：" + order.getOrderNo() + ",加油金额：￥" + order.getTotalPrice());
+                                        pushParam.put("opUserId", order.getMemId());
+                                        pushParam.put("opUserName", order.getMemName());
+                                        // 扣预存款
+                                        this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
+                                    }
+                                    if (StringUtils.isNotBlank(store.getDeviceSn())) {
+                                        new Thread(() -> {
+                                            try {
+                                                SpPrinterConfig sp = new SpPrinterConfig();
+                                                sp.print(store.getDeviceSn(),
+                                                        SpPrinterTemplate.oilCashierStubTemp(
+                                                                highChildOrder.getGoodsName(),
+                                                                order.getOrderNo(),
+                                                                DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                                "嗨森逛",
+                                                                highChildOrder.getGasGunNo(),
+                                                                highChildOrder.getGasOilNo(),
+                                                                highChildOrder.getGasOilLiters().toString(),
+                                                                order.getTotalPrice().toString()
+                                                        ), 1);
+
+                                                Thread.sleep(6000);
+
+                                                sp.print(store.getDeviceSn(),
+                                                        SpPrinterTemplate.oilClientStubTemp(
+                                                                highChildOrder.getGoodsName(),
+                                                                order.getOrderNo(),
+                                                                DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                                "嗨森逛",
+                                                                highChildOrder.getGasGunNo(),
+                                                                highChildOrder.getGasOilNo(),
+                                                                highChildOrder.getGasOilLiters().toString(),
+                                                                order.getTotalPrice().toString()
+                                                        ), 1);
+                                            } catch (Exception e) {
+                                                e.printStackTrace();
+                                            }
+                                        }).start();
+                                    }
+
+                                } else if (store.getSourceType().equals(2)) {
+                                    // 推送团油订单
+                                    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("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.setType(OrderPushType.type1.getType());
+                                    highGasOrderPush.setOrderNo(order.getOrderNo());
+                                    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"));
+                                    }
                                 }
                             }
 
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 e520a0dc..ae1341f8 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
@@ -378,36 +378,40 @@ public class HighOrderServiceImpl implements HighOrderService {
                         // 扣预存款
                         this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
                     }
-                    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(3000);
-                            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();
+                    if (StringUtils.isNotBlank(store.getDeviceSn())) {
+                        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();
+                    }
                 } else if (store.getSourceType().equals(2)) {
                     // 推送团油订单
                     Map<String,Object> paramMap = new HashMap<>();
@@ -673,36 +677,39 @@ public class HighOrderServiceImpl implements HighOrderService {
                         // 扣预存款
                         this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
                     }
-                    new Thread(() -> {
-                        try {
-                            SpPrinterConfig sp = new SpPrinterConfig();
-                            sp.print(store.getDeviceSn(),
-                                    SpPrinterTemplate.oilCashierStubTemp(
-                                            highChildOrder.getGoodsName(),
-                                            order.getOrderNo(),
-                                            DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
-                                            "嗨森逛",
-                                            highChildOrder.getGasGunNo(),
-                                            highChildOrder.getGasOilNo(),
-                                            highChildOrder.getGasOilLiters().toString(),
-                                            order.getTotalPrice().toString()
-                                    ), 1);
-                            Thread.sleep(3000);
-                            sp.print(store.getDeviceSn(),
-                                    SpPrinterTemplate.oilClientStubTemp(
-                                            highChildOrder.getGoodsName(),
-                                            order.getOrderNo(),
-                                            DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
-                                            "嗨森逛",
-                                            highChildOrder.getGasGunNo(),
-                                            highChildOrder.getGasOilNo(),
-                                            highChildOrder.getGasOilLiters().toString(),
-                                            order.getTotalPrice().toString()
-                                    ), 1);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
+                    if (StringUtils.isNotBlank(store.getDeviceSn())) {
+                        new Thread(() -> {
+                            try {
+                                SpPrinterConfig sp = new SpPrinterConfig();
+                                sp.print(store.getDeviceSn(),
+                                        SpPrinterTemplate.oilCashierStubTemp(
+                                                highChildOrder.getGoodsName(),
+                                                order.getOrderNo(),
+                                                DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                "嗨森逛",
+                                                highChildOrder.getGasGunNo(),
+                                                highChildOrder.getGasOilNo(),
+                                                highChildOrder.getGasOilLiters().toString(),
+                                                order.getTotalPrice().toString()
+                                        ), 1);
+                                Thread.sleep(6000);
+                                sp.print(store.getDeviceSn(),
+                                        SpPrinterTemplate.oilClientStubTemp(
+                                                highChildOrder.getGoodsName(),
+                                                order.getOrderNo(),
+                                                DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                "嗨森逛",
+                                                highChildOrder.getGasGunNo(),
+                                                highChildOrder.getGasOilNo(),
+                                                highChildOrder.getGasOilLiters().toString(),
+                                                order.getTotalPrice().toString()
+                                        ), 1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
+                    }
+
                 } else if (store.getSourceType().equals(2)) {
                     // 推送团油订单
                     Map<String,Object> paramMap = new HashMap<>();
@@ -1005,36 +1012,39 @@ public class HighOrderServiceImpl implements HighOrderService {
                         // 扣预存款
                         this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
                     }
-                    new Thread(() -> {
-                        try {
-                            SpPrinterConfig sp = new SpPrinterConfig();
-                            sp.print(store.getDeviceSn(),
-                                    SpPrinterTemplate.oilCashierStubTemp(
-                                            highChildOrder.getGoodsName(),
-                                            order.getOrderNo(),
-                                            DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
-                                            "嗨森逛",
-                                            highChildOrder.getGasGunNo(),
-                                            highChildOrder.getGasOilNo(),
-                                            highChildOrder.getGasOilLiters().toString(),
-                                            order.getTotalPrice().toString()
-                                    ), 1);
-                            Thread.sleep(3000);
-                            sp.print(store.getDeviceSn(),
-                                    SpPrinterTemplate.oilClientStubTemp(
-                                            highChildOrder.getGoodsName(),
-                                            order.getOrderNo(),
-                                            DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
-                                            "嗨森逛",
-                                            highChildOrder.getGasGunNo(),
-                                            highChildOrder.getGasOilNo(),
-                                            highChildOrder.getGasOilLiters().toString(),
-                                            order.getTotalPrice().toString()
-                                    ), 1);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }).start();
+                    if (StringUtils.isNotBlank(store.getDeviceSn())) {
+                        new Thread(() -> {
+                            try {
+                                SpPrinterConfig sp = new SpPrinterConfig();
+                                sp.print(store.getDeviceSn(),
+                                        SpPrinterTemplate.oilCashierStubTemp(
+                                                highChildOrder.getGoodsName(),
+                                                order.getOrderNo(),
+                                                DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                "嗨森逛",
+                                                highChildOrder.getGasGunNo(),
+                                                highChildOrder.getGasOilNo(),
+                                                highChildOrder.getGasOilLiters().toString(),
+                                                order.getTotalPrice().toString()
+                                        ), 1);
+                                Thread.sleep(6000);
+                                sp.print(store.getDeviceSn(),
+                                        SpPrinterTemplate.oilClientStubTemp(
+                                                highChildOrder.getGoodsName(),
+                                                order.getOrderNo(),
+                                                DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                "嗨森逛",
+                                                highChildOrder.getGasGunNo(),
+                                                highChildOrder.getGasOilNo(),
+                                                highChildOrder.getGasOilLiters().toString(),
+                                                order.getTotalPrice().toString()
+                                        ), 1);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }).start();
+                    }
+
                 } else if (store.getSourceType().equals(2)) {
                     // 推送团油订单
                     Map<String,Object> paramMap = new HashMap<>();
diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java
index 12f8d186..632dc539 100644
--- a/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java
@@ -25,6 +25,7 @@ import com.hai.service.*;
 import com.hai.service.pay.NotifyService;
 import com.hai.service.pay.PayService;
 import org.apache.commons.collections4.MapUtils;
+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;
@@ -298,38 +299,41 @@ public class GoodsOrderServiceImpl implements PayService {
                                 // 扣预存款
                                 this.redisTemplate.boundListOps(MsgTopic.MerStoreAccount.getName()).leftPush(pushParam);
                             }
-                            new Thread(() -> {
-                                try {
-                                    SpPrinterConfig sp = new SpPrinterConfig();
-                                    sp.print(store.getDeviceSn(),
-                                            SpPrinterTemplate.oilCashierStubTemp(
-                                                    highChildOrder.getGoodsName(),
-                                                    order.getOrderNo(),
-                                                    DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
-                                                    "嗨森逛",
-                                                    highChildOrder.getGasGunNo(),
-                                                    highChildOrder.getGasOilNo(),
-                                                    highChildOrder.getGasOilLiters().toString(),
-                                                    order.getTotalPrice().toString()
-                                            ), 1);
-
-                                    Thread.sleep(3000);
-
-                                    sp.print(store.getDeviceSn(),
-                                            SpPrinterTemplate.oilClientStubTemp(
-                                                    highChildOrder.getGoodsName(),
-                                                    order.getOrderNo(),
-                                                    DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
-                                                    "嗨森逛",
-                                                    highChildOrder.getGasGunNo(),
-                                                    highChildOrder.getGasOilNo(),
-                                                    highChildOrder.getGasOilLiters().toString(),
-                                                    order.getTotalPrice().toString()
-                                            ), 1);
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            }).start();
+                            if (StringUtils.isNotBlank(store.getDeviceSn())) {
+                                new Thread(() -> {
+                                    try {
+                                        SpPrinterConfig sp = new SpPrinterConfig();
+                                        sp.print(store.getDeviceSn(),
+                                                SpPrinterTemplate.oilCashierStubTemp(
+                                                        highChildOrder.getGoodsName(),
+                                                        order.getOrderNo(),
+                                                        DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                        "嗨森逛",
+                                                        highChildOrder.getGasGunNo(),
+                                                        highChildOrder.getGasOilNo(),
+                                                        highChildOrder.getGasOilLiters().toString(),
+                                                        order.getTotalPrice().toString()
+                                                ), 1);
+
+                                        Thread.sleep(6000);
+
+                                        sp.print(store.getDeviceSn(),
+                                                SpPrinterTemplate.oilClientStubTemp(
+                                                        highChildOrder.getGoodsName(),
+                                                        order.getOrderNo(),
+                                                        DateUtil.date2String(order.getPayTime(), "yyyy-MM-dd HH:mm:ss"),
+                                                        "嗨森逛",
+                                                        highChildOrder.getGasGunNo(),
+                                                        highChildOrder.getGasOilNo(),
+                                                        highChildOrder.getGasOilLiters().toString(),
+                                                        order.getTotalPrice().toString()
+                                                ), 1);
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }).start();
+                            }
+
                         } else if (store.getSourceType().equals(2)) {
                             // 推送团油订单
                             Map<String,Object> paramMap = new HashMap<>();