Merge branch 'jxl-datongfensi' into container-test

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

@@ -47,8 +47,10 @@ public class DragonConstant {
     }
 
     public enum DeviceFromEnum{
-        WEB("web",""),WAP("wap",""),WAPPAGE("wappage","")
-        ,APP("app",""),JS("js",""),APPLET("applet",""),APPLETB("appletb",""),APPLET_DOUDOU("appletdoudou",""),APPLET_MOOTOO("appletmootoo",""),APPLET_WENQUE("appletwenque",""),MICROPAY("micropay","");
+        WEB("web","PC网页"),WAP("wap","手机网页"),WAPPAGE("wappage","WAP页")
+        ,APP("app","App"),JS("js","微信内网页"),APPLET("applet","正在现场小程序"),APPLETB("appletb","摩登小程序")
+        ,APPLET_DOUDOU("appletdoudou","DouDou小程序"),APPLET_MOOTOO("appletmootoo","mootoo小程序")
+        ,APPLET_WENQUE("appletwenque","wenque小程序"),MICROPAY("micropay","付款码/扫码枪");
         private String code;
         private String message;
         DeviceFromEnum(String code, String message) {

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

+package com.liquidnet.service.dragon.doc;
+
+/**
+ * 支付相关 Swagger 文案（与 {@link com.liquidnet.service.dragon.support.WepayAppletPaySupport} 业务逻辑分离）。
+ */
+public final class DragonPaySwaggerDoc {
+
+    public static final String DEVICE_FROM_VALUE =
+            "支付终端。微信小程序微信支付：applet=正在现场，appletb=摩登，appletdoudou=DouDou，appletmootoo=mootoo，appletwenque=wenque；"
+                    + "须配合 payType=wepay 并传当前小程序 openId（sweet maOpenId type 分别为 4/7/8/9/10）。"
+                    + "其他：app、wap、js、web、wappage；micropay=付款码/扫码枪（payType 传 wepay 或 alipay，须 authCode，非银联）。"
+                    + "银联云闪付用 payType=unionpay，deviceFrom 一般为 app 或 wap，与 micropay 无关。";
+    public static final String DEVICE_FROM_ALLOWABLE =
+            "applet,appletb,appletdoudou,appletmootoo,appletwenque,app,wap,js,web,wappage,micropay";
+    public static final String PAY_TYPE_VALUE = "支付方式：wepay、alipay、douyinpay、unionpay、applepay 等";
+    public static final String PAY_TYPE_ALLOWABLE = "wepay,alipay,douyinpay,unionpay,applepay";
+    public static final String OPEN_ID_VALUE =
+            "微信 JSAPI/小程序支付必填，须为当前 deviceFrom 对应小程序的 openId";
+
+    private DragonPaySwaggerDoc() {
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinOrderParam.java

 package com.liquidnet.service.goblin.dto.manage;
 
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +10,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-@ApiModel(value = "GoblinOrderParam")
+@ApiModel(value = "GoblinOrderParam", description = "POST /goblin/pre 商城下单。微信小程序微信支付见 deviceFrom 与 openId 说明。")
 @Data
 public class GoblinOrderParam {
 
@@ -17,13 +18,13 @@ public class GoblinOrderParam {
     private ArrayList<String> addressIds;
     @ApiModelProperty(value = "代理id")
     private String agentId;
-    @ApiModelProperty(value = "支付类型")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     @NotNull(message = "支付类型不能为空")
     private String payType;
-    @ApiModelProperty(value = "支付来源 [新增micropay-微信扫码支付]")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
-    @ApiModelProperty(value = "openId")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
     @ApiModelProperty(value = "showUrl")
     private String showUrl;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/MixOrderParam.java

 package com.liquidnet.service.goblin.dto.manage;
 
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,13 +18,13 @@ public class MixOrderParam {
     private String mixId;
     @ApiModelProperty(value = "入场人地址vo")
     private AddressVo addressesVo;
-    @ApiModelProperty(value = "支付类型")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     @NotNull(message = "支付类型不能为空")
     private String payType;
-    @ApiModelProperty(value = "支付来源 [新增micropay-微信扫码支付]")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
-    @ApiModelProperty(value = "openId")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
     @ApiModelProperty(value = "showUrl")
     private String showUrl;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftOrderPayAgainParam.java

 package com.liquidnet.service.goblin.param;
 
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,18 +11,18 @@ import javax.validation.constraints.NotNull;
 @Data
 public class GoblinNftOrderPayAgainParam {
 
-    @ApiModelProperty(value = "openId")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
 
     @ApiModelProperty(value = "订单id")
     @NotNull(message = "订单ID不能为空")
     private String orderId;
 
-    @ApiModelProperty(value = "支付类型")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     @NotNull(message = "支付类型不能为空")
     private String payType;
 
-    @ApiModelProperty(value = "支付来源")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftOrderPayParam.java

 package com.liquidnet.service.goblin.param;
 
 import com.liquidnet.commons.lang.constant.LnsRegex;
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,7 +13,7 @@ import javax.validation.constraints.Pattern;
 @Data
 public class GoblinNftOrderPayParam {
 
-    @ApiModelProperty(position = 10, value = "openId微信内网页及小程序支付必传")
+    @ApiModelProperty(position = 10, value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
 
     @ApiModelProperty(position = 11, required = true, value = "skuId")
@@ -25,12 +26,12 @@ public class GoblinNftOrderPayParam {
     @ApiModelProperty(position = 13, value = "商品券码")
     private String storeVoucherCode;*/
 
-    @ApiModelProperty(position = 14, required = true, value = "支付方式", allowableValues = "alipay,wepay,douyinpay,unionpay,applepay")
+    @ApiModelProperty(position = 14, required = true, value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效")
     @NotBlank(message = "支付方式不能为空")
     private String payType;
 
-    @ApiModelProperty(position = 15, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
+    @ApiModelProperty(position = 15, required = true, value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效")
     @NotBlank(message = "支付终端不能为空")
     private String deviceFrom;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinOrderPreParam.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.goblin.dto.manage.GoblinOrderSkuParam;
 import com.liquidnet.service.goblin.entity.GoblinOrderAttr;
 import com.liquidnet.service.goblin.entity.GoblinOrderSku;
 import com.liquidnet.service.goblin.entity.GoblinStoreOrder;
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,12 +36,13 @@ public class GoblinOrderPreParam implements Cloneable{
     @ApiModelProperty(required = true, value = "订单过期时间")
     private int expireTime;
 
+    @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     private String deviceFrom;
     private String authCode;
 
-    @ApiModelProperty(required = true, value = "支付方式[pos_crash-现金支付|]")
-
+    @ApiModelProperty(required = true, value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     private String payType;
+    @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
     private String returnUrl;
     private String showUrl;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/PayAgainParam.java

 package com.liquidnet.service.goblin.param;
 
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,13 +11,13 @@ public class PayAgainParam {
     @ApiModelProperty(value = "订单id")
     @NotNull(message = "订单ID不能为空")
     private String orderId;
-    @ApiModelProperty(value = "支付类型")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     @NotNull(message = "支付类型不能为空")
     private String payType;
-    @ApiModelProperty(value = "支付来源")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
-    @ApiModelProperty(value = "openId")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
     @ApiModelProperty(value = "showUrl")
     private String showUrl;

liquidnet-bus-api/liquidnet-service-kylin-api/pom.xml

@@ -17,6 +17,11 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-dragon-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 </project>

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayAgainParam.java

 package com.liquidnet.service.kylin.dto.param;
 
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,13 +11,13 @@ public class PayAgainParam {
     @ApiModelProperty(value = "订单id")
     @NotNull(message = "订单ID不能为空")
     private String orderId;
-    @ApiModelProperty(value = "支付类型")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     @NotNull(message = "支付类型不能为空")
     private String payType;
-    @ApiModelProperty(value = "支付来源")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
-    @ApiModelProperty(value = "openId")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
     @ApiModelProperty(value = "showUrl")
     private String showUrl;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java

 package com.liquidnet.service.kylin.dto.param;
 
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
@@ -10,7 +11,7 @@ import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
-@Api
+@Api(tags = "演出下单", description = "POST /order/pre。微信小程序微信支付见 deviceFrom 与 openId 说明。")
 @Data
 public class PayOrderParam {
     @ApiModelProperty(value = "演出id")
@@ -40,13 +41,13 @@ public class PayOrderParam {
     @ApiModelProperty(value = "快递类型[0无类型|1寄付|2到付|3包邮]")
     @NotNull(message = "快递方式不能为空")
     private Integer expressType;
-    @ApiModelProperty(value = "支付类型")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay")
     @NotNull(message = "支付类型不能为空")
     private String payType;
-    @ApiModelProperty(value = "支付来源")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet")
     @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
-    @ApiModelProperty(value = "openId")
+    @ApiModelProperty(value = DragonPaySwaggerDoc.OPEN_ID_VALUE)
     private String openId;
     @ApiModelProperty(value = "showUrl")
     private String showUrl;

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

@@ -123,7 +123,8 @@ public class LnsRegex {
         /**
          * 支持的支付终端
          */
-        public static final String TRIPLE_PF_FOR_PAY_TERMINAL = "\\b(app|wap|js|applet)\\b";
+        public static final String TRIPLE_PF_FOR_PAY_TERMINAL =
+                "\\b(app|wap|js|applet|appletb|appletdoudou|appletmootoo|appletwenque|web|wappage|micropay)\\b";
         /**
          * 支持的支付方式
          */

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

@@ -5,6 +5,7 @@ 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.IDragonOrdersService;
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import com.liquidnet.service.dragon.support.WepayAppletPaySupport;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -44,8 +45,8 @@ public class PayController {
     @ApiOperation("Dragon支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = "支付类型:alipay,wepay,unionpay,applepay", example = "unionpay"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = "设备来源:web,wap,app,js,apple,micropay", example = "wap"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = DragonPaySwaggerDoc.PAY_TYPE_VALUE, allowableValues = DragonPaySwaggerDoc.PAY_TYPE_ALLOWABLE, example = "wepay"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet"),
             @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"),

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

@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.StringUtil;
 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.doc.DragonPaySwaggerDoc;
 import com.liquidnet.service.dragon.service.IDragonOrdersService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -52,7 +53,7 @@ public class PayNotifyController {
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payType", value = "支付类型:alipay,wepay,unionpay,applepay", example = "unionpay"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = "设备来源:web,wap,app,js,apple,micropay,inner", example = "wap"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "deviceFrom", value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE, example = "applet"),
             @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"),

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/GoblinNftOrderController.java

@@ -9,6 +9,7 @@ import com.liquidnet.service.goblin.param.GoblinNftOrderPayAgainParam;
 import com.liquidnet.service.goblin.param.GoblinNftOrderPayCallbackParam;
 import com.liquidnet.service.goblin.param.GoblinNftOrderPayParam;
 import com.liquidnet.service.goblin.param.GoblinNftOrderRefundCallbackParam;
+import com.liquidnet.service.dragon.doc.DragonPaySwaggerDoc;
 import com.liquidnet.service.goblin.service.IGoblinNftOrderService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,7 +88,7 @@ public class GoblinNftOrderController {
     @ApiOperation("兑换")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "from", required = true, dataType = "String", name = "code", value = "兑换码", example = "1"),
-            @ApiImplicitParam(type = "from", required = true, dataType = "String", name = "deviceFrom", value = "支付终端", example = "app", allowableValues = "app,wap,js,applet"),
+            @ApiImplicitParam(type = "from", required = true, dataType = "String", name = "deviceFrom", value = DragonPaySwaggerDoc.DEVICE_FROM_VALUE, example = "applet", allowableValues = DragonPaySwaggerDoc.DEVICE_FROM_ALLOWABLE),
     })
     public ResponseDto<Boolean> exchange(
             @RequestParam("code") @NotBlank(message = "兑换码不能为空") String code,