修改notify

liquidnet-bus-config/liquidnet-config/liquidnet-service-notify-dev.yml

@@ -36,4 +36,52 @@ liquidnet:
       merchantId: 1551961491
       appId: wx3498304dda39c5a1
       partnerKey: itIuO65O9yKmemOu3S8g1S4orqvCGwXK
+    unionpay:
+      merchantId: 777290058194736
+      gateway-url: https://gateway.test.95516.com
+      certs-path: /data/certs/dragon/unionpay/dev
+# ---------------------以下为银联支付--------------------------------------
+##交易请求地址
+acpsdk:
+  ## 消费接口
+  frontTransUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/frontTransReq.do
+  ## app 消费接口
+  appTransUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/appTransReq.do
+  ## 交易状态查询
+  backTransUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/backTransReq.do
+  ## 交易状态查询：app用的路径
+  singleQueryUrl: ${liquidnet.dragon.unionpay.gateway-url}/gateway/api/queryTrans.do
+  ##  退款路径  (https://gateway.95516.com/gateway/api/backTransReq.do)
+  refundUrl: https://101.231.204.80:5000/gateway/api/backTransReq.do
+  ########################################################################
+  ########################################################################
+  # 报文版本号，固定5.1.0，请勿改动
+  version: 5.1.0
+  # 签名方式，证书方式固定01，请勿改动
+  signMethod: '01'
+  # 是否验证验签证书的CN，测试环境请设置false，生产环境请设置true。非false的值默认都当true处理。
+  ifValidateCNName: false
+  # 是否验证https证书，测试环境请设置false，生产环境建议优先尝试true，不行再false。非true的值默认都当false处理。
+  ifValidateRemoteCert: false
+  #后台通知地址，填写接收银联后台通知的地址，必须外网能访问
+  #backUrl: http://222.222.222.222:8080/ACPSample_AppServer/backRcvResponse
+  #前台通知地址，填写处理银联前台通知的地址，必须外网能访问
+  #frontUrl: http://localhost:8080/ACPSample_AppServer/frontRcvResponse
+  #########################入网测试环境签名证书配置 ################################
+  # 多证书的情况证书路径为代码指定，可不对此块做配置。
+  # 签名证书路径，必须使用绝对路径，如果不想使用绝对路径，可以自行实现相对路径获取证书的方法；测试证书所有商户共用开发包中的测试签名证书，生产环境请从cfca下载得到。
+  # windows样例：
+  signCertPath: ${liquidnet.dragon.unionpay.certs-path}/acp_test_sign.pfx
 
+  # 签名证书密码，测试环境固定000000，生产环境请修改为从cfca下载的正式证书的密码，正式环境证书密码位数需小于等于6位，否则上传到商户服务网站会失败
+  signCertPwd: '000000'
+  # 签名证书类型，固定不需要修改
+  signCertType: PKCS12
+  ##########################加密证书配置################################
+  # 敏感信息加密证书路径(商户号开通了商户对敏感信息加密的权限，需要对 卡号accNo，pin和phoneNo，cvn2，expired加密（如果这些上送的话），对敏感信息加密使用)
+  encryptCertPath: ${liquidnet.dragon.unionpay.certs-path}/acp_test_enc.cer
+  ##########################验签证书配置################################
+  # 验签中级证书路径(银联提供)
+  middleCertPath: ${liquidnet.dragon.unionpay.certs-path}/acp_test_middle.cer
+  # 验签根证书路径(银联提供)
+  rootCertPath: ${liquidnet.dragon.unionpay.certs-path}/acp_test_root.cer

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/strategy/impl/AbstractAlipayStrategy.java

