From e1450510b704e9c0f9792304c07cb0329719b105 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 16 Feb 2022 12:07:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=85=A2=E5=85=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bweb/controller/HighTestController.java |  2 +-
 .../bweb/controller/OutRechargeOrderController.java  |  2 +-
 .../excelListener/ImportRechargeOrderListener.java   |  6 ------
 .../cweb/controller/OutRechargeOrderController.java  |  4 ++--
 .../com/cweb/controller/pay/CzOrderController.java   |  4 ++--
 .../com/cweb/controller/pay/UnionPayController.java  |  4 ++--
 .../com/hai/service/OutRechargeOrderService.java     |  2 +-
 .../service/impl/OutRechargeOrderServiceImpl.java    | 12 ++++++++----
 .../service/pay/impl/RechargeOrderServiceImpl.java   |  4 ++--
 9 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
index 8a90610d..a75f8bf8 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
@@ -1 +1 @@
-package com.bweb.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.common.utils.WxUtils;
import com.hai.config.*;
import com.hai.dao.HighGasOrderPushMapper;
import com.hai.entity.*;
import com.hai.model.HighMerchantModel;
import com.hai.model.HighMerchantStoreModel;
import com.hai.model.ResponseData;
import com.hai.model.ResultProfitSharing;
import com.hai.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
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 HltUnionCardVipService hltUnionCardVipService;

    @Resource
    private HighTestService highTestService;

    @Resource
    private OutRechargeOrderService outRechargeOrderService;


    @RequestMapping(value = "/getBackendToken", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取访问令牌backendToken")
    public ResponseData getBackendToken() {
        try {
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }




    @RequestMapping(value = "/GetMembershipLevel", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "请求会员体系")
    public ResponseData GetMembershipLevel(@RequestParam(name = "phone", required = true) String phone , @RequestParam(name = "regionId", required = true) String regionId ) {
        try {
            return ResponseMsgUtil.success(hltUnionCardVipService.GetMembershipLevel(phone , regionId));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/submitSms", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "请求短信")
    public ResponseData submitSms(@RequestParam(name = "phone", required = true) String phone , @RequestParam(name = "sms", required = true) String sms ) {
        try {
            return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.submitSms(phone , sms));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


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

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

    @RequestMapping(value="/getReadFile",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "存入用户信息")
    public ResponseData getReadFile() {
        try {
            highTestService.getReadFile();
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("getUserByTelephone",e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value="/getUserDiscount",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "赠送优惠券")
    public ResponseData getUserDiscount(@RequestParam(name = "id", required = true) Long id) {
        try {
            highTestService.getUserDiscount(id);
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("getUserByTelephone",e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value="/queryAmount",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询余额")
    public ResponseData queryAmount() {
        try {
//            outRechargeOrderService.queryAmount();
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("getUserByTelephone",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) {
        try {
            JSONObject object = outRechargeOrderService.getMobile(phone,amount,orderNo);
            return ResponseMsgUtil.success(object.getInteger("code"));
        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


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

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.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.utils.ResponseMsgUtil;
import com.hai.common.utils.WxUtils;
import com.hai.config.*;
import com.hai.dao.HighGasOrderPushMapper;
import com.hai.entity.*;
import com.hai.model.HighMerchantModel;
import com.hai.model.HighMerchantStoreModel;
import com.hai.model.ResponseData;
import com.hai.model.ResultProfitSharing;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

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 HltUnionCardVipService hltUnionCardVipService;

    @Resource
    private HighTestService highTestService;

    @Resource
    private OutRechargeOrderService outRechargeOrderService;


    @RequestMapping(value = "/getBackendToken", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "获取访问令牌backendToken")
    public ResponseData getBackendToken() {
        try {
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }




    @RequestMapping(value = "/GetMembershipLevel", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "请求会员体系")
    public ResponseData GetMembershipLevel(@RequestParam(name = "phone", required = true) String phone , @RequestParam(name = "regionId", required = true) String regionId ) {
        try {
            return ResponseMsgUtil.success(hltUnionCardVipService.GetMembershipLevel(phone , regionId));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


    @RequestMapping(value = "/submitSms", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "请求短信")
    public ResponseData submitSms(@RequestParam(name = "phone", required = true) String phone , @RequestParam(name = "sms", required = true) String sms ) {
        try {
            return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.submitSms(phone , sms));
        } catch (Exception e) {
            log.error("HighOrderController --> getBackendToken() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }


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

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

    @RequestMapping(value="/getReadFile",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "存入用户信息")
    public ResponseData getReadFile() {
        try {
            highTestService.getReadFile();
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("getUserByTelephone",e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value="/getUserDiscount",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "赠送优惠券")
    public ResponseData getUserDiscount(@RequestParam(name = "id", required = true) Long id) {
        try {
            highTestService.getUserDiscount(id);
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("getUserByTelephone",e);
            return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value="/queryAmount",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "查询余额")
    public ResponseData queryAmount() {
        try {
//            outRechargeOrderService.queryAmount();
            return ResponseMsgUtil.success(null);
        } catch (Exception e) {
            log.error("getUserByTelephone",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 = "isFast", required = true) Integer isFast,
            @RequestParam(name = "phone", required = true) String phone) {
        try {
            JSONObject object = outRechargeOrderService.getMobile(phone,amount,orderNo , isFast);
            return ResponseMsgUtil.success(object.getInteger("code"));
        } catch (Exception e) {
            log.error("HighUserCardController --> getHuiLianTongCardInfo() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

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


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

            return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")));

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


}
\ No newline at end of file
diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java
index 773b38ae..7c38ccfe 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java
@@ -579,7 +579,7 @@ public class OutRechargeOrderController {
 
             String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5);
 
-            JSONObject object = outRechargeOrderService.getMobile(outRechargeOrder.getRechargeContent(),outRechargeOrder.getOrderPrice().intValue(),orderNo);
+            JSONObject object = outRechargeOrderService.getMobile(outRechargeOrder.getRechargeContent(),outRechargeOrder.getOrderPrice().intValue(),orderNo , outRechargeOrder.getRechargeType());
 
             if (object.getInteger("code") != 200) {
                 log.error("getMobileRechargeByOrderId error!", "充值失败");
diff --git a/hai-bweb/src/main/java/com/bweb/excelListener/ImportRechargeOrderListener.java b/hai-bweb/src/main/java/com/bweb/excelListener/ImportRechargeOrderListener.java
index d178f8e4..643a0e7d 100644
--- a/hai-bweb/src/main/java/com/bweb/excelListener/ImportRechargeOrderListener.java
+++ b/hai-bweb/src/main/java/com/bweb/excelListener/ImportRechargeOrderListener.java
@@ -46,12 +46,6 @@ public class ImportRechargeOrderListener extends AnalysisEventListener<ExportOut
             return;
         }
 
-        if (rechargeOrder.getRechargeType() != 2) {
-            data.setErrorMessage("当前话费订单充值类型为快充。");
-            errorData.add(data);
-            return;
-        }
-
         if (Objects.equals(data.getStatusName(), "已完成")) {
             outRechargeOrderService.finishOrder(rechargeOrder.getId());
         } else if (Objects.equals(data.getStatusName(), "失败")){
diff --git a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
index 9b68ab2d..17fe2b7b 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java
@@ -474,8 +474,8 @@ public class OutRechargeOrderController {
 
             outRechargeOrderService.goldPayOrder(userInfoModel.getHighUser().getId(), order.getId());
 
-            if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-               JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+            if (order.getRechargeType() != null) {
+               JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() , order.getRechargeType());
                if (object.getInteger("code") != 200) {
                    order.setRechargeStatus(1);
                    order.setStatus(2);
diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
index 09402b8f..99bae71c 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
@@ -120,9 +120,9 @@ public class CzOrderController {
                     rechargeOrderRecord = new OutRechargeOrderRecord();
                     // 查询订单
                     OutRechargeOrder order = outRechargeOrderService.findByOrderNo(dataObject.getString("out_order_id"));
-                    if (order.getRechargeType() != null && order.getRechargeType() == 1) {
+                    if (order.getRechargeType() != null) {
                         String orderNo = "CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5);
-                        JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo);
+                        JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , orderNo , order.getRechargeType());
                         if (object.getInteger("code") != 200) {
                             order.setRechargeStatus(1);
                             order.setAbnormalMsg(object.getString("message"));
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 9f7839cf..37a80611 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
@@ -391,8 +391,8 @@ public class UnionPayController {
                     order.setStatus(2);
                     order.setPayType(4);
                     order.setPayTime(new Date()); // 支付时间
-                    if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-                        JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+                    if (order.getRechargeType() != null) {
+                        JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() , order.getRechargeType());
                         if (object.getInteger("code") != 200) {
                             order.setRechargeStatus(1);
                             order.setAbnormalMsg(object.getString("message"));
diff --git a/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java b/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
index fae8a22c..c5bdeab8 100644
--- a/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
+++ b/hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
@@ -154,7 +154,7 @@ public interface OutRechargeOrderService {
      * @Param [java.lang.String]
      * @return com.alibaba.fastjson.JSONObject
      */
-    JSONObject getMobile(String phone , Integer amount , String orderNo) throws Exception;
+    JSONObject getMobile(String phone , Integer amount , String orderNo , Integer isFast) throws Exception;
 
     /**
     * @Author Sum1Dream
diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
index dcabadbb..5162ed64 100644
--- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
@@ -343,8 +343,8 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         }
         order.setPaySerialNo(consumptionResult.getString("orderId")); // 支付流水号
         order.setPayRealPrice(order.getPayPrice()); // 实付金额
-        if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-            JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+        if (order.getRechargeType() != null) {
+            JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() ,order.getRechargeType());
             if (object.getInteger("code") != 200) {
                 order.setRechargeStatus(1);
                 order.setAbnormalMsg(object.getString("message"));
@@ -387,7 +387,11 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
     }
 
     @Override
-    public JSONObject getMobile(String phone , Integer amount , String orderNo) throws Exception {
+    public JSONObject getMobile(String phone , Integer amount , String orderNo , Integer isFast) throws Exception {
+
+        if (isFast == 2) {
+            isFast = 0;
+        }
 
         String timestamp = String.valueOf(System.currentTimeMillis());
 
@@ -397,7 +401,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
         map.put("out_order_id" , orderNo);
         map.put("app_key" , CommonSysConst.getSysConfig().getCzAppKey());
         map.put("timestamp" , timestamp.substring(0,timestamp.length()-3));
-        map.put("is_fast" , "1");
+        map.put("is_fast" , isFast);
         map.put("notify_url" , CommonSysConst.getSysConfig().getCzNotifyUrl());
 
         String signStr = WxUtils.generateSignatureAppSecret(map, CommonSysConst.getSysConfig().getCzAppSecret() , WXPayConstants.SignType.MD5);
diff --git a/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java
index 08b5136d..3e131223 100644
--- a/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/pay/impl/RechargeOrderServiceImpl.java
@@ -70,8 +70,8 @@ public class RechargeOrderServiceImpl implements PayService {
                 order.setPayRealPrice(new BigDecimal(map.get("total_fee")).divide(new BigDecimal("100"))); // 实付金额
                 order.setPayTime(new Date()); // 支付时间
                 order.setStatus(2);      // 订单状态 ： 1.待支付 2.已支付 3.已完成 4.已取消 5.已退款
-                if (order.getRechargeType() != null && order.getRechargeType() == 1) {
-                    JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo());
+                if (order.getRechargeType() != null) {
+                    JSONObject object =  outRechargeOrderService.getMobile(order.getRechargeContent() , order.getOrderPrice().intValue() , order.getOrderNo() , order.getRechargeType());
                     if (object.getInteger("code") != 200) {
                         order.setRechargeStatus(1);
                         order.setAbnormalMsg(object.getString("message"));

From edea984a07d4d3654074bc13035ff397a4938dbb Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 16 Feb 2022 16:40:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=90=E5=88=B6=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cweb/controller/pay/CzOrderController.java   |  9 ++++++++-
 .../main/java/com/hai/service/HighUserService.java   | 11 +++++++++++
 .../com/hai/service/impl/HighUserServiceImpl.java    | 12 ++++++++++++
 .../service/impl/OutRechargeOrderServiceImpl.java    |  6 +++++-
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
index 99bae71c..360ee523 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
@@ -228,7 +228,14 @@ public class CzOrderController {
 
             // 积分退款
             if (order.getPayType() == 3) {
-                highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId());
+
+                if (!highUserService.findGoldRepeat(3 , order.getId())) {
+                    highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId());
+                }else {
+                    log.error("orderToPay error!", "已有退款记录");
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录");
+                }
+
             }
 
             // 银联退款
diff --git a/hai-service/src/main/java/com/hai/service/HighUserService.java b/hai-service/src/main/java/com/hai/service/HighUserService.java
index eed2dcf3..15344c25 100644
--- a/hai-service/src/main/java/com/hai/service/HighUserService.java
+++ b/hai-service/src/main/java/com/hai/service/HighUserService.java
@@ -108,6 +108,17 @@ public interface HighUserService {
      **/
     void goldHandle(Long userId, Integer goldNum, Integer goldType, Integer resType, Long resId);
 
+    /**
+    * @Author Sum1Dream
+    * @name findGoldRepeat.java
+    * @Description // 查询用户是否有重复记录
+    * @Date 3:55 下午 2022/2/16
+    * @Param [java.lang.Integer, java.lang.Long]
+    * @return java.lang.Boolean
+    */
+    Boolean findGoldRepeat(Integer resType , Long resId);
+
+
     Long countUser();
 
 }
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
index 4aea00bf..f34d8d5a 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
@@ -6,8 +6,10 @@ import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.DateUtil;
+import com.hai.dao.HighGoldRecMapper;
 import com.hai.dao.HighUserMapper;
 import com.hai.entity.HighGoldRec;
+import com.hai.entity.HighGoldRecExample;
 import com.hai.entity.HighUser;
 import com.hai.entity.HighUserExample;
 import com.hai.model.HighUserModel;
@@ -50,6 +52,9 @@ public class HighUserServiceImpl implements HighUserService {
     @Resource
     private UserCenter userCenter;
 
+    @Resource
+    private HighGoldRecMapper highGoldRecMapper;
+
     @Override
     public List<HighUser> getListUser(Map<String, String> map) {
 
@@ -224,4 +229,11 @@ public class HighUserServiceImpl implements HighUserService {
         HighUserExample example = new HighUserExample();
         return highUserMapper.countByExample(example);
     }
+
+    @Override
+    public Boolean findGoldRepeat(Integer resType, Long resId) {
+        HighGoldRecExample example = new HighGoldRecExample();
+        example.createCriteria().andResIdEqualTo(resId).andResTypeEqualTo(resType);
+        return highGoldRecMapper.selectByExample(example) != null;
+    }
 }
diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
index 5162ed64..e7f7b3ff 100644
--- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
@@ -476,7 +476,11 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
 
         // 金币退款
         if (order.getPayType() == 3) {
-            highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().intValue() * 100, 1, 3, order.getId());
+            if (!highUserService.findGoldRepeat(3 , order.getId())) {
+                highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId());
+            }else {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录");
+            }
             order.setStatus(5);
             order.setRefundTime(new Date());
             order.setOutRefundNo("HFR"+new Date().getTime() );