修改演出详情

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

@@ -17,14 +17,33 @@ public class DragonConstant {
 
     public enum PayChannelEnum{
         ALIPAY("alipay","支付宝"),
-        WEPAY ("wePay","微信"),
-        CLOUDPAY("cloudPay","云闪付");
+        WEPAY ("wepay","微信"),
+        APPLEPAY ("applepay","applepay"),
+        CLOUDPAY("cloudpay","云闪付");
         private String code;
         private String message;
         PayChannelEnum(String code, String message) {
             this.code = code;
             this.message = message;
         }
+
+        public String getCode() {
+            return code;
+        }
+    }
+
+    public enum DeviceFromEnum{
+        WEB("web",""),WAP("wap","")
+        ,APP("app",""),JS("js",""),APPLE("apple","");
+        private String code;
+        private String message;
+        DeviceFromEnum(String code, String message) {
+            this.code = code;
+            this.message = message;
+        }
+        public String getCode() {
+            return code;
+        }
     }
     /**
      * 支付状态

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

+package com.liquidnet.service.dragon.channel.alipay.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 AlipayStrategyContext {
+    private final Map<String, IAlipayStrategy> handlerMap = new HashMap<>();
+
+    public IAlipayStrategy getStrategy(String type) {
+        return handlerMap.get(type);
+    }
+
+    public void putStrategy(String code, IAlipayStrategy strategy) {
+        handlerMap.put(code, strategy);
+    }
+}

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

+package com.liquidnet.service.dragon.channel.alipay.strategy;
+
+import com.liquidnet.service.dragon.channel.alipay.strategy.annotation.StrategyAlipayHandler;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+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 AlipayStrategyListener implements ApplicationListener<ContextRefreshedEvent> {
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        Map<String, Object> beans = event.getApplicationContext().getBeansWithAnnotation(StrategyAlipayHandler.class);
+        AlipayStrategyContext strategyContext = event.getApplicationContext().getBean(AlipayStrategyContext.class);
+        beans.forEach((name, bean) -> {
+            StrategyAlipayHandler typeHandler = bean.getClass().getAnnotation(StrategyAlipayHandler.class);
+            strategyContext.putStrategy(typeHandler.value().getCode(), (IAlipayStrategy) bean);
+        });
+    }
+}
\ No newline at end of file

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

+package com.liquidnet.service.dragon.channel.alipay.strategy;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+
+
+/**
+ * @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 IAlipayStrategy {
+    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto);
+}

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/alipay/strategy/annotation/StrategyAlipayHandler.java

+package com.liquidnet.service.dragon.channel.alipay.strategy.annotation;
+
+import com.liquidnet.service.dragon.constant.DragonConstant;
+
+import java.lang.annotation.*;
+
+/**
+ * @author AnJiabin <jiabin.an@lightnet.io>
+ * @version V1.0
+ * @Description: TODO
+ * @class: StrategyGetFundDataHandler
+ * @Package com.liquidnet.service.reconciliation.strategy.annotation
+ * @Copyright: LightNet @ Copyright (c) 2020
+ * @date 2020/10/27 15:29
+ */
+@Documented
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface StrategyAlipayHandler {
+    DragonConstant.DeviceFromEnum value();
+}

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

+package com.liquidnet.service.dragon.channel.alipay.strategy.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.channel.alipay.strategy.IAlipayStrategy;
+import com.liquidnet.service.dragon.channel.alipay.strategy.annotation.StrategyAlipayHandler;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: AlipayStrategyWapImpl
+ * @Package com.liquidnet.service.dragon.channel.alipay.strategy.impl
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/10 14:34
+ */
+@Component
+@StrategyAlipayHandler(DragonConstant.DeviceFromEnum.APP)
+public class AlipayStrategyAppImpl  implements IAlipayStrategy {
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return null;
+    }
+}

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

+package com.liquidnet.service.dragon.channel.alipay.strategy.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.channel.alipay.strategy.IAlipayStrategy;
+import com.liquidnet.service.dragon.channel.alipay.strategy.annotation.StrategyAlipayHandler;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: AlipayStrategyWapImpl
+ * @Package com.liquidnet.service.dragon.channel.alipay.strategy.impl
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/10 14:34
+ */
+@Component
+@StrategyAlipayHandler(DragonConstant.DeviceFromEnum.WAP)
+public class AlipayStrategyWapImpl  implements IAlipayStrategy {
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return null;
+    }
+}

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

+package com.liquidnet.service.dragon.channel.alipay.strategy.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.channel.alipay.strategy.IAlipayStrategy;
+import com.liquidnet.service.dragon.channel.alipay.strategy.annotation.StrategyAlipayHandler;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: AlipayStrategyWapImpl
+ * @Package com.liquidnet.service.dragon.channel.alipay.strategy.impl
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/10 14:34
+ */
+@Component
+@StrategyAlipayHandler(DragonConstant.DeviceFromEnum.WEB)
+public class AlipayStrategyWebImpl implements IAlipayStrategy {
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return null;
+    }
+}

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

