Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/constant/DragonConstant.java

@@ -4,6 +4,17 @@ package com.liquidnet.service.dragon.constant;
  *
  */
 public class DragonConstant {
+
+    public static final String REFUND_TYPE_APP_ALIPAY="APPALIPAY";//,"App内支付宝支付"),
+    public static final String REFUND_TYPE_APP_WEPAY="APPWEPAY";//,"App内微信支付"),
+    public static final String REFUND_TYPE_APP_IAP="APPIAP";//,"App内IAP(In-App Purchase)支付，iOS虚拟道具支付"),
+    public static final String REFUND_TYPE_WAP_ALIPAY="WAPALIPAY";//,"手机网页内支付宝支付"),
+    public static final String REFUND_TYPE_WAP_WEPAY="WAPWEPAY";//,"手机网页调起微信支付"),
+    public static final String REFUND_TYPE_WEB_ALIPAY="WEBALIPAY";//,"电脑网页内支付宝即时到账支付"),
+    public static final String REFUND_TYPE_WEB_WEPAY="WEBWEPAY";//,"电脑网页内微信二维码支付，用户打开微信扫码支付"),
+    public static final String REFUND_TYPE_JS_WEPAY="JSWEPAY";//,"微信内网页、微信公众号"),
+    public static final String REFUND_TYPE_APPLET_WEPAY="APPLETWEPAY";//,"微信小程序");
+
     public enum payChannelEnum{
         ALIPAY("alipay","支付宝"),
         WEPAY ("wePay","微信"),
@@ -33,6 +44,33 @@ public class DragonConstant {
         }
     }
 
+    /**
+     * 退款状态
+     */
+    public enum refundStatusEnum{
+        STATUS_UNFILLED("0","未处理"),
+        STATUS_REFUNDED("1","退款成功"),
+        STATUS_SUCCESS("2","退款成功，通知成功，交易结束"),
+        STATUS_FAIL("3","退款成功，通知失败，交易结束"),
+        STATUS_EXPIRE("4","退款成功，通知超时，交易结束"),
+        STATUS_REFUNDING("5","正在退款"),
+        STATUS_ERROR("6","退款失败"),
+        STATUS_ERROR_SUCCESS("7","退款失败，通知成功，交易结束"),
+        STATUS_ERROR_FAIL("8","退款失败，通知失败，交易结束"),
+        STATUS_ERROR_EXPIRE("9","退款失败，通知超时，交易结束");
+
+        private String code;
+        private String message;
+        refundStatusEnum(String code, String message) {
+            this.code = code;
+            this.message = message;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
     /**
      * 支付业务类型
      */
@@ -77,6 +115,32 @@ public class DragonConstant {
         }
     }
 
+    /**
+     * 退款类型
+     */
+    public enum refundTypeEnum{
+        REFUND_TYPE_APP_ALIPAY("APPALIPAY","App内支付宝支付"),
+        REFUND_TYPE_APP_WEPAY("APPWEPAY","App内微信支付"),
+        REFUND_TYPE_APP_IAP("APPIAP","App内IAP(In-App Purchase)支付，iOS虚拟道具支付"),
+        REFUND_TYPE_WAP_ALIPAY("WAPALIPAY","手机网页内支付宝支付"),
+        REFUND_TYPE_WAP_WEPAY("WAPWEPAY","手机网页调起微信支付"),
+        REFUND_TYPE_WEB_ALIPAY("WEBALIPAY","电脑网页内支付宝即时到账支付"),
+        REFUND_TYPE_WEB_WEPAY("WEBWEPAY","电脑网页内微信二维码支付，用户打开微信扫码支付"),
+        REFUND_TYPE_JS_WEPAY("JSWEPAY","微信内网页、微信公众号"),
+        REFUND_TYPE_APPLET_WEPAY("APPLETWEPAY","微信小程序");
+
+        private String code;
+        private String message;
+        refundTypeEnum(String code, String message) {
+            this.code = code;
+            this.message = message;
+        }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
     /**
      * MYSQL_REDIS_QUEUE
      */
@@ -91,6 +155,10 @@ public class DragonConstant {
             this.code = code;
             this.message = message;
         }
+
+        public String getCode() {
+            return code;
+        }
     }
 
     /**

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/DragonRefundAppDto.java

+package com.liquidnet.service.dragon.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DragonRefundAppDto implements Serializable {
+    private String orderCode;
+    private String code;
+    private String orderRefundCode;
+    private String refundCode;
+}

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/DragonRefundChannelDto.java

+package com.liquidnet.service.dragon.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DragonRefundChannelDto implements Serializable {
+    private String result;
+    private String message;
+    private RefundContentDto content;
+}

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/RefundContentDto.java

+package com.liquidnet.service.dragon.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class RefundContentDto implements Serializable {
+    private String request;
+    private String response;
+}

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/service/IDragonOrderRefundsService.java

 package com.liquidnet.service.dragon.service;
 
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.dto.DragonRefundAppDto;
+
 import java.math.BigDecimal;
 
 public interface IDragonOrderRefundsService {
@@ -8,15 +11,13 @@ public interface IDragonOrderRefundsService {
 
     /**
      *
-     * @param trade_no => refund_code
-     * @param out_trade_no  => pay_code
+     * @param tradeNo => refundCode
+     * @param outTradeNo  => pay_code
      * @param reason
      * @param returnUrl
      * @param price 退款金额
+     * @param paymentType 支付类型
      */
-    void dragonRefund(String trade_no, String out_trade_no, String reason, String returnUrl, BigDecimal price);
-
-    void weyPayRefund();
+    ResponseDto<DragonRefundAppDto> dragonRefund(String orderCode, String tradeNo, String outTradeNo, String reason, String returnUrl, BigDecimal price, String paymentType,String paymentId);
 
-    void aliPayRefund(String trade_no, String out_trade_no, String reason, String returnUrl, BigDecimal price);
 }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IDGenerator.java

 package com.liquidnet.commons.lang.util;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.UUID;
@@ -45,6 +47,13 @@ public class IDGenerator {
         return orderCode;
     }
 
+    public static String refundCode(){
+        String refundCode = System.currentTimeMillis()+"";
+        int randomCode = RandomUtil.getRandomInt(0,10000);
+        StringUtils.leftPad(refundCode, 3, "0");
+        return refundCode.concat(StringUtils.leftPad(randomCode+"", (randomCode/10), "0")+"R");
+    }
+
     /**
      * 根据 订单号生成qrCode
      *

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/PayMapping.java

+package com.liquidnet.service.base;
+
+import lombok.Data;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+
+@Data
+public class PayMapping {
+    static {
+        reload();
+    }
+    private static Properties errorsProperties;
+
+    public static void reload() {
+        errorsProperties = new Properties();
+        InputStream in = PayMapping.class.getClassLoader().getResourceAsStream("apiclient_key.pem");
+        try {
+            errorsProperties.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+            System.out.printf("errorsProperties init count: %s\n", errorsProperties.size());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static ErrorMessage get(long code) {
+        String value = errorsProperties != null ? errorsProperties.getProperty(code + "") : "-";
+        return ErrorMessage.getInstance().setCode(code + "").setMessage(value);
+    }
+
+    public static ErrorMessage get(String code) {
+        String value = errorsProperties != null ? errorsProperties.getProperty(code) : "-";
+        return ErrorMessage.getInstance().setCode(code).setMessage(value);
+    }
+
+    public static class ErrorMessage implements Cloneable, Serializable {
+        private static final long serialVersionUID = 2208924091512163151L;
+        private String code;
+        private String message;
+
+        private ErrorMessage() {
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        private final static ErrorMessage instance = new ErrorMessage();
+
+        public static ErrorMessage getInstance() {
+            try {
+                return (ErrorMessage) instance.clone();
+            } catch (CloneNotSupportedException e) {
+                e.printStackTrace();
+            }
+            return new ErrorMessage();
+        }
+
+        public ErrorMessage setCode(String code) {
+            this.code = code;
+            return this;
+        }
+
+        public ErrorMessage setMessage(String message) {
+            this.message = message;
+            return this;
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/pom.xml

@@ -31,6 +31,11 @@
             <artifactId>liquidnet-common-cache-redisson</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-dragon-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/service/config/RedisStreamConfig.java

+package com.liquidnet.service.consumer.dragon.service.config;
+
+import com.liquidnet.service.consumer.dragon.service.receiver.RedisPayReceiver;
+import com.liquidnet.service.consumer.dragon.service.receiver.RedisRefundReceiver;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+@Configuration
+public class RedisStreamConfig {
+
+    @Autowired
+    private RedisPayReceiver redisPayReceiver;
+    @Autowired
+    private RedisRefundReceiver redisRefundReceiver;
+
+    @Bean
+    public Subscription subscriptionPay0(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.mysqlRedisQueueEnum.DRAGON_PAY_GROUP.getCode(), "dragon-pay-0"),
+                StreamOffset.create(DragonConstant.mysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayReceiver);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionPay1(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.mysqlRedisQueueEnum.DRAGON_PAY_GROUP.getCode(), "dragon-pay-1"),
+                StreamOffset.create(DragonConstant.mysqlRedisQueueEnum.DRAGON_PAY_KEY.getCode(), ReadOffset.lastConsumed()), redisPayReceiver);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionRefund0(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.mysqlRedisQueueEnum.DRAGON_REFUND_GROUP.getCode(), "dragon-refund-0"),
+                StreamOffset.create(DragonConstant.mysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), ReadOffset.lastConsumed()), redisRefundReceiver);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionRefund1(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+        var subscription = listenerContainer.receiveAutoAck(Consumer.from(DragonConstant.mysqlRedisQueueEnum.DRAGON_REFUND_GROUP.getCode(), "dragon-refund-1"),
+                StreamOffset.create(DragonConstant.mysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode(), ReadOffset.lastConsumed()), redisRefundReceiver);
+        listenerContainer.start();
+        return subscription;
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/service/receiver/RedisPayReceiver.java

+package com.liquidnet.service.consumer.dragon.service.receiver;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.stream.StreamListener;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class RedisPayReceiver implements StreamListener<String, MapRecord<String, String, String>> {
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+        log.info("接受到来自redis PAY 的消息");
+        System.out.println("message id "+message.getId());
+        System.out.println("stream "+message.getStream());
+        System.out.println("body "+message.getValue());
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/service/receiver/RedisRefundReceiver.java

+package com.liquidnet.service.consumer.dragon.service.receiver;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.consumer.dragon.service.IBaseDao;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.stream.StreamListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.LinkedList;
+
+@Slf4j
+@Component
+public class RedisRefundReceiver implements StreamListener<String, MapRecord<String, String, String>> {
+
+    @Resource
+    IBaseDao baseDao;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+        log.info("接受到来自redis REFUND 的消息");
+        System.out.println("message id " + message.getId());
+        System.out.println("stream " + message.getStream());
+        System.out.println("body " + message.getValue());
+        consumerSqlDaoHandler(message.getValue().get("message"));
+    }
+
+    private void consumerSqlDaoHandler(String msg) {
+        try {
+            SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
+            log.debug("CONSUMER SQL ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
+            log.debug("CONSUMER SQL ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
+            Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
+            if (rstBatchSqls) {
+                //应答
+            } else {
+                sendMySqlRedis(msg);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 给 REDIS 队列发送消息 数据库相关
+     *
+     * @param msg 接收到的内容
+     * @return
+     */
+    private boolean sendMySqlRedis(String msg) {
+        try {
+            HashMap<String, String> map = new HashMap<>();
+            map.put("message", msg);
+            MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(DragonConstant.mysqlRedisQueueEnum.DRAGON_REFUND_KEY.getCode());
+            stringRedisTemplate.opsForStream().add(record);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/docu/db_dragon_structure.sql

@@ -6,7 +6,8 @@ use ln_scene;
 drop TABLE if exists `dragon_orders`;
 CREATE TABLE `dragon_orders`
 (
-    `mid`           bigint unsigned                                         NOT NULL AUTO_INCREMENT,
+    `mid`          bigint unsigned                                         NOT NULL AUTO_INCREMENT,
+    `order_id`     varchar(200)                                            NOT NULL DEFAULT '0' COMMENT 'order_id',
     `status`       tinyint                                                 NOT NULL DEFAULT '0' COMMENT '订单状态',
     `code`         varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci  NOT NULL COMMENT '订单支付编号',
     `type`         varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci  NOT NULL COMMENT '订单类型',
@@ -38,7 +39,7 @@ CREATE TABLE `dragon_orders`
 drop TABLE if exists `dragon_order_logs`;
 CREATE TABLE `dragon_order_logs`
 (
-    `mid`           bigint unsigned                                        NOT NULL AUTO_INCREMENT,
+    `mid`          bigint unsigned                                        NOT NULL AUTO_INCREMENT,
     `order_id`     bigint                                                 NOT NULL COMMENT '订单id',
     `payment_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '支付类型',
     `content`      text CHARACTER SET utf8 COLLATE utf8_unicode_ci        NOT NULL COMMENT '支付通知内容',
@@ -56,7 +57,8 @@ CREATE TABLE `dragon_order_logs`
 drop TABLE if exists `dragon_order_refunds`;
 CREATE TABLE `dragon_order_refunds`
 (
-    `mid`                bigint unsigned                                         NOT NULL AUTO_INCREMENT,
+    `mid`               bigint unsigned                                         NOT NULL AUTO_INCREMENT,
+    `order_refund_id`   varchar(200)                                            NOT NULL DEFAULT '0' COMMENT 'order_refund_id',
     `order_id`          bigint                                                  NOT NULL COMMENT '订单id',
     `status`            tinyint                                                 NOT NULL DEFAULT '0' COMMENT '订单退款状态',
     `code`              varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci  NOT NULL COMMENT '订单退款编号',
@@ -85,7 +87,7 @@ CREATE TABLE `dragon_order_refunds`
 drop TABLE if exists `dragon_order_refund_logs`;
 CREATE TABLE `dragon_order_refund_logs`
 (
-    `mid`              bigint unsigned                                        NOT NULL AUTO_INCREMENT,
+    `mid`             bigint unsigned                                        NOT NULL AUTO_INCREMENT,
     `order_id`        bigint                                                 NOT NULL COMMENT '订单id',
     `order_refund_id` bigint                                                 NOT NULL COMMENT '退款订单id',
     `refund_type`     varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '退款类型',

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/config/RedisStreamConfig.java

@@ -17,65 +17,65 @@ import java.time.Duration;
 
 @Configuration
 public class RedisStreamConfig {
-
-    @Autowired
-    private RedisPayReceiver redisPayReceiver;
-    @Autowired
-    private RedisRefundReceiver redisRefundReceiver;
-
-    @Bean
-    public Subscription subscriptionPay0(RedisConnectionFactory factory) {
-        var options = StreamMessageListenerContainer
-                .StreamMessageListenerContainerOptions
-                .builder()
-                .pollTimeout(Duration.ofMillis(1))
-                .build();
-        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-pay-group", "dragon-pay-0"),
-                StreamOffset.create("dragon-pay", ReadOffset.lastConsumed()), redisPayReceiver);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionPay1(RedisConnectionFactory factory) {
-        var options = StreamMessageListenerContainer
-                .StreamMessageListenerContainerOptions
-                .builder()
-                .pollTimeout(Duration.ofMillis(1))
-                .build();
-        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-pay-group", "dragon-pay-1"),
-                StreamOffset.create("dragon-pay", ReadOffset.lastConsumed()), redisPayReceiver);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionRefund0(RedisConnectionFactory factory) {
-        var options = StreamMessageListenerContainer
-                .StreamMessageListenerContainerOptions
-                .builder()
-                .pollTimeout(Duration.ofMillis(1))
-                .build();
-        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-refund-group", "dragon-refund-0"),
-                StreamOffset.create("dragon-refund", ReadOffset.lastConsumed()), redisRefundReceiver);
-        listenerContainer.start();
-        return subscription;
-    }
-
-    @Bean
-    public Subscription subscriptionRefund1(RedisConnectionFactory factory) {
-        var options = StreamMessageListenerContainer
-                .StreamMessageListenerContainerOptions
-                .builder()
-                .pollTimeout(Duration.ofMillis(1))
-                .build();
-        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
-        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-refund-group", "dragon-refund-1"),
-                StreamOffset.create("dragon-refund", ReadOffset.lastConsumed()), redisRefundReceiver);
-        listenerContainer.start();
-        return subscription;
-    }
+//
+//    @Autowired
+//    private RedisPayReceiver redisPayReceiver;
+//    @Autowired
+//    private RedisRefundReceiver redisRefundReceiver;
+//
+//    @Bean
+//    public Subscription subscriptionPay0(RedisConnectionFactory factory) {
+//        var options = StreamMessageListenerContainer
+//                .StreamMessageListenerContainerOptions
+//                .builder()
+//                .pollTimeout(Duration.ofMillis(1))
+//                .build();
+//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+//        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-pay-group", "dragon-pay-0"),
+//                StreamOffset.create("dragon-pay", ReadOffset.lastConsumed()), redisPayReceiver);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionPay1(RedisConnectionFactory factory) {
+//        var options = StreamMessageListenerContainer
+//                .StreamMessageListenerContainerOptions
+//                .builder()
+//                .pollTimeout(Duration.ofMillis(1))
+//                .build();
+//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+//        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-pay-group", "dragon-pay-1"),
+//                StreamOffset.create("dragon-pay", ReadOffset.lastConsumed()), redisPayReceiver);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionRefund0(RedisConnectionFactory factory) {
+//        var options = StreamMessageListenerContainer
+//                .StreamMessageListenerContainerOptions
+//                .builder()
+//                .pollTimeout(Duration.ofMillis(1))
+//                .build();
+//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+//        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-refund-group", "dragon-refund-0"),
+//                StreamOffset.create("dragon-refund", ReadOffset.lastConsumed()), redisRefundReceiver);
+//        listenerContainer.start();
+//        return subscription;
+//    }
+//
+//    @Bean
+//    public Subscription subscriptionRefund1(RedisConnectionFactory factory) {
+//        var options = StreamMessageListenerContainer
+//                .StreamMessageListenerContainerOptions
+//                .builder()
+//                .pollTimeout(Duration.ofMillis(1))
+//                .build();
+//        var listenerContainer = StreamMessageListenerContainer.create(factory, options);
+//        var subscription = listenerContainer.receiveAutoAck(Consumer.from("dragon-refund-group", "dragon-refund-1"),
+//                StreamOffset.create("dragon-refund", ReadOffset.lastConsumed()), redisRefundReceiver);
+//        listenerContainer.start();
+//        return subscription;
+//    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/RefundController.java

 package com.liquidnet.service.dragon.controller;
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.dto.DragonRefundAppDto;
 import com.liquidnet.service.dragon.service.IDragonOrderRefundsService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 @RestController
 @RequestMapping("refund")
@@ -28,7 +30,20 @@ public class RefundController {
     @ApiOperation("支付宝退款")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<String> refundAliPay() {
-//        orderRefundsService.aliPayRefund();
         return ResponseDto.success();
     }
+
+    @PostMapping("refundSingle")
+    @ApiOperation("单条退款")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<DragonRefundAppDto> refundSingle(@RequestParam(value = "orderCode") @NotNull(message = "订单号不能为空") String orderCode,
+                                                        @RequestParam(value = "code") @NotNull(message = "支付单能为空") String code,
+                                                        @RequestParam(value = "orderRefundCode") @NotNull(message = "退款单号不能为空") String orderRefundCode,
+                                                        @RequestParam(value = "reason") @NotNull(message = "退款原因不能为空") String reason,
+                                                        @RequestParam(value = "notifyUrl") @NotNull(message = "回调地址不能为空") String returnUrl,
+                                                        @RequestParam(value = "price") @NotNull(message = "价格不能为空") BigDecimal price,
+                                                        @RequestParam(value = "paymentType") @NotNull(message = "支付类型不能为空") String paymentType,
+                                                        @RequestParam(value = "paymentId") @NotNull(message = "支付订单号不能为空") String paymentId) {
+        return orderRefundsService.dragonRefund(orderCode, code, orderRefundCode, reason, returnUrl, price, paymentType, paymentId);
+    }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/PayAlipayUtils.java

@@ -32,7 +32,7 @@ public class PayAlipayUtils {
 
     public PayAlipayUtils() {
         httpClient = new DefaultAlipayClient(gatewayUrl, appId, merchant_private_key, "json", charset,
-                merchant_pub_key, sign_type); //获得初始化的AlipayClient
+                merchant_pub_key, sign_type);
     }
 
     private static PayAlipayUtils getInstance() {

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/sqlmap.properties

 # ------------------------创建退款订单----------------------------
-dragon_order_refund.insert=INSERT INTO `dragon_order_refunds`(`order_id` ,`status` ,`ticket_id` ,`code` ,`order_refund_code` ,`price` ,`reason` ,`notify_url` ,`refund_type`,`refund_id`,`refund_error`,`refund_at`,`finished_at`,`created_at`,`updated_at`)VALUES(? ,? ,? ,? ,? ,? ,? ,? ,?,?,?,?,?,?,?);
-
+dragon_order_refund.insert=INSERT INTO `dragon_order_refunds`(`order_refund_id`,`code` ,`order_refund_code` ,`price` ,`reason` ,`notify_url` ,`refund_type`,`created_at`,`updated_at`)VALUES(?,?,?,?,?,?,?,?,?);
+# ------------------------修改退款订单----------------------------
+dragon_order_refund_error.update=UPDATE `dragon_order_refunds` SET updated_at = ? , refund_error=? , status=?   WHERE order_refund_id = ? 
+dragon_order_refund_success.update=UPDATE `dragon_order_refunds` SET updated_at = ? , refund_at=? , status=?   WHERE order_refund_id = ?
 # ------------------------创建退款订单日志----------------------------
+dragon_order_refund_log.insert=INSERT INTO `dragon_order_refunds`(`order_refund_id` ,`refund_type` ,`content`,`created_at`,`updated_at`)VALUES(?,?,?,?,?);