下单完善

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinStatusConst.java

@@ -196,6 +196,10 @@ public class GoblinStatusConst {
         ORDER_REFUND_STATUS_2(2, "退款成功"),
         ORDER_REFUND_STATUS_3(3, "退款失败"),
 
+        ORDER_TYPE_1(1, "购买订单"),
+        ORDER_TYPE_2(2, "兑换订单"),
+        ORDER_TYPE_3(3, "演出赠送订单"),
+
         ;
 
         private final int value;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftOrderDetailsVo.java

@@ -84,13 +84,13 @@ public class GoblinNftOrderDetailsVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "红包code")
     private String redEnvelopeCode;
 
-    @ApiModelProperty(value = "订单状态 0-待付款(用户刚下单)|1-已付款|2-已取消(未付款取消订单)|3-已退款(超时支付)")
+    @ApiModelProperty(value = "订单状态 1待付款 2已付款 3未付款取消订单 4退款中 5已退款")
     private Integer status;
 
     @ApiModelProperty(value = "订单来源 app|h5|applet")
     private String source;
 
-    @ApiModelProperty(value = "订单类型 0-购买订单|1-兑换订单|2-演出赠送订单")
+    @ApiModelProperty(value = "订单类型 1购买订单 2兑换订单 3演出赠送订单")
     private Integer orderType;
 
     @ApiModelProperty(value = "支付时间")
@@ -99,10 +99,10 @@ public class GoblinNftOrderDetailsVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "支付单号")
     private String payCode;
 
-    @ApiModelProperty(value = "支付类型 wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付")
+    @ApiModelProperty(value = "支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联")
     private String payType;
 
-    @ApiModelProperty(value = "支付类型来源[wap|js]")
+    @ApiModelProperty(value = "支付终端 app wap js applet")
     private String deviceFrom;
 
     @ApiModelProperty(value = "支付中心返回实际支付类型")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftOrderVo.java

@@ -85,13 +85,13 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "红包code")
     private String redEnvelopeCode;
 
-    @ApiModelProperty(value = "订单状态 0-待付款(用户刚下单)|1-已付款|2-已取消(未付款取消订单)|3-已退款(超时支付)")
+    @ApiModelProperty(value = "订单状态 1待付款 2已付款 3未付款取消订单 4退款中 5已退款")
     private Integer status;
 
     @ApiModelProperty(value = "订单来源 app|h5|applet")
     private String source;
 
-    @ApiModelProperty(value = "订单类型 0-购买订单|1-兑换订单|2-演出赠送订单")
+    @ApiModelProperty(value = "订单类型 1购买订单 2兑换订单 3演出赠送订单")
     private Integer orderType;
 
     @ApiModelProperty(value = "支付时间")
@@ -100,10 +100,10 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "支付单号")
     private String payCode;
 
-    @ApiModelProperty(value = "支付类型 wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付")
+    @ApiModelProperty(value = "支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联")
     private String payType;
 
-    @ApiModelProperty(value = "支付类型来源[wap|js]")
+    @ApiModelProperty(value = "支付终端 app wap js applet")
     private String deviceFrom;
 
     @ApiModelProperty(value = "支付中心返回实际支付类型")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftPayResultVo.java

@@ -19,7 +19,7 @@ public class GoblinNftPayResultVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 15, value = "订单ID")
     private String orderId;
 
-    @ApiModelProperty(position = 11, value = "code")
+    @ApiModelProperty(position = 11, value = "code payCode")
     private String code;
 
     @ApiModelProperty(position = 12, value = "orderCode")

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

-package com.liquidnet.service.goblin.param;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * <p>
- * NFT下单所需商品相关参数
- * </p>
- *
- * @author jiangxiulong
- * @since 2022-03-24
- */
-@ApiModel(value = "GoblinNftOrderPayGoodsParam", description = "下单所需商品相关参数")
-@Data
-public class GoblinNftOrderPayGoodsParam {
-
-    @ApiModelProperty(position = 10, required = true, value = "商铺id")
-    @NotBlank(message = "storeId不能为空")
-    private String storeId;
-
-    @ApiModelProperty(position = 11, required = true, value = "spuId")
-    @NotBlank(message = "spuId不能为空")
-    private String spuId;
-
-    @ApiModelProperty(position = 12, required = true, value = "skuId")
-    @NotBlank(message = "skuId不能为空")
-    private String skuId;
-
-    @ApiModelProperty(position = 13, value = "平台券码")
-    private String platVoucherCode;
-
-    @ApiModelProperty(position = 14, value = "商品券码")
-    private String storeVoucherCode;
-}

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

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 
@@ -16,24 +15,31 @@ public class GoblinNftOrderPayParam {
     @ApiModelProperty(position = 10, value = "openId微信内网页及小程序支付必传")
     private String openId;
 
-    @ApiModelProperty(position = 11, required = true, value = "支付方式", allowableValues = "alipay,wepay,douyinpay,unionpay")
+    @ApiModelProperty(position = 11, required = true, value = "skuId")
+    @NotBlank(message = "skuId不能为空")
+    private String skuId;
+
+    @ApiModelProperty(position = 12, value = "平台券码")
+    private String platVoucherCode;
+
+    @ApiModelProperty(position = 13, value = "商品券码")
+    private String storeVoucherCode;
+
+    @ApiModelProperty(position = 14, required = true, value = "支付方式", allowableValues = "alipay,wepay,douyinpay,unionpay")
     @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY, message = "支付方式无效")
     @NotBlank(message = "支付方式不能为空")
     private String payType;
 