+package com.liquidnet.service.dragon.channel.strategy;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+
+
+/**
+ * @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 IPayChannelStrategy {
+    ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto);
+}

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

+package com.liquidnet.service.dragon.channel.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 PayChannelStrategyContext {
+    private final Map<String, IPayChannelStrategy> handlerMap = new HashMap<>();
+
+    public IPayChannelStrategy getStrategy(String type) {
+        return handlerMap.get(type);
+    }
+
+    public void putStrategy(String code, IPayChannelStrategy strategy) {
+        handlerMap.put(code, strategy);
+    }
+}

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

+package com.liquidnet.service.dragon.channel.strategy;
+
+import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+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 PayChannelStrategyListener implements ApplicationListener<ContextRefreshedEvent> {
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        Map<String, Object> beans = event.getApplicationContext().getBeansWithAnnotation(StrategyPayChannelHandler.class);
+        PayChannelStrategyContext strategyContext = event.getApplicationContext().getBean(PayChannelStrategyContext.class);
+        beans.forEach((name, bean) -> {
+            StrategyPayChannelHandler typeHandler = bean.getClass().getAnnotation(StrategyPayChannelHandler.class);
+            strategyContext.putStrategy(typeHandler.value().getCode(), (IPayChannelStrategy) bean);
+        });
+    }
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/annotation/StrategyPayChannelHandler.java

+package com.liquidnet.service.dragon.channel.strategy.annotation;
+
+import com.liquidnet.service.dragon.constant.DragonConstant;
+
+import java.lang.annotation.*;
+
+/**
+ * @author AnJiabin <jiabin.an@lightnet.io>
+ * @version V1.0
+ * @Description: TODO
+ * @class: StrategyGetFundDataHandler
+ * @Package com.liquidnet.service.reconciliation.strategy.annotation
+ * @Copyright: LightNet @ Copyright (c) 2020
+ * @date 2020/10/27 15:29
+ */
+@Documented
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface StrategyPayChannelHandler {
+    DragonConstant.PayChannelEnum value();
+}

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

+package com.liquidnet.service.dragon.channel.strategy.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.channel.strategy.IPayChannelStrategy;
+import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author AnJiabin <jiabin.an@lightnet.io>
+ * @version V1.0
+ * @Description: currencyCloud
+ * @class: CurrencyCloudGetFundDataStrategyImpl
+ * @Package com.liquidnet.service.reconciliation.strategy.transtype.impl
+ * @Copyright: LightNet @ Copyright (c) 2020
+ * @date 2020/10/27 14:58
+ */
+@Component
+@StrategyPayChannelHandler(DragonConstant.PayChannelEnum.ALIPAY)
+public class PayChannelStrategyAlipayImpl implements IPayChannelStrategy {
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return null;
+    }
+}

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

+package com.liquidnet.service.dragon.channel.strategy.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.channel.strategy.IPayChannelStrategy;
+import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author AnJiabin <jiabin.an@lightnet.io>
+ * @version V1.0
+ * @Description: liquidnet-wallet
+ * @class: LiquidnetWalletGetFundDataStrategyImpl
+ * @Package com.liquidnet.service.reconciliation.strategy.transtype.impl
+ * @Copyright: LightNet @ Copyright (c) 2020
+ * @date 2020/10/27 14:58
+ */
+@Component
+@StrategyPayChannelHandler(DragonConstant.PayChannelEnum.APPLEPAY)
+public class PayChannelStrategyApplepayImpl implements IPayChannelStrategy {
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return null;
+    }
+}

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

+package com.liquidnet.service.dragon.channel.strategy.impl;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.dragon.channel.strategy.IPayChannelStrategy;
+import com.liquidnet.service.dragon.channel.strategy.annotation.StrategyPayChannelHandler;
+import com.liquidnet.service.dragon.constant.DragonConstant;
+import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
+import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author AnJiabin <jiabin.an@lightnet.io>
+ * @version V1.0
+ * @Description: liquidnet-wallet
+ * @class: LiquidnetWalletGetFundDataStrategyImpl
+ * @Package com.liquidnet.service.reconciliation.strategy.transtype.impl
+ * @Copyright: LightNet @ Copyright (c) 2020
+ * @date 2020/10/27 14:58
+ */
+@Component
+@StrategyPayChannelHandler(DragonConstant.PayChannelEnum.WEPAY)
+public class PayChannelStrategyWepayImpl implements IPayChannelStrategy {
+
+    @Override
+    public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
+        return null;
+    }
+}

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

@@ -40,7 +40,9 @@ public class PayController {
     @ApiOperation("支付宝web支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "支付类型:TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB,STRAWBERRY", example = "TICKET"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = "支付类型:alipay,wepay,iappay", example = "alipay"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = "设备来源:web,wap,app,js,apple", example = "wap"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "业务类型:TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB,STRAWBERRY", example = "TICKET"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.1"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "name", value = "订单名称", example = "测试订单001"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "detail", value = "订单描述", example = "测试订单001"),
@@ -48,7 +50,10 @@ public class PayController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "clientIp", value = "客户端ip", example = "127.0.0.1"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "notifyUrl", value = "通知url", example = "pay.zhengzai.tv"),
     })
-    public ResponseDto<DragonPayBaseRespDto> webAlipay(@RequestParam(value = "type") @NotNull(message = "支付类型不能为空") String type,
+    public ResponseDto<DragonPayBaseRespDto> webAlipay(
+            @RequestParam(value = "payType") @NotNull(message = "支付类型不能为空") BigDecimal payType,
+            @RequestParam(value = "deviceFrom") @NotNull(message = "设备来源不能为空") BigDecimal deviceFrom,
+            @RequestParam(value = "type") @NotNull(message = "业务类型不能为空") String type,
                                                        @RequestParam(value = "price") @NotNull(message = "支付金额不能为空") BigDecimal price,
                                                        @RequestParam(value = "name") @NotNull(message = "订单名称不能为空") String name,
                                                        @RequestParam(value = "detail") @NotNull(message = "订单描述不能为空") String detail,