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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderCodeParam.java

@@ -13,9 +13,7 @@ import java.io.Serializable;
 public class AdamMemberOrderCodeParam implements Serializable {
     private static final long serialVersionUID = 2500742355642406263L;
     @ApiModelProperty(position = 10, required = true, value = "类型:2-会员码,3-礼包码", example = "3")
-    @NotNull(message = "兑换码类型不能位空")
-    @Min(value = 2, message = "兑换码类型无效")
-    @Max(value = 3, message = "兑换码类型无效")
+    @Pattern(regexp = "^[2-3]$", message = "类型无效")
     private Integer mode;
     @ApiModelProperty(position = 11, required = true, value = "兑换码")
     @NotBlank(message = "兑换码不能为空")

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java

@@ -19,10 +19,8 @@ public class AdamMemberOrderParam implements Serializable {
     @ApiModelProperty(position = 11, required = true, value = "会员价格ID", example = "1")
     @NotBlank(message = "会员价格ID不能为空")
     private String memberPriceId;
-    @ApiModelProperty(position = 12, required = true, value = "购买方式:0-购买会员,1-购买会员码", allowableValues = "0,1")
-    @NotNull(message = "购买方式不能为空")
-    @Min(value = 0, message = "购买方式无效")
-    @Max(value = 1, message = "购买方式无效")
+    @ApiModelProperty(position = 12, required = true, value = "类型:0-购买会员,1-购买会员码", allowableValues = "0,1")
+    @Pattern(regexp = "^[0-1]$", message = "类型无效")
     private Integer mode;
     @ApiModelProperty(position = 13, required = true, value = "应付金额", example = "0.01")
     @DecimalMin(value = "0.01", message = "应付金额有误")
@@ -34,10 +32,10 @@ public class AdamMemberOrderParam implements Serializable {
     @Pattern(regexp = LnsRegex.Valid.DATETIME_YMD, message = "生日格式有误")
     private String birthday;
     @ApiModelProperty(position = 16, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
-    @NotBlank(message = "支付终端不能为空")
+    @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效")
     private String deviceFrom;
     @ApiModelProperty(position = 17, required = true, value = "支付方式", allowableValues = "alipay,wepay")
-    @NotBlank(message = "支付方式不能为空")
+    @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效")
     private String payType;
     @ApiModelProperty(position = 18, required = false, value = "App内Apple支付必传")
     private String productId;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberPriceParam.java

@@ -22,9 +22,7 @@ public class AdamMemberPriceParam implements Serializable {
     @NotBlank(message = "会员类型ID不能为空")
     private String memberId;
     @ApiModelProperty(position = 3, value = "状态:0-不可用,1-上线中,2-已下线", allowableValues = "0,1,2")
-    @NotNull(message = "状态不能为空")
-    @Min(value = 1, message = "状态无效")
-    @Max(value = 2, message = "状态无效")
+    @Pattern(regexp = "^[0-2]$", message = "状态无效")
     private Integer state;
     @ApiModelProperty(position = 4, value = "会员价格包名称", example = "年卡")
     @Size(min = 1, max = 30, message = "会员价格包名称长度限制1-30位")

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java

 package com.liquidnet.service.adam.dto;
 
+import com.liquidnet.commons.lang.constant.LnsRegex;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
@@ -21,11 +23,11 @@ public class AdamThirdPartParam implements Serializable {
     @Size(max = 255, message = "已超出头像链接长度限制")
     private String avatar;
     @ApiModelProperty(position = 14, required = true, value = "平台类型[255]", allowableValues = "WEIBO,WECHAT,QQ")
-    //@Pattern(regexp = "\\b(WEIBO,WECHAT,QQ)\\b", message = "平台类型无效")
+    @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_ULGOIN, message = "平台类型无效")
     private String platform;
-    @ApiModelProperty(position = 15, required = false, value = "手机号[新账号时必传]", example = "13111111111")
+    @ApiModelProperty(position = 15, required = false, value = "手机号[新账号时必传]")
     private String mobile;
-    @ApiModelProperty(position = 16, required = false, value = "验证码[新账号时必传]", example = "111111")
+    @ApiModelProperty(position = 16, required = false, value = "验证码[新账号时必传]")
     private String code;
     @ApiModelProperty(position = 17, required = false, value = "强制绑定[第三方账号已绑定其他手机号时]", example = "false")
     private Boolean force;

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

+package com.liquidnet.service.dragon.dto;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: DragonPayAlipayAppReqDto
+ * @Package com.liquidnet.service.dragon.dto
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/9 11:00
+ */
+public class DragonPayAlipayAppReqDto {
+}

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

+package com.liquidnet.service.dragon.dto;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: DragonPayAlipayAppReqDto
+ * @Package com.liquidnet.service.dragon.dto
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/9 11:00
+ */
+public class DragonPayAlipayAppRespDto {
+}

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

+package com.liquidnet.service.dragon.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: DragonPayBaseReqDto
+ * @Package com.liquidnet.service.dragon.dto
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/9 10:56
+ */
+public class DragonPayBaseReqDto {
+    @ApiModelProperty(position = 14, required = true, value = "性别[32]", example = "{\"val\":\"MS00\",\"desc\":\"其他性别\"}")
+    @NotNull(message = "性别不能为空")
+    private String type;
+    private String price;
+    private String name;
+    private String detail;
+    private String orderCode;
+    private String clientIp;
+    private String notifyUrl;
+    private String code;
+    private String createDate;
+    private String expireTime;
+}

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

+package com.liquidnet.service.dragon.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: DragonPayBaseReqDto
+ * @Package com.liquidnet.service.dragon.dto
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/9 10:56
+ */
+@Data
+public class DragonPayBaseRespDto {
+    private String code;
+
+    private String order_code;
+
+    private Integer status;
+
+    private String order_id;
+
+    private String showUrl;
+
+    private String returnUrl;
+
+    private BigDecimal price;
+
+    private PayData pay_data;
+
+    public static class PayData{
+        @JsonProperty("appId")
+        private String appId;
+
+        @JsonProperty("nonceStr")
+        private String nonceStr;
+
+        @JsonProperty("timeStamp")
+        private String timeStamp;
+
+        @JsonProperty("package")
+        private String packages;
+
+        private String partnerId;
+
+        private String prepayId;
+
+        private String sign;
+
+        private String mwebUrl;
+
+        private String paySign;
+
+        private String signType;
+
+        private String redirectUrl;
+
+        private String orderStr;
+
+        public String getAppId() {
+            return appId;
+        }
+
+        public void setAppId(String appId) {
+            this.appId = appId;
+        }
+
+        public String getNonceStr() {
+            return nonceStr;
+        }
+
+        public void setNonceStr(String nonceStr) {
+            this.nonceStr = nonceStr;
+        }
+
+        public String getTimeStamp() {
+            return timeStamp;
+        }
+
+        public void setTimeStamp(String timeStamp) {
+            this.timeStamp = timeStamp;
+        }
+
+        public String getPackages() {
+            return packages;
+        }
+
+        public void setPackages(String packages) {
+            this.packages = packages;
+        }
+
+        public String getPartnerId() {
+            return partnerId;
+        }
+
+        public void setPartnerId(String partnerId) {
+            this.partnerId = partnerId;
+        }
+
+        public String getPrepayId() {
+            return prepayId;
+        }
+
+        public void setPrepayId(String prepayId) {
+            this.prepayId = prepayId;
+        }
+
+        public String getSign() {
+            return sign;
+        }
+
+        public void setSign(String sign) {
+            this.sign = sign;
+        }
+
+        public String getMwebUrl() {
+            return mwebUrl;
+        }
+
+        public void setMwebUrl(String mwebUrl) {
+            this.mwebUrl = mwebUrl;
+        }
+
+        public String getPaySign() {
+            return paySign;
+        }
+
+        public void setPaySign(String paySign) {
+            this.paySign = paySign;
+        }
+
+        public String getSignType() {
+            return signType;
+        }
+
+        public void setSignType(String signType) {
+            this.signType = signType;
+        }
+
+        public String getRedirectUrl() {
+            return redirectUrl;
+        }
+
+        public void setRedirectUrl(String redirectUrl) {
+            this.redirectUrl = redirectUrl;
+        }
+
+        public String getOrderStr() {
+            return orderStr;
+        }
+
+        public void setOrderStr(String orderStr) {
+            this.orderStr = orderStr;
+        }
+    }
+}

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsRegex.java

@@ -22,6 +22,11 @@ public class LnsRegex {
          * 汉字-省|市|区（2～30位）
          */
         public static final String CN_PCD = "^[\\u4e00-\\u9fa5]{2,30}$";
+
+
+        /* ======================================================================= | 证件类 */
+
+
         /**
          * 大陆居民身份证（15位||18位）
          */
@@ -58,5 +63,37 @@ public class LnsRegex {
          * 样本： 12345678 1234567890B
          */
         public static final String CN_ID_CARD_TW = "/^(?:\\d{8}|\\d{18}|\\d{10}[A-Z])$/";
+
+
+        /* ======================================================================= | 第三方平台类 */
+
+
+        /**
+         * 支持的第三方账号平台类型(用户中心:登录注册)
+         */
+        public static final String TRIPLE_PF_FOR_ULGOIN = "\\b(WEIBO|WECHAT|QQ)\\b";
+        /**
+         * 支持的支付终端
+         */
+        public static final String TRIPLE_PF_FOR_PAY_TERMINAL = "\\b(app|wap|js|applet)\\b";
+        /**
+         * 支持的支付方式
+         */
+        public static final String TRIPLE_PF_FOR_PAY = "\\b(alipay|wepay)\\b";
+
+
+        /* ======================================================================= |  */
+
+
+
+
+
+        /* ======================================================================= |  */
+
+
+
+
+
+        /* ======================================================================= |  */
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java

@@ -44,7 +44,7 @@ public class AdamCollectionController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[1,64]"),
     })
     @PostMapping("add")
-    public ResponseDto<Object> add(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
+    public ResponseDto<Object> add(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
                                    @RequestParam String type,
                                    @Size(min = 1, max = 64, message = "收藏内容ID长度限制1-64位")
                                    @RequestParam String contentId) {
@@ -70,7 +70,7 @@ public class AdamCollectionController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentIds", value = "内容ID[多个ID用','分隔]"),
     })
     @PostMapping("del")
-    public ResponseDto<Object> del(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
+    public ResponseDto<Object> del(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
                                    @RequestParam String type,
                                    @NotBlank(message = "内容ID不能为空") @RequestParam String contentIds) {
         adamCollectionService.del(CurrentUtil.getCurrentUid(), type, contentIds.split(","));
@@ -86,7 +86,7 @@ public class AdamCollectionController {
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
     })
     @PostMapping("list")
-    public ResponseDto<PageInfo<AdamCollectVo>> list(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
+    public ResponseDto<PageInfo<AdamCollectVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
                                                      @RequestParam String type,
                                                      @RequestParam(defaultValue = "1", required = false) int pageNo,
                                                      @RequestParam(defaultValue = "5", required = false) int pageSize) {
@@ -118,7 +118,7 @@ public class AdamCollectionController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
     })
     @GetMapping("state")
-    public ResponseDto<Boolean> state(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "收藏类型无效")
+    public ResponseDto<Boolean> state(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
                                       @RequestParam String type,
                                       @Size(min = 1, max = 64, message = "收藏内容ID长度限制1-64位")
                                       @RequestParam String contentId) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamDisposedController.java

@@ -45,7 +45,7 @@ public class AdamDisposedController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[1,64]"),
     })
     @PostMapping("add")
-    public ResponseDto<Object> add(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
+    public ResponseDto<Object> add(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
                                    @RequestParam String type,
                                    @Size(min = 1, max = 64, message = "内容ID长度限制1-64位")
                                    @RequestParam String contentId) {
@@ -72,7 +72,7 @@ public class AdamDisposedController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentIds", value = "内容ID[多个ID用','分隔]"),
     })
     @PostMapping("del")
-    public ResponseDto<Object> del(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
+    public ResponseDto<Object> del(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
                                    @RequestParam String type,
                                    @NotBlank(message = "内容ID不能为空") @RequestParam String contentIds) {
         adamDisposedService.del(CurrentUtil.getCurrentUid(), type, contentIds.split(","));
@@ -88,7 +88,7 @@ public class AdamDisposedController {
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
     })
     @PostMapping("list")
-    public ResponseDto<PageInfo<AdamDisposedVo>> list(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
+    public ResponseDto<PageInfo<AdamDisposedVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
                                                       @RequestParam String type,
                                                       @RequestParam(defaultValue = "1", required = false) int pageNo,
                                                       @RequestParam(defaultValue = "5", required = false) int pageSize) {
@@ -107,7 +107,7 @@ public class AdamDisposedController {
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "10"),
     })
     @PostMapping("list/user")
-    public ResponseDto<PageInfo<AdamDisposedUserVo>> listUser(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
+    public ResponseDto<PageInfo<AdamDisposedUserVo>> listUser(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
                                                               @RequestParam String type,
                                                               @Size(min = 1, max = 64, message = "内容ID长度限制1-64位")
                                                               @RequestParam String contentId,
@@ -126,7 +126,7 @@ public class AdamDisposedController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "contentId", value = "内容ID[64]"),
     })
     @GetMapping("state")
-    public ResponseDto<Boolean> state(//@Pattern(regexp = "\\b(TICKET,VIDEO)\\b", message = "想去类型无效")
+    public ResponseDto<Boolean> state(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
                                       @RequestParam String type,
                                       @Size(min = 1, max = 64, message = "内容ID长度限制1-64位")
                                       @RequestParam String contentId) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -275,7 +275,7 @@ public class AdamUserController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "platform", value = "平台类型", allowableValues = "WEIBO,WECHAT,QQ"),
     })
     @PostMapping(value = {"tpa/unbind/{platform}"})
-    public ResponseDto<List<AdamThirdPartInfoVo>> unbindTpa(//@Pattern(regexp = "\\b(WEIBO,WECHAT,QQ)\\b", message = "平台类型无效")
+    public ResponseDto<List<AdamThirdPartInfoVo>> unbindTpa(@Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_ULGOIN, message = "平台类型无效")
                                                             @PathVariable String platform) {
         String currentUid = CurrentUtil.getCurrentUid();
         log.debug("unbind tpa.platform:{},uid:{}", platform, currentUid);

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(? ,? ,? ,? ,? ,? ,? ,? ,?,?,?,?,?,?,?);
+
+# ------------------------创建退款订单日志----------------------------