@@ -91,6 +91,7 @@ public abstract class AbstractAlipayStrategy implements IAlipayStrategy {
      */
     protected DragonPayBaseRespDto buildCommonRespDto(DragonPayBaseReqDto dragonPayBaseReqDto){
         DragonPayBaseRespDto respDto = new DragonPayBaseRespDto();
+        respDto.setPayType(dragonPayBaseReqDto.getPayType());
         respDto.setCode(dragonPayBaseReqDto.getCode());
         respDto.setOrderCode(dragonPayBaseReqDto.getOrderCode());
         DragonPayBaseRespDto.PayData payData = new DragonPayBaseRespDto.PayData();

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/biz/DouYinPayBiz.java

+package com.liquidnet.service.dragon.channel.douyinpay.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.service.dragon.utils.PayDouYinpayUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+/**
+ * @author zhangfuxin
+ * @Description:
+ * @date 2021/11/12 上午11:15
+ */
+@Slf4j
+@Component
+public class DouYinPayBiz {
+    @Value("${liquidnet.dragon.wepay.merchantId}")
+    private String merchantId;
+
+    /**
+     * @author zhangfuxin
+     * @Description:抖音订单查询 实现
+     * @date 2021/11/12 上午11:27
+     */
+    public Map<String, Object> tradeQuery(String outOrderNo, String appid) {
+        Map<String, Object> respMap =CollectionUtil.mapStringObject();
+        log.info("DouYinPayBiz.tradeQuery-->> request out_order_no:{} appid:{} ",outOrderNo,appid);
+        SortedMap<String, Object> parameters = new TreeMap<>();
+        parameters.put("app_id", appid);
+        parameters.put("out_order_no", outOrderNo);
+        //生成签名
+        String sign = PayDouYinpayUtils.getInstance().createSign(parameters);
+        parameters.put("sign", sign);
+        //map转string
+        String data = JSON.toJSONString(parameters);
+        log.info("抖音订单查询请求参数:{}",data);
+        try {
+            HttpPost httpost = new HttpPost("https://developer.toutiao.com/api/apps/ecpay/v1/query_order");
+            httpost.setEntity(new StringEntity(data, "UTF-8"));
+            CloseableHttpClient httpClient = PayDouYinpayUtils.getInstance().getHttpClient();
+            CloseableHttpResponse response = httpClient.execute(httpost);
+            HttpEntity entity = response.getEntity();
+            //接受到返回信息
+            String json = EntityUtils.toString(response.getEntity(), "UTF-8");
+            log.info("抖音订单查询接口返回:{}",json);
+            EntityUtils.consume(entity);
+            respMap=JSON.parseObject(json, HashMap.class);
+        }catch (Exception e){
+            log.error(e.getMessage());
+        }
+        return respMap;
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/constant/DouYinpayConstant.java

+package com.liquidnet.service.dragon.channel.douyinpay.constant;
+
+/**
+ * @author zhangfuxin
+ * @Description:   抖音枚举
+ * @date 2021/11/9 下午3:37
+ */
+public class DouYinpayConstant {
+    public enum DouYinTradeStateEnum {
+
+        SUCCESS("0","成功");
+
+        private String code;
+        private String message;
+        DouYinTradeStateEnum(String code, String message) {
+            this.code = code;
+            this.message = message;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/strategy/DouYinayStrategyContext.java

+package com.liquidnet.service.dragon.channel.douyinpay.strategy;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author zhangfuxin
+ * @Description:
+ * @date 2021/11/9 下午4:09
+ */
+@Component
+public class DouYinayStrategyContext {
+    private final Map<String, IDouYinpayStrategy> handlerMap = new HashMap<>();
+
+    public IDouYinpayStrategy getStrategy(String type) {
+        return handlerMap.get(type);
+    }
+
+    public void putStrategy(String code, IDouYinpayStrategy strategy) {
+        handlerMap.put(code, strategy);
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/strategy/DouYinpayStrategyListener.java

+package com.liquidnet.service.dragon.channel.douyinpay.strategy;
+
+import com.liquidnet.service.dragon.channel.douyinpay.strategy.annotation.StrategyDouYinPayHandler;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+
+/**
+ * @author zhangfuxin
+ * @Description:
+ * @date 2021/11/9 下午4:12
+ */
+@Component
+public class DouYinpayStrategyListener implements ApplicationListener<ContextRefreshedEvent> {
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        Map<String, Object> beans = event.getApplicationContext().getBeansWithAnnotation(StrategyDouYinPayHandler.class);
+        DouYinayStrategyContext strategyContext = event.getApplicationContext().getBean(DouYinayStrategyContext.class);
+        beans.forEach((name, bean) -> {
+            StrategyDouYinPayHandler typeHandler = bean.getClass().getAnnotation(StrategyDouYinPayHandler.class);
+            strategyContext.putStrategy(typeHandler.value().getCode(), (IDouYinpayStrategy) bean);
+        });
+    }
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/strategy/IDouYinpayStrategy.java

+package com.liquidnet.service.dragon.channel.douyinpay.strategy;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
+
+
+/**
+ * @author zhangfuxin
+ * @Description:  抖音支付接口
+ * @date 2021/11/9 下午1:42
+ */
+public interface IDouYinpayStrategy {
+    /**
+     * @author zhangfuxin
+     * @Description: 预支付
+     * @date 2021/11/9 下午1:44
+     */
+    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto);
+
+    DragonPayOrderQueryRespDto checkOrderStatus(String code);
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/strategy/annotation/StrategyDouYinPayHandler.java

+package com.liquidnet.service.dragon.channel.douyinpay.strategy.annotation;
+
+import com.liquidnet.service.dragon.constant.DragonConstant;
+
+import java.lang.annotation.*;
+
+/**
+ * @author zhangfuxin
+ * @Description: 抖音标记
+ * @date 2021/11/9 下午1:40
+ */
+@Documented
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface StrategyDouYinPayHandler {
+    DragonConstant.DeviceFromEnum value();
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/strategy/impl/AbstractDouYinPayStrategy.java

+package com.liquidnet.service.dragon.channel.douyinpay.strategy.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
+import com.liquidnet.service.dragon.channel.douyinpay.biz.DouYinPayBiz;
+import com.liquidnet.service.dragon.channel.douyinpay.constant.DouYinpayConstant;
+import com.liquidnet.service.dragon.channel.douyinpay.strategy.IDouYinpayStrategy;
+import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.constant.DragonErrorCodeEnum;
+import com.liquidnet.service.dragon.dto.DragonOrdersDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
+import com.liquidnet.service.dragon.utils.DataUtils;
+import com.liquidnet.service.dragon.utils.PayDouYinpayUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+/**
+ * @author zhangfuxin
+ * @Description:  抖音支付的抽象类
+ * @date 2021/11/9 下午1:41
+ */
+@Slf4j
+public abstract class AbstractDouYinPayStrategy implements IDouYinpayStrategy {
+    // 订单过期时间(秒); 最小 15 分钟，最大两天
+    private int valid_time=60*60*24*2;
+    @Autowired
+    private DouYinPayBiz douYinPayBiz;
+
+    @Autowired
+    private DataUtils dataUtils;
+
+    @Autowired
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
+
+    @Autowired
+    private DragonPayBiz dragonPayBiz;
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        long startTimeTotal = System.currentTimeMillis();
+        long startTime = System.currentTimeMillis();
+        try {
+            //构造请求参数
+            SortedMap<String, Object> commonParams = this.buildRequestParamMap(dragonPayBaseReqDto);
+            //追加请求参数
+            SortedMap<String, Object> parameters = this.appendRequestParam(commonParams,dragonPayBaseReqDto);
+            //生成签名
+            String sign = PayDouYinpayUtils.getInstance().createSign(parameters);
+            parameters.put("sign", sign);
+            //map转string
+            String data = JSON.toJSONString(parameters);
+            log.info("dragonPay:douYinPay:"+dragonPayBaseReqDto.getDeviceFrom()+" request jsondata: {} ",data);
+            HttpPost httpost = new HttpPost(this.getRequestUrl());
+            httpost.setEntity(new StringEntity(data, "UTF-8"));
+            startTime = System.currentTimeMillis();
+            CloseableHttpClient httpClient = PayDouYinpayUtils.getInstance().getHttpClient();
+            log.info("douYinPay-->request--> getHttpClient耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
+            startTime = System.currentTimeMillis();
+            CloseableHttpResponse response = httpClient.execute(httpost);
+            log.info("douYinPay-->request--> execute耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
+            HttpEntity entity = response.getEntity();
+            //接收到返回信息
+            String json = EntityUtils.toString(response.getEntity(), "UTF-8");
+            EntityUtils.consume(entity);
+            log.info("dragonPay:douYinPay:"+dragonPayBaseReqDto.getDeviceFrom()+" response jsonStr: {} ",json);
+            //拼接返回参数
+            DragonPayBaseRespDto respDto = buildCommonRespDto(dragonPayBaseReqDto);
+            Map result=JSON.parseObject(json, HashMap.class);
+            if(DouYinpayConstant.DouYinTradeStateEnum.SUCCESS.getCode().equals(result.get("err_no").toString())){
+                //成功
+                respDto = this.buildResponseDto(respDto,result);
+                //支付订单持久化
+                dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,respDto);
+                log.info("douYinpay-->dragonPay--> 耗时:{}",(System.currentTimeMillis() - startTimeTotal)+"毫秒");
+                return ResponseDto.success(respDto);
+            }else {
+                throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_PARAM_ERROR.getCode(),DragonErrorCodeEnum.TRADE_PARAM_ERROR.getMessage());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 构造公共返回参数
+     * @param dragonPayBaseReqDto
+     * @return
+     */
+    protected DragonPayBaseRespDto buildCommonRespDto(DragonPayBaseReqDto dragonPayBaseReqDto){
+        DragonPayBaseRespDto respDto = new DragonPayBaseRespDto();
+        respDto.setCode(dragonPayBaseReqDto.getCode());
+        respDto.setOrderCode(dragonPayBaseReqDto.getOrderCode());
+        DragonPayBaseRespDto.PayData payData = new DragonPayBaseRespDto.PayData();
+        respDto.setPayData(payData);
+        return respDto;
+    }
+
+    /**
+     * 构造请求参数
+     * @return
+     */
+    protected SortedMap<String, Object> buildRequestParamMap(DragonPayBaseReqDto dragonPayBaseReqDto){
+        SortedMap<String, Object> parameters = new TreeMap<>();
+        parameters.put("total_amount", dragonPayBaseReqDto.getPrice().multiply(BigDecimal.valueOf(100L)).intValue());
+        //商品描述; 长度限制 128 字节，不超过 42 个汉字
+        parameters.put("subject", dragonPayBaseReqDto.getName());
+        //商品详情
+        parameters.put("body", dragonPayBaseReqDto.getDetail());
+        //开发者侧的订单号, 同一小程序下不可重复
+        parameters.put("out_order_no", dragonPayBaseReqDto.getCode());
+        parameters.put("notify_url", this.getNotifyUrl());
+        //订单过期时间(秒); 最小 15 分钟，最大两天
+        parameters.put("valid_time",Integer.parseInt(dragonPayBaseReqDto.getExpireTime())*60);
+        return parameters;
+    };
+
+    /**
+     * 追加请求参数
+     * @param requestMap
+     * @return
+     */
+    abstract SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap,DragonPayBaseReqDto dragonPayBaseReqDto);
+
+    /**
+     * 构造返回参数
+     */
+    abstract DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto,Map result);
+
+    /**
+     * 获取请求url
+     * @return
+     */
+    protected abstract String getRequestUrl();
+
+    /**
+     * 设置notifyUrl
+     */
+    protected abstract String getNotifyUrl();
+
+    @Override
+    public DragonPayOrderQueryRespDto checkOrderStatus(String code) {
+        DragonOrdersDto ordersDto = dataUtils.getPayOrderByCode(code);
+        Map<String, Object> resultMaps = douYinPayBiz.tradeQuery(code,this.getAppid());
+        DragonPayOrderQueryRespDto respDto = dragonPayBiz.buildPayOrderQueryRespDto(ordersDto);
+        Map<String, Object> resultMap= (Map<String, Object>) resultMaps.get("payment_info");
+        Object orderStatus = resultMap.get("order_status");
+      /*  // 查询失败
+        if (null == orderStatus || "FAIL".equals(orderStatus)) {
+            throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_DOUYINPAY_QUERY_ERROR.getCode(),DragonErrorCodeEnum.TRADE_DOUYINPAY_QUERY_ERROR.getMessage());
+        }*/
+        // 当trade_state为SUCCESS时才返回result_code
+        if ("SUCCESS".equals(orderStatus)) {
+            respDto.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_PAID.getCode()));
+        }else {
+            respDto.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_PAY_FAIL.getCode()));
+        }
+        return respDto;
+    }
+
+    protected abstract String getAppid();
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/douyinpay/strategy/impl/DouYinPayStrategyAppletImpl.java

+package com.liquidnet.service.dragon.channel.douyinpay.strategy.impl;
+
+import com.liquidnet.service.dragon.channel.douyinpay.strategy.annotation.StrategyDouYinPayHandler;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.utils.PayDouYinpayUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.SortedMap;
+
+/**
+ * @author zhangfuxin
+ * @Description: 抖音小程序支付实现
+ * @date 2021/11/9 下午1:45
+ */
+@Slf4j
+@Component
+@StrategyDouYinPayHandler(DragonConstant.DeviceFromEnum.APPLET)
+public class DouYinPayStrategyAppletImpl extends AbstractDouYinPayStrategy {
+    @Value("${liquidnet.dragon.url}")
+    private String notifyUrl;
+
+    @Override
+    SortedMap<String, Object> appendRequestParam(SortedMap<String, Object> requestMap, DragonPayBaseReqDto dragonPayBaseReqDto) {
+        requestMap.put("app_id", PayDouYinpayUtils.getInstance().getAPP_ID());
+        return requestMap;
+    }
+
+    @Override
+    DragonPayBaseRespDto buildResponseDto(DragonPayBaseRespDto payBaseRespDto, Map result) {
+        Map data= (Map) result.get("data");
+        payBaseRespDto.getPayData().setOrderId(data.get("order_id").toString());
+        payBaseRespDto.getPayData().setOrderToken(data.get("order_token").toString());
+        return payBaseRespDto;
+    }
+
+
+    @Override
+    protected String getRequestUrl() {
+        return "https://developer.toutiao.com/api/apps/ecpay/v1/create_order";
+    }
+
+    @Override
+    protected String getNotifyUrl() {
+        return notifyUrl + "/notify/douyinpay/applet";
+    }
+
+    @Override
+    protected String getAppid() {
+        return PayDouYinpayUtils.getInstance().getAPP_ID();
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/PayChannelStrategyDouYinImpl.java

+package com.liquidnet.service.dragon.channel.strategy.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
+import com.liquidnet.service.dragon.channel.douyinpay.strategy.DouYinayStrategyContext;
+import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
+import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.constant.DragonErrorCodeEnum;
+import com.liquidnet.service.dragon.dto.DragonOrdersDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
+import com.liquidnet.service.dragon.utils.DataUtils;
+import com.liquidnet.service.dragon.utils.PayDouYinpayUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+
+/**
+ * @author zhangfuxin
+ * @Description: 抖音
+ * @date 2021/11/9 上午11:47
+ */
+@Slf4j
+@Component
+@StrategyPayChannelHandler(DragonConstant.PayChannelEnum.DOUYINPAY)
+public class PayChannelStrategyDouYinImpl extends AbstractPayChannelStrategyImpl {
+
+    @Autowired
+    private DouYinayStrategyContext douYinayStrategyContext;
+
+    @Autowired
+    private DataUtils dataUtils;
+
+    @Autowired
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
+
+    @Autowired
+    private DragonPayBiz dragonPayBiz;
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return douYinayStrategyContext.getStrategy(dragonPayBaseReqDto.getDeviceFrom()).dragonPay(dragonPayBaseReqDto);
+    }
+
+    @Override
+    public String dragonNotify(HttpServletRequest request,String payType,String deviceFrom) {
+
+        JSONObject jsonObject=PayDouYinpayUtils.getJsonObject(request);
+        try {
+            log.info("dragonNotify-->douYinPay json : {}", JSON.toJSONString(jsonObject));
+            log.info("接收到{}支付结果{}", payType, JSON.toJSONString(jsonObject));
+            if(!jsonObject.getString("type").equals("payment")){
+                throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_PARAM_ERROR.getCode(),DragonErrorCodeEnum.TRADE_PARAM_ERROR.getMessage());
+            }
+            JSONObject msg=jsonObject.getJSONObject("msg");
+           // Map msg= (Map) map.get("msg");
+            String code =msg.get("cp_orderno").toString();
+            //持久化通知记录
+            dragonServiceCommonBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(jsonObject));
+            // 根据银行订单号获取支付信息
+            DragonOrdersDto dragonOrdersDto = dataUtils.getPayOrderByCode(code);
+            if (dragonOrdersDto == null) {
+                throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getCode(),DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getMessage());
+            }
+            if (DragonConstant.PayStatusEnum.STATUS_PAID.getCode().equals(dragonOrdersDto.getStatus())) {
+                throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ERROR_HAS_PAID.getCode(),DragonErrorCodeEnum.TRADE_ERROR_HAS_PAID.getMessage());
+            }
+            String sign = jsonObject.get("msg_signature").toString();
+            boolean notifyResult = false;
+            if (PayDouYinpayUtils.getInstance().notifySign( sign,jsonObject)) {// 根据配置信息验证签名
+                //抖音回调 就代表成功了
+                this.completeSuccessOrder(dragonOrdersDto,null, LocalDateTime.now(), JSON.toJSONString(jsonObject));
+                /*if (WepayConstant.WeixinTradeStateEnum.SUCCESS.getCode().equals(notifyMap.get("result_code"))) {// 业务结果
+                    // 成功
+                    notifyResult = this.completeSuccessOrder(dragonOrdersDto, notifyMap.get("transaction_id"), timeEnd, notifyMap.toString());
+                } else {
+                    notifyResult = this.completeFailOrder(dragonOrdersDto, notifyMap.toString());
+                }
+                if(notifyResult){
+                    returnStr = "<xml>\n" + "  <return_code><![CDATA[SUCCESS]]></return_code>\n" + "  <return_msg><![CDATA[OK]]></return_msg>\n" + "</xml>";
+                }*/
+                return "{\"err_no\": 0,\"err_tips\": \"success\"}";
+            } else {
+
+                log.error("touyin notify fail code:{} msg:{} ",DragonErrorCodeEnum.TRADE_DOUYINPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_DOUYINPAY_SIGN_ERROR.getMessage());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    @Override
+    public DragonPayOrderQueryRespDto checkOrderStatus(String code) {
+        DragonOrdersDto ordersDto = dataUtils.getPayOrderByCode(code);
+        DragonPayOrderQueryRespDto respDto = douYinayStrategyContext.getStrategy(DragonConstant.PayTypeEnum.getEnumByCode(ordersDto.getPaymentType()).getDeviceFrom()).checkOrderStatus(code);
+        return respDto;
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/PayChannelStrategyUnionpayImpl.java

+package com.liquidnet.service.dragon.channel.strategy.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
+import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
+import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
+import com.liquidnet.service.dragon.channel.unionpay.biz.UnionpayBiz;
+import com.liquidnet.service.dragon.channel.unionpay.sdk.AcpService;
+import com.liquidnet.service.dragon.channel.unionpay.sdk.SDKConstants;
+import com.liquidnet.service.dragon.channel.unionpay.strategy.UnionpayStrategyContext;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.constant.DragonErrorCodeEnum;
+import com.liquidnet.service.dragon.dto.DragonOrdersDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
+import com.liquidnet.service.dragon.service.impl.DragonOrderRefundsServiceImpl;
+import com.liquidnet.service.dragon.utils.DataUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: PayChannelStrategyUnionpayImpl
+ * @Package com.liquidnet.service.dragon.channel.strategy.impl
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/11/08 18:06
+ */
+@Slf4j
+@Component
+@StrategyPayChannelHandler(DragonConstant.PayChannelEnum.UNIONPAY)
+public class PayChannelStrategyUnionpayImpl extends AbstractPayChannelStrategyImpl {
+    @Autowired
+    private UnionpayStrategyContext unionpayStrategyContext;
+
+    @Autowired
+    private DataUtils dataUtils;
+
+    @Autowired
+    private UnionpayBiz unionpayBiz;
+
+    @Autowired
+    private DragonPayBiz dragonPayBiz;
+
+    @Autowired
+    private DragonServiceCommonBiz dragonServiceCommonBiz;
+
+    @Autowired
+    private DragonOrderRefundsServiceImpl dragonOrderRefundsService;
+    @Autowired
+    private AcpService acpService;
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return unionpayStrategyContext.getStrategy(dragonPayBaseReqDto.getDeviceFrom()).dragonPay(dragonPayBaseReqDto);
+    }
+
+    @Override
+    public String dragonNotify(HttpServletRequest request,String payType,String deviceFrom) {
+        log.info("unionpay-->notify-->begin payType:{} deviceFrom:{}",payType,deviceFrom);
+        try {
+            String encoding = request.getParameter(SDKConstants.param_encoding);
+            Map<String , String> notifyMap = unionpayBiz.parseNotifyMsg(request);
+            log.info("dragonNotify-->unionpay json : {}", JSON.toJSONString(notifyMap));
+            log.info("接收到{}支付结果{}", payType, notifyMap);
+            //商户订单号
+            String code =notifyMap.get("orderId"); //获取后台通知的数据
+            //持久化通知记录
+            dragonServiceCommonBiz.createDragonOrderLogs(code,dragonPayBiz.getPaymentType(payType,deviceFrom),JSON.toJSONString(notifyMap));
+            // 根据银行订单号获取支付信息
+            DragonOrdersDto dragonOrdersDto = dataUtils.getPayOrderByCode(code);
+            if (dragonOrdersDto == null) {
+                throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getCode(),DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getMessage());
+            }
+            if (DragonConstant.PayStatusEnum.STATUS_PAID.getCode().equals(dragonOrdersDto.getStatus())) {
+                throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ERROR_HAS_PAID.getCode(),DragonErrorCodeEnum.TRADE_ERROR_HAS_PAID.getMessage());
+            }
+            boolean notifyResult = false;
+            //1、验证签名
+            if (acpService.validate(notifyMap, encoding)) {
+                //判断respCode=00、A6后，对涉及资金类的交易，请再发起查询接口查询，确定交易成功后更新数据库。
+                //因发现00 是成功 a6为有缺陷的成功，所以如果是a6则要再查一下
+                boolean result=false;
+                if(notifyMap.get("respCode").equals("A6")){
+                    //此处需要发起查询接口，要看下最终状态，等查询接口完毕后再写
+                    result=true;
+                }else if (notifyMap.get("respCode").equals("00")){
+                    result =true;
+                }else{
+                    result =false;
+
+                }
+                if(result){
+                    notifyResult = this.completeSuccessOrder(dragonOrdersDto, notifyMap.get("queryId"), LocalDateTime.now(), notifyMap.toString());
+                }else{
+                    notifyResult = this.completeFailOrder(dragonOrdersDto, notifyMap.toString());
+                }
+
+            }else{
+                log.error("unionPay notify fail code:{} msg:{} ",DragonErrorCodeEnum.TRADE_UNIONPAY_SIGN_ERROR.getCode(),DragonErrorCodeEnum.TRADE_UNIONPAY_SIGN_ERROR.getMessage());
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return "ok";
+    }
+
+    @Override
+    public DragonPayOrderQueryRespDto checkOrderStatus(String code) {
+        // 查看是哪个deviceForm  的支付
+        DragonOrdersDto ordersDto = dataUtils.getPayOrderByCode(code);
+
+        DragonPayOrderQueryRespDto respDto = unionpayStrategyContext.getStrategy(DragonConstant.PayTypeEnum.getEnumByCode(ordersDto.getPaymentType()).getDeviceFrom()).checkOrderStatus(code);
+       /* if(null==ordersDto){
+            throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_UNIONPAY_QUERY_ERROR.getCode(),DragonErrorCodeEnum.TRADE_UNIONPAY_QUERY_ERROR.getMessage());
+        }
+        DragonPayOrderQueryRespDto respDto = dragonPayBiz.buildPayOrderQueryRespDto(ordersDto);
+*/
+        return respDto;
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/constant/UnionpayConstant.java

+package com.liquidnet.service.dragon.channel.unionpay.constant;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: UnionpayConstant
+ * @Package com.liquidnet.service.dragon.channel.unionpay.constant
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/11/8 18:12
+ */
+public class UnionpayConstant {
+    //默认配置的是UTF-8
+    public static String encoding = "UTF-8";
+    public enum UnionTradeStateEnum {
+        TRADE_CLOSED ("TRADE_CLOSED","交易关闭"),
+        TRADE_FINISHED ("TRADE_FINISHED","支付完成"),
+        TRADE_DEFECTIVENESS_SUCCESS ("A6","有缺陷的成功"),
+        TRADE_SUCCESS ("00","支付成功"),
+        WAIT_BUYER_PAY ("WAIT_BUYER_PAY","交易创建"),
+
+        FAIL("01","支付失败");
+
+        private String code;
+        private String message;
+        UnionTradeStateEnum(String code, String message) {
+            this.code = code;
+            this.message = message;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/req/UnionpayBaseReq.java

+package com.liquidnet.service.dragon.channel.unionpay.req;
+
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: UnionpayBaseReq
+ * @Package com.liquidnet.service.dragon.channel.unionpay.req
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/11/10 11:20
+ */
+@Data
+public class UnionpayBaseReq {
+    /***银联全渠道系统，产品参数***/
+    private String version;
+    private String encoding;
+    private String signMethod;
+    private String txnType;
+    private String txnSubType;
+    private String bizType;
+    private String channelType;
+    /***商户接入参数***/
+    private String merId;
+    private String accessType;
+    private String orderId;
+    private String txnTime;
+
+    private String txnAmt;
+    private String currencyCode;
+    private String backUrl;
+    /***app支付接入***/
+    private String accType; //
+    /***wap支付接入***/
+    private String riskRateInfo;
+    private String frontUrl;
+    private String payTimeout;
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/req/UnionpayTradePayReq.java

+package com.liquidnet.service.dragon.channel.unionpay.req;
+
+import com.alibaba.fastjson.JSON;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class:  UnionpayTradePayReq
+ * @Package com.liquidnet.service.dragon.channel.unionpay.req
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/9 17:50
+ */
+@Data
+public class UnionpayTradePayReq extends UnionpayBaseReq implements Serializable, Cloneable{
+    private static final long serialVersionUID = -5827961038383330701L;
+    @Override
+    public String toString(){
+        return JSON.toJSONString(this);
+    }
+    private static final UnionpayTradePayReq obj = new UnionpayTradePayReq();
+
+    public static UnionpayTradePayReq getNew() {
+        try {
+            return (UnionpayTradePayReq) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new UnionpayTradePayReq();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/sdk/Acp6Service.java

+package com.liquidnet.service.dragon.channel.unionpay.sdk;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.IOException;
+import java.security.PublicKey;
+import java.util.Map;
+
+
+/**
+ * @ClassName Acp6Service
+ * @Description 全渠道6.0接口服务类，接入商户集成请可以直接参考使用本类中的方法
+ * @date 2020/03
+ */
+@Slf4j
+public class Acp6Service {
+	@Autowired
+	private SDKConfig sdkConfig;
+
+	@Autowired
+	private CertUtil certUtil;
+
+	@Autowired
+	private SDKUtil sdkUtil;
+	
+	/**
+	 * 请求报文签名(使用配置文件中配置的私钥证书或者对称密钥签名)<br>
+	 * 功能：对请求报文进行签名,并计算赋值certid,signature字段并返回<br>
+	 * @param reqData 请求报文map<br>
+	 * @param encoding 上送请求报文域encoding字段的值<br>
+	 * @return　签名后的map对象<br>
+	 */
+	public Map<String, String> sign(Map<String, String> reqData,String encoding) {
+        return signByCertInfo(reqData, sdkConfig.getSignCertPath(), sdkConfig.getSignCertPwd(), encoding);
+	}
+
+	/**
+	 * 多证书签名(通过传入私钥证书路径和密码签名）<br>
+	 * 功能：如果有多个商户号接入银联,每个商户号对应不同的证书可以使用此方法:传入私钥证书和密码(并且在acp_sdk.properties中 配置 acpsdk.singleMode=false)<br>
+	 * @param reqData 请求报文map<br>
+	 * @param certPath 签名私钥文件（带路径）<br>
+	 * @param certPwd 签名私钥密码<br>
+	 * @param encoding 上送请求报文域encoding字段的值<br>
+	 * @return　签名后的map对象<br>
+	 */
+	public Map<String, String> signByCertInfo(Map<String, String> reqData, String certPath,
+			String certPwd, String encoding) {
+
+        Map<String, String> data = SDKUtil.filterBlank(reqData);
+
+        if (SDKUtil.isEmpty(encoding)) {
+            encoding = "UTF-8";
+        }
+
+        if (SDKUtil.isEmpty(certPath) || SDKUtil.isEmpty(certPwd)) {
+            log.error("CertPath or CertPwd is empty");
+            return data;
+        }
+
+        try {
+			data.put(SDKConstants.param_certId, certUtil.getCertIdByKeyStoreMap(certPath, certPwd));
+			data.put(SDKConstants.param_signature, sdkUtil.signRsa2(data, certPath, certPwd, encoding));
+			return data;
+        } catch (Exception e) {
+            log.error("Sign Error", e);
+            return data;
+        }
+	}
+
+    /**
+	 * 验证签名<br>
+	 * @param data 返回报文数据<br>
+	 * @param encoding 上送请求报文域encoding字段的值<br>
+	 * @return true 通过 false 未通过<br>
+	 */
+	public boolean validate(Map<String, String> data, String encoding) {
+        log.info("验签处理开始");
+        if (SDKUtil.isEmpty(encoding)) {
+            encoding = "UTF-8";
+        }
+
+        String certId = data.get(SDKConstants.param_certId);
+        log.info("对返回报文串验签使用的验签公钥序列号：[" + certId + "]");
+        PublicKey verifyKey = certUtil.getValidatePublicKey(certId);
+        if(verifyKey == null) {
+        	log.error("未找到此序列号证书。");
+            return false;
+        }
+
+        try {
+			boolean result = SDKUtil.verifyRsa2(data, verifyKey, encoding);
+			log.info("验签" + (result ? "成功" : "失败") + "。");
+			return result;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return false;
+        }
+	}
+
+    /**
+     * 获取应答报文中的加密公钥证书,并存储到本地,备份原始证书,并自动替换证书<br>
+     * 更新成功则返回1，无更新返回0，失败异常返回-1<br>
+     * @return
+     */
+    public int updateEncryptCert(String strCert, String certType) {
+        return sdkUtil.updateEncryptCert(strCert, certType);
+    }
+
+	/**
+	 * 密码加密并做base64<br>
+	 * @param accNo 卡号<br>
+	 * @param pin 密码<br>
+	 * @param encoding<br>
+	 * @return 加密的内容<br>
+	 */
+	public String encryptPin(String accNo, String pin, String encoding) {
+		byte[] pinblock = SecureUtil.pinblock(accNo, pin);
+		return Base64.encodeBase64String(SecureUtil.encrypt(certUtil.getPinEncryptCert().pubKey, pinblock));
+	}
+
+//	/**
+//	 * 密码加密并做base64<br>
+//	 * @param accNo 卡号<br>
+//	 * @param pin 密码<br>
+//	 * @param encoding<br>
+//	 * @return 加密的内容<br>
+//	 */
+//	public String encryptPin(String pin, String encoding) {
+//		byte[] pinblock = SecureUtil.pinblock(pin);
+//		return Base64.encodeBase64String(SecureUtil.encrypt(CertUtil.getPinEncryptCert().pubKey, pinblock));
+//	}
+
+	/**
+	 * 敏感信息加密并做base64(卡号，手机号，cvn2,有效期）<br>
+	 * @param data 送 phoneNo,cvn2,有效期<br>
+	 * @param encoding<br>
+	 * @return 加密的密文<br>
+	 */
+	public String encryptData(String data, String encoding) {
+        return this.encryptData(data, encoding);
+    }
+
+
+	/**
+	 * @param data 明文<br>
+	 * @return 加密的密文<br>
+	 */
+	public String encryptData(byte[] data) {
+        try {
+            return Base64.encodeBase64String(SecureUtil.encrypt(certUtil.getEncryptCert().pubKey, data));
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return null;
+        }
+    }
+
+
+	/**
+	 * @param data 明文<br>
+	 * @return 加密的密文<br>
+	 */
+	public String tripleDesEncryptECBPKCS5Padding(byte[] key, byte[] data) {
+        try {
+            return Base64.encodeBase64String(SecureUtil.tripleDesEncryptECBPKCS5Padding(key, SecureUtil.rightPadZero(data, 8)));
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return null;
+        }
+    }
+
+	/**
+	 * 敏感信息解密，使用配置文件acp_sdk.properties解密<br>
+	 * @param base64EncryptedInfo 加密信息<br>
+	 * @param encoding<br>
+	 * @return 解密后的明文<br>
+	 */
+	public String decryptData(String base64EncryptedInfo, String encoding) {
+        return this.decryptData(base64EncryptedInfo, encoding);
+    }
+
+	/**
+	 * 敏感信息解密,通过传入的私钥解密<br>
+	 * @param base64EncryptedInfo 加密信息<br>
+	 * @param certPath 私钥文件（带全路径）<br>
+	 * @param certPwd 私钥密码<br>
+	 * @param encoding<br>
+	 * @return
+	 */
+	public String decryptData(String base64EncryptedInfo, String certPath,
+			String certPwd, String encoding) {
+        return this.decryptData(base64EncryptedInfo, certPath, certPwd, encoding);
+	}
+
+	/**
+	 * 获取敏感信息加密证书的物理序列号<br>
+	 * @return
+	 */
+	public String getEncryptCertId(){
+		return certUtil.getEncryptCert().certId;
+	}
+
+	/**
+	 * 获取敏感信息加密证书的物理序列号<br>
+	 * @return
+	 */
+	public String getPinEncryptCertId(){
+		return certUtil.getPinEncryptCert().certId;
+	}
+
+
+	/**
+	 * 功能：后台交易提交请求报文并接收同步应答报文<br>
+	 * @param reqData 请求报文<br>
+	 * @param reqUrl  请求地址<br>
+	 * @param encoding<br>
+	 * @return 应答http 200返回true ,其他false<br>
+	 */
+	public Map<String,String> post(Map<String, String> reqData, String reqUrl,String encoding) {
+		if(reqData == null || reqUrl == null) {
+			log.error("null input");
+			return null;
+		}
+		log.info("请求银联地址：" + reqUrl + "，请求参数：" + reqData.toString());
+		if(reqUrl.startsWith("https://") && !sdkConfig.isIfValidateRemoteCert()) {
+			reqUrl = "u" + reqUrl;
+		}
+		try{
+			byte[] respBytes = HttpsUtil.post(reqUrl, SDKUtil.createLinkString(reqData, false, true, encoding).getBytes(encoding));
+			if(respBytes == null) {
+				log.error("post失败");
+				return null;
+			}
+			Map<String,String> result = SDKUtil.parseQString(new String(respBytes, encoding), encoding);
+			log.info("应答参数：" + result);
+			return result;
+		} catch (Exception e) {
+			log.error("post失败：" + e.getMessage(), e);
+			return null;
+		}
+	}
+
+	/**
+	 * 功能：后台交易提交请求报文并接收同步应答报文<br>
+	 * @param reqData 请求报文<br>
+	 * @param reqUrl  请求地址<br>
+	 * @param encoding<br>
+	 * @return 应答http 200返回true ,其他false<br>
+	 */
+	public String postNotice(Map<String, String> reqData, String reqUrl,String encoding) {
+		if(reqData == null || reqUrl == null) {
+			log.error("null input");
+			return null;
+		}
+		log.info("请求银联地址：" + reqUrl + "，请求参数：" + reqData.toString());
+		if(reqUrl.startsWith("https://") && !sdkConfig.isIfValidateRemoteCert()) {
+			reqUrl = "u" + reqUrl;
+		}
+		try{
+			byte[] respBytes = HttpsUtil.post(reqUrl, SDKUtil.createLinkString(reqData, false, true, encoding).getBytes(encoding));
+			if(respBytes == null) {
+				log.error("post失败");
+				return null;
+			}
+			String result = new String(respBytes, encoding);
+			log.info("应答体：" + result);
+			return result;
+		} catch (Exception e) {
+			log.error("post失败：" + e.getMessage(), e);
+			return null;
+		}
+	}
+
+	/**
+	 * 对字符串做base64<br>
+	 * @param rawStr<br>
+	 * @param encoding<br>
+	 * @return<br>
+	 * @throws IOException
+	 */
+	public String base64Encode(String rawStr, String encoding){
+		return AcpService.base64Encode(rawStr, encoding);
+	}
+
+	/**
+	 * 对字符串做base64<br>
+	 * @param base64Str<br>
+	 * @param encoding<br>
+	 * @return<br>
+	 * @throws IOException
+	 */
+	public String base64Decode(String base64Str, String encoding){
+		return AcpService.base64Decode(base64Str, encoding);
+	}
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/sdk/SDKConfig.java

+/**
+ *
+ * Licensed Property to China UnionPay Co., Ltd.
+ * 
+ * (C) Copyright of China UnionPay Co., Ltd. 2010
+ *     All Rights Reserved.
+ *
+ * 
+ * Modification History:
+ * =============================================================================
+ *   Author         Date          Description
+ *   ------------ ---------- ---------------------------------------------------
+ *   xshu       2014-05-28       MPI基本参数工具类
+ * =============================================================================
+ */
+package com.liquidnet.service.dragon.channel.unionpay.sdk;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 
+ * @ClassName SDKConfig
+ * @Description acpsdk配置文件acp_sdk.properties配置信息类
+ * @date 2016-7-22 下午4:04:55
+ */
+@Slf4j
+@Component
+@ConfigurationProperties(prefix = "acpsdk")
+@Data
+public class SDKConfig {
+	/** 前台请求URL. */
+	private String frontTransUrl;
+	/** 后台请求URL. */
+	private String backTransUrl;
+	// 退款路径
+	private String refundUrl;
+	/** 二维码统一下单请求URL. */
+	private String orderRequestUrl;
+	/** 单笔查询 */
+	private String singleQueryUrl;
+	/** 批量查询 */
+	private String batchQueryUrl;
+	/** 批量交易 */
+	private String batchTransUrl;
+	/** 文件传输 */
+	private String fileTransUrl;
+	/** 签名证书路径. */
+	private String signCertPath;
+	/** 签名证书密码. */
+	private String signCertPwd;
+	/** 签名证书类型. */
+	private String signCertType;
+	/** 加密公钥证书路径. */
+	private String encryptCertPath;
+	/** 验证签名公钥证书目录. */
+	private String validateCertDir;
+	/** 按照商户代码读取指定签名证书目录. */
+	private String signCertDir;
+//	/** 磁道加密证书路径. */
+//	private String encryptTrackCertPath;
+	/** 磁道加密公钥模数. */
+	private String encryptTrackKeyModulus;
+	/** 磁道加密公钥指数. */
+	private String encryptTrackKeyExponent;
+	/** 6.0.0统一支付产品加密pin公钥证书路径. */
+	private String pinEncryptCertPath;
+	/** 有卡交易. */
+	private String cardRequestUrl;
+	/** app交易 */
+	private String appTransUrl;
+	/** 证书使用模式(单证书/多证书) */
+	private String singleMode;
+	/** 安全密钥(SHA256和SM3计算时使用) */
+	private String secureKey;
+	/** 中级证书路径  */
+	private String middleCertPath;
+	/** 根证书路径  */
+	private String rootCertPath;
+	/** 是否验证验签证书CN，除了false都验  */
+	private boolean ifValidateCNName = true;
+	/** 是否验证https证书，默认都不验  */
+	private boolean ifValidateRemoteCert = false;
+	/** signMethod，没配按01吧  */
+	private String signMethod = "01";
+	/** version，没配按5.0.0  */
+	private String version = "5.0.0";
+	/** frontUrl  */
+	private String frontUrl;
+	/** backUrl  */
+	private String backUrl;
+	/** frontFailUrl  */
+	private String frontFailUrl;
+	
+	/*缴费相关地址*/
+	private String jfFrontRequestUrl;
+	private String jfBackRequestUrl;
+	private String jfSingleQueryUrl;
+	private String jfCardRequestUrl;
+	private String jfAppRequestUrl;
+	
+	//二维码
+	private String qrcBackTransUrl;
+	private String qrcB2cIssBackTransUrl;
+	private String qrcB2cMerBackTransUrl;
+	private String qrcB2cMerBackSynTransUrl;
+	
+	//综合认证
+	private String zhrzFrontRequestUrl;
+	private String zhrzBackRequestUrl;
+	private String zhrzSingleQueryUrl;
+	private String zhrzCardRequestUrl;
+	private String zhrzAppRequestUrl;
+	private String zhrzFaceRequestUrl;
+
+	/** acp6 */
+	private String transUrl;
+	
+	
+	/** 配置文件中的前台URL常量. */
+	public static final String SDK_FRONT_URL = "acpsdk.frontTransUrl";
+	/** 配置文件中的后台URL常量. */
+	public static final String SDK_BACK_URL = "acpsdk.backTransUrl";
+	/** 配置文件中的统一下单URL常量. */
+	public static final String SDK_ORDER_URL = "acpsdk.orderTransUrl";
+	/** 配置文件中的单笔交易查询URL常量. */
+	public static final String SDK_SIGNQ_URL = "acpsdk.singleQueryUrl";
+	/** 配置文件中的批量交易查询URL常量. */
+	public static final String SDK_BATQ_URL = "acpsdk.batchQueryUrl";
+	/** 配置文件中的批量交易URL常量. */
+	public static final String SDK_BATTRANS_URL = "acpsdk.batchTransUrl";
+	/** 配置文件中的文件类交易URL常量. */
+	public static final String SDK_FILETRANS_URL = "acpsdk.fileTransUrl";
+	/** 配置文件中的有卡交易URL常量. */
+	public static final String SDK_CARD_URL = "acpsdk.cardTransUrl";
+	/** 配置文件中的app交易URL常量. */
+	public static final String SDK_APP_URL = "acpsdk.appTransUrl";
+
+	/** 以下缴费产品使用，其余产品用不到，无视即可 */
+	// 前台请求地址
+	public static final String JF_SDK_FRONT_TRANS_URL= "acpsdk.jfFrontTransUrl";
+	// 后台请求地址
+	public static final String JF_SDK_BACK_TRANS_URL="acpsdk.jfBackTransUrl";
+	// 单笔查询请求地址
+	public static final String JF_SDK_SINGLE_QUERY_URL="acpsdk.jfSingleQueryUrl";
+	// 有卡交易地址
+	public static final String JF_SDK_CARD_TRANS_URL="acpsdk.jfCardTransUrl";
+	// App交易地址
+	public static final String JF_SDK_APP_TRANS_URL="acpsdk.jfAppTransUrl";
+	// 人到人
+	public static final String QRC_BACK_TRANS_URL="acpsdk.qrcBackTransUrl";
+	// 人到人
+	public static final String QRC_B2C_ISS_BACK_TRANS_URL="acpsdk.qrcB2cIssBackTransUrl";
+	// 人到人
+	public static final String QRC_B2C_MER_BACK_TRANS_URL="acpsdk.qrcB2cMerBackTransUrl";
+	
+	public static final String QRC_B2C_MER_BACK_SYN_TRANS_URL="acpsdk.qrcB2cMerBackSynTransUrl";
+	
+	/** 以下综合认证产品使用，其余产品用不到，无视即可 */
+	// 前台请求地址
+	public static final String ZHRZ_SDK_FRONT_TRANS_URL= "acpsdk.zhrzFrontTransUrl";
+	// 后台请求地址
+	public static final String ZHRZ_SDK_BACK_TRANS_URL="acpsdk.zhrzBackTransUrl";
+	// 单笔查询请求地址
+	public static final String ZHRZ_SDK_SINGLE_QUERY_URL="acpsdk.zhrzSingleQueryUrl";
+	// 有卡交易地址
+	public static final String ZHRZ_SDK_CARD_TRANS_URL="acpsdk.zhrzCardTransUrl";
+	// App交易地址
+	public static final String ZHRZ_SDK_APP_TRANS_URL="acpsdk.zhrzAppTransUrl";
+	// 图片识别交易地址
+	public static final String ZHRZ_SDK_FACE_TRANS_URL="acpsdk.zhrzFaceTransUrl";
+
+	// acp6
+	public static final String TRANS_URL="acpsdk.transUrl";
+
+	/** 配置文件中签名证书路径常量. */
+	public static final String SDK_SIGNCERT_PATH = "acpsdk.signCert.path";
+	/** 配置文件中签名证书密码常量. */
+	public static final String SDK_SIGNCERT_PWD = "acpsdk.signCert.pwd";
+	/** 配置文件中签名证书类型常量. */
+	public static final String SDK_SIGNCERT_TYPE = "acpsdk.signCert.type";
+	/** 配置文件中加密证书路径常量. */
+	public static final String SDK_ENCRYPTCERT_PATH = "acpsdk.encryptCert.path";
+//	/** 配置文件中磁道加密证书路径常量. */
+//	public static final String SDK_ENCRYPTTRACKCERT_PATH = "acpsdk.encryptTrackCert.path";
+	/** 配置文件中5.0.0有卡产品磁道加密公钥模数常量. */
+	public static final String SDK_ENCRYPTTRACKKEY_MODULUS = "acpsdk.encryptTrackKey.modulus";
+	/** 配置文件中5.0.0有卡产品磁道加密公钥指数常量. */
+	public static final String SDK_ENCRYPTTRACKKEY_EXPONENT = "acpsdk.encryptTrackKey.exponent";
+	/** 配置文件中验证签名证书目录常量. */
+	public static final String SDK_VALIDATECERT_DIR = "acpsdk.validateCert.dir";
+	/** 配置文件中6.0.0统一支付产品加密pin证书路径常量. */
+	public static final String SDK_PINENCRYPTCERT_PATH = "acpsdk.pinEncryptCert.path";
+
+	/** 配置文件中是否加密cvn2常量. */
+	public static final String SDK_CVN_ENC = "acpsdk.cvn2.enc";
+	/** 配置文件中是否加密cvn2有效期常量. */
+	public static final String SDK_DATE_ENC = "acpsdk.date.enc";
+	/** 配置文件中是否加密卡号常量. */
+	public static final String SDK_PAN_ENC = "acpsdk.pan.enc";
+	/** 配置文件中证书使用模式 */
+	public static final String SDK_SINGLEMODE = "acpsdk.singleMode";
+	/** 配置文件中安全密钥 */
+	public static final String SDK_SECURITYKEY = "acpsdk.secureKey";
+	/** 配置文件中根证书路径常量  */
+	public static final String SDK_ROOTCERT_PATH = "acpsdk.rootCert.path";
+	/** 配置文件中根证书路径常量  */
+	public static final String SDK_MIDDLECERT_PATH = "acpsdk.middleCert.path";
+	/** 配置是否需要验证验签证书CN，除了false之外的值都当true处理 */
+	public static final String SDK_IF_VALIDATE_CN_NAME = "acpsdk.ifValidateCNName";
+	/** 配置是否需要验证https证书，除了true之外的值都当false处理 */
+	public static final String SDK_IF_VALIDATE_REMOTE_CERT = "acpsdk.ifValidateRemoteCert";
+	/** signmethod */
+	public static final String SDK_SIGN_METHOD ="acpsdk.signMethod";
+	/** version */
+	public static final String SDK_VERSION = "acpsdk.version";
+	/** 后台通知地址  */
+	public static final String SDK_BACKURL = "acpsdk.backUrl";
+	/** 前台通知地址  */
+	public static final String SDK_FRONTURL = "acpsdk.frontUrl";
+	/** 前台失败通知地址  */
+	public static final String SDK_FRONT_FAIL_URL = "acpsdk.frontFailUrl";
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/sdk/SecureUtil.java

+/**
+ *
+ * Licensed Property to China UnionPay Co., Ltd.
+ *
+ * (C) Copyright of China UnionPay Co., Ltd. 2010
+ *     All Rights Reserved.
+ *
+ *
+ * Modification History:
+ * =============================================================================
+ *   Author         Date          Description
+ *   ------------ ---------- ---------------------------------------------------
+ *   xshu       2014-05-28     报文加密解密等操作的工具类
+ * =============================================================================
+ */
+package com.liquidnet.service.dragon.channel.unionpay.sdk;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Hex;
+import org.bouncycastle.crypto.digests.SM3Digest;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESedeKeySpec;
+import java.security.*;
+import java.util.Arrays;
+
+/**
+ *
+ * @ClassName SecureUtil
+ * @Description acpsdk安全算法工具类
+ * @date 2016-7-22 下午4:08:32
+ */
+@Slf4j
+public class SecureUtil {
+
+    /**
+     * @param bytes
+     * @return
+     */
+    public static byte[] sha1(byte[] bytes) {
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
+            messageDigest.update(bytes);
+            return messageDigest.digest();
+        } catch (NoSuchAlgorithmException e) {
+            log.error("SHA1计算失败", e);
+            return null;
+        }
+    }
+
+    /**
+     * @param bytes
+     * @return
+     */
+    public static byte[] sha256(byte[] bytes) {
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
+            messageDigest.update(bytes);
+            return messageDigest.digest();
+        } catch (Exception e) {
+            log.error("SHA256计算失败", e);
+            return null;
+        }
+    }
+
+    /**
+     * @param bytes
+     * @return
+     */
+    public static byte[] sm3(byte[] bytes) {
+        SM3Digest sm3 = new SM3Digest();
+        sm3.update(bytes, 0, bytes.length);
+        byte[] result = new byte[sm3.getDigestSize()];
+        sm3.doFinal(result, 0);
+        return result;
+    }
+
+    public static byte[] getSignature(PrivateKey priKey, byte[] digest) {
+        byte[] mesDigest;
+        Signature sig;
+        try {
+            sig = Signature.getInstance("SHA1withRSA");
+            sig.initSign(priKey);
+            sig.update(digest);
+            mesDigest = sig.sign();
+            return mesDigest;
+        } catch (Exception e) {
+            log.error("签名计算失败", e);
+            return null;
+        }
+    }
+
+    public static byte[] getSignatureSHA256(PrivateKey priKey, byte[] digest) {
+        byte[] mesDigest;
+        Signature sig;
+        try {
+            sig = Signature.getInstance("SHA256withRSA");
+            sig.initSign(priKey);
+            sig.update(digest);
+            mesDigest = sig.sign();
+            return mesDigest;
+        } catch (Exception e) {
+            log.error("签名计算失败", e);
+            return null;
+        }
+    }
+
+
+    public static boolean verifySignature(PublicKey pubKey, byte[] digest, byte[] signature) {
+        try {
+            Signature sig = Signature.getInstance("SHA1withRSA");
+
+            sig.initVerify(pubKey);
+            sig.update(digest);
+
+            boolean ok = sig.verify(signature);
+            return ok;
+        } catch (Exception e) {
+            log.error("验签异常", e);
+            return false;
+        }
+    }
+
+
+    public static boolean verifySignatureSHA256(PublicKey pubKey, byte[] digest, byte[] signature) {
+        if (pubKey == null || digest == null || signature == null) {
+            if(pubKey == null){
+                log.error("验签时pubKey传入了空值，验签失败");
+            } else if (digest == null){
+                log.error("验签时digest传入了空值，验签失败");
+            } else if (signature == null){
+                log.error("验签时signature传入了空值，验签失败");
+            } else {
+                log.error("验签时传入了空值，验签失败");
+            }
+            return false;
+        }
+        try {
+            Signature sig = Signature.getInstance("SHA256withRSA");
+            sig.initVerify(pubKey);
+            sig.update(digest);
+            boolean ok = sig.verify(signature);
+            return ok;
+        } catch (Exception e) {
+            log.error("验签异常", e);
+            return false;
+        }
+    }
+    public static byte[] encrypt(Key key, byte[] data) {
+        try {
+            Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+            return cipher.doFinal(data);
+        } catch (Exception e) {
+            log.error("加密失败", e);
+            return null;
+        }
+    }
+
+    public static byte[] decrypt(Key Key, byte[] data) {
+        try {
+            Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+            cipher.init(Cipher.DECRYPT_MODE, Key);
+            return cipher.doFinal(data);
+        } catch (Exception e) {
+            log.error("解密失败", e);
+            return null;
+        }
+    }
+
+    /**
+     * ANSIX9.8格式（带主账号信息）pinblock
+     * @param pan 卡号
+     * @param pin
+     * @return
+     */
+    public static byte[] pinblock(String pan, String pin){
+
+        if(SDKUtil.isEmpty(pan) || SDKUtil.isEmpty(pin)){
+			log.error("卡号或pin为空，无法算pinblock。");
+			return null;
+		}
+        pan = pan.trim();
+        pin = pin.trim();
+		if (!pan.matches("^[0-9]{13,19}$")) {
+			log.error("卡号格式不对，无法算pinblock。");
+			return null;
+		}
+        if (!pin.matches("^[0-9]{4,6}$")) {
+            log.error("pin格式不对，无法算pinblock。");
+            return null;
+        }
+
+        pan = ("0000") + pan.substring(pan.length() - 13, pan.length() - 1);
+        int blockLen = 8;
+        try {
+            pin = "0" + pin.length() + pin;
+            byte[] pinbyte = Arrays.copyOf(Hex.decodeHex(pin.toCharArray()), blockLen);
+            Arrays.fill(pinbyte, pin.length()/2, blockLen, (byte)0xff);
+            byte[] panbyte = Hex.decodeHex(pan.toCharArray());
+            byte[] tempPin = new byte[blockLen];
+            for (int i = 0; i < blockLen; i++) {
+                tempPin[i] = (byte) (pinbyte[i] ^ panbyte[i]);
+            }
+            return tempPin;
+        } catch (Exception e){
+            log.error("pinblock计算异常啦……", e);
+            return null;
+        }
+    }
+
+//    /**
+//    * ANSI X9.8格式（不带主账号信息）pinblock
+//    * @param pin
+//    * @return
+//    */
+//    public static byte[] pinblock(String pin){
+//
+//       if(SDKUtil.isEmpty(pin)){
+//			log.error("卡号或pin为空，无法算pinblock。");
+//			return null;
+//		}
+//       pin = pin.trim();
+//       if (!pin.matches("^[0-9]{4,6}$")) {
+//           log.error("pin格式不对，无法算pinblock。");
+//           return null;
+//       }
+//       int blockLen = 8;
+//       try {
+//           pin = "0" + pin.length() + pin;
+//           byte[] pinbyte = Arrays.copyOf(Hex.decodeHex(pin.toCharArray()), blockLen);
+//           Arrays.fill(pinbyte, pin.length()/2, blockLen, (byte)0xff);
+//           return pinbyte;
+//       } catch (Exception e){
+//           log.error("pinblock计算异常啦……", e);
+//           return null;
+//       }
+//   }
+
+	public static byte[] tripleDesEncryptECBPKCS5Padding(byte[] key, byte[] data) {
+
+		try {
+			if(data == null || data.length % 8 != 0)
+				throw new IllegalArgumentException("data is null or error data length.");
+
+			SecretKey sk = getTripleDesKey(key);
+
+			Cipher cipher = Cipher.getInstance("DESede/ECB/PKCS5Padding");
+			cipher.init(Cipher.ENCRYPT_MODE, sk);
+			return cipher.doFinal(data);
+
+		} catch (Exception e) {
+	        log.error("加密失败", e);
+	        return null;
+		}
+	}
+
+	/**
+	 * 后补0到位数为unitLength的整数倍
+	 * @param value
+	 * @return
+	 */
+	public static byte[] rightPadZero(byte[] value, final int unitLength){
+		if (value.length % unitLength == 0)
+			return value;
+		int len = (value.length/unitLength + 1) * unitLength;
+		return Arrays.copyOf(value, len);
+	}
+
+	/**
+	 * 通过byte数组得到SecretKey类型的密钥
+	 * @param key
+	 * @return
+	 * @throws IllegalArgumentException
+	 */
+	private static SecretKey getTripleDesKey(byte[] key) {
+
+		if (key == null || !(key.length== 8||key.length== 16||key.length== 24))
+			throw new IllegalArgumentException("key is null or error key length.");
+
+		byte[] specKey = new byte[24];
+
+		try {
+			switch (key.length) {
+			case 16:
+				System.arraycopy(key, 0, specKey, 0, 16);
+				System.arraycopy(key, 0, specKey, 16, 8);
+				break;
+			case 8:
+				System.arraycopy(key, 0, specKey, 0, 8);
+				System.arraycopy(key, 0, specKey, 8, 8);
+				System.arraycopy(key, 0, specKey, 16, 8);
+				break;
+			case 24:
+				System.arraycopy(key, 0, specKey, 0, 24);
+				break;
+			default:
+				throw new IllegalArgumentException("error key length.");
+			}
+
+			DESedeKeySpec ks = new DESedeKeySpec(specKey);
+			SecretKey sk = SecretKeyFactory.getInstance("DESede")
+					.generateSecret(ks);
+			return sk;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new SecurityException("exception in 3des-ecb encryption", e);
+		}
+	}
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/sdk/readme_and_history

+【哪个sdk新就用哪个哦】【不完全向下兼容注意】
+
+2020/9/29：
+增加应答只需要关心200的post。
+
+2020/6/23：
+规范大改了，请参考最新规范进行修改。
+1. 应答新增returnMsg，调整了应答码和交易状态相关字段。具体的值见规范。
+目前使用的：
+1）returnCode：代表此次交易请求的业务结果，查询交易表示查询操作的业务结果，具体交易结果，以交易应答码、交易状态码为准。
+2）respCode：交易结果应答码。
+3）xxxStatus：各类交易的状态
+① transferStatus-转账状态，仅转账交易出现
+② billStatus-账单状态，仅缴费交易用
+③ entryStatus-入账状态，入账状态查询用
+④ transStatus-消费/预授权交易的状态，仅消费和预授权查询和通知用
+已删除的：resultCode、transCode、transMsg。
+2. 应答新增merTransIndex，查询接口会原样应答，但目前并没有往发卡或者二维码的付款方送，大概没别的作用。
+3. 应答新增preAuthId，没什么用，如果需要收单手工帮你处理预授权进行撤销或完成时可用提供他们，可方便他们处理。卡号+商户号+preAuthId在预授权超时或结束（完成或撤销）前是唯一的。
+4. 新增respCode、transStatus取值TRANS_PRE_AUTH_COMPLETED，表示已被预授权完成。
+5. 查询应答新增transStatus字段表示被查询的原交易的状态。
+6. respCode和respMsg下沉到bizContent中.
+7. traceNo和traceTime替换成清算主键settleKey，settleKey在收单和发卡的清算文件内是唯一的，可用于和收单对账，以及找银联和发卡查交易。
+8. merCertId、cupCertId改为certId。
+9. accessId：填写商户号。
+10. accessType填写0。
+11. 订单号、交易时间、商户代码从公共参数下沉到bizContent中。
+12. 增加入账状态状态查询接口。
+13. 转账交易termId从必填M改成可选O。
+14. 两方转账也返回transferStatus。
+
+2020/4/29：
+6.0接口地址修正最终版，注意获取地址方式改getTransUrl，配置文件增加acpsdk.transUrl=https://gateway.test.95516.com/api/trans.do。
+
+2020/4/4：
+不完全向下兼容，注意对应修改，修改后的样例可参考assets/sdk测试类.
+修改后：
+全渠道5.0、5.1用AcpService。
+全渠道6.0用Acp6Service。
+二维码用QrcService。。
+LogUtil删除，请改成直接调log4j或slf4j打印。
+原二维码DemoBase中：
+DemoBase.getAddnCond->QrcService.getKVBase64Field
+DemoBase.formInfoBase64->QrcService.getKVBase64Field
+DemoBase.getPayeeInfo->QrcService.getKVBase64Field
+DemoBase.getPayeeInfoWithEncrpyt->QrcService.getKVEncBase64Field
+DemoBase.getPayerInfo->QrcService.getKVBase64Field
+DemoBase.getPayerInfoWithEncrpyt->QrcService.getKVEncBase64Field
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/strategy/IUnionpayStrategy.java

+package com.liquidnet.service.dragon.channel.unionpay.strategy;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
+
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: Test
+ * @Package com.liquidnet.service.dragon.channel.strategy
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/10 14:27
+ */
+public interface IUnionpayStrategy {
+    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto);
+    DragonPayOrderQueryRespDto checkOrderStatus(String code);
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/unionpay/strategy/UnionpayStrategyContext.java

+package com.liquidnet.service.dragon.channel.unionpay.strategy;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: Test
+ * @Package com.liquidnet.service.dragon.channel.strategy
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/10 14:27
+ */
+@Component
+public class UnionpayStrategyContext {
+    private final Map<String, IUnionpayStrategy> handlerMap = new HashMap<>();
+
+    public IUnionpayStrategy getStrategy(String type) {
+        return handlerMap.get(type);
+    }
+
+    public void putStrategy(String code, IUnionpayStrategy strategy) {
+        handlerMap.put(code, strategy);
+    }
+}

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/resp/WePayRefundReturnDto.java

 package com.liquidnet.service.dragon.channel.wepay.resp;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/receiver/RedisPayNotifyReceiver.java

-//package com.liquidnet.service.dragon.receiver;
+package com.liquidnet.service.dragon.receiver;//package com.liquidnet.service.dragon.receiver;
 //
 //import com.liquidnet.commons.lang.util.HttpUtil;
 //import com.liquidnet.commons.lang.util.JsonUtils;