-    @ApiModelProperty(position = 12, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
+    @ApiModelProperty(position = 15, required = true, value = "支付终端", allowableValues = "app,wap,js,applet")
     @Pattern(regexp = LnsRegex.Valid.TRIPLE_PF_FOR_PAY_TERMINAL, message = "支付终端类型无效")
     @NotBlank(message = "支付终端不能为空")
     private String deviceFrom;
 
-    @ApiModelProperty(position = 13, value = "showUrl 之前h5需要 app不需要再说")
+    @ApiModelProperty(position = 16, value = "showUrl 之前h5需要 app不需要再说")
     private String showUrl;
 
-    @ApiModelProperty(position = 14, value = "returnUrl 之前h5需要 app不需要再说")
+    @ApiModelProperty(position = 17, value = "returnUrl 之前h5需要 app不需要再说")
     private String returnUrl;
 
-    @ApiModelProperty(position = 15, required = true, value = "下单所需商品相关参数")
-    @Valid
-    private GoblinNftOrderPayGoodsParam goblinNtfOrderPayGoodsParam;
 
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftOrder.java

@@ -126,7 +126,7 @@ public class GoblinNftOrder implements Serializable, Cloneable {
     private String redEnvelopeCode;
 
     /**
-     * 订单状态 0-待付款(用户刚下单)|1-已付款|2-已取消(未付款取消订单)|3-已退款(超时支付)
+     * 订单状态 1待付款 2已付款 3未付款取消订单 4退款中 5已退款
      */
     private Integer status;
 
@@ -136,7 +136,7 @@ public class GoblinNftOrder implements Serializable, Cloneable {
     private String source;
 
     /**
-     * 订单类型 0-购买订单|1-兑换订单|2-演出赠送订单
+     * 订单类型 1购买订单 2兑换订单 3演出赠送订单
      */
     private Integer orderType;
 
@@ -151,12 +151,12 @@ public class GoblinNftOrder implements Serializable, Cloneable {
     private String payCode;
 
     /**
-     * 支付类型 wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付
+     * 支付类型 wepay微信 alipay阿里 douyinpay抖音 unionpay银联
      */
     private String payType;
 
     /**
-     * 支付类型来源[wap|js]
+     * 支付终端 app wap js applet
      */
     private String deviceFrom;
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/mongo_db_ddl.sql

@@ -27,6 +27,7 @@ db.createCollection("GoblinOrderLogVo");
 db.createCollection("GoblinOrderSkuVo");
 db.createCollection("GoblinSelfMarketingVo");
 db.createCollection("GoblinStoreOrderVo");
+db.createCollection("GoblinNftOrderVo");
 
 
 // ================================================== 创建索引
@@ -71,6 +72,11 @@ db.GoblinStoreOrderVo.createIndex({orderId:"hashed"});
 db.GoblinStoreOrderVo.createIndex({storeId:"hashed"});
 db.GoblinStoreOrderVo.createIndex({status:"hashed"});
 db.GoblinStoreOrderVo.createIndex({orderCode:"hashed"});
+db.GoblinNftOrderVo.createIndex({orderId:"hashed"});
+db.GoblinNftOrderVo.createIndex({orderCode:"hashed"});
+db.GoblinNftOrderVo.createIndex({skuId:"hashed"});
+db.GoblinNftOrderVo.createIndex({userId:"hashed"});
+
 
 
 // ================================================== 创建分片
@@ -102,3 +108,4 @@ sh.shardCollection("test_ln_scene.GoblinOrderLogVo",{"orderId":"hashed"});
 sh.shardCollection("test_ln_scene.GoblinOrderSkuVo",{"orderSkuId":"hashed"});
 sh.shardCollection("test_ln_scene.GoblinStoreOrderVo",{"orderId":"hashed"});
 sh.shardCollection("test_ln_scene.GoblinSelfMarketingVo",{"selfMarketId":"hashed"});
+sh.shardCollection("test_ln_scene.GoblinNftOrderVo",{"orderId":"hashed"});