增加藏品名称字段

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.entity.GoblinNftOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
  */
 @ApiModel(value = "GoblinNftOrderVo", description = "订单详情信息")
 @Data
-@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinNftOrderVo implements Serializable, Cloneable {
 
     private static final long serialVersionUID = -6916300673285309996L;
@@ -34,6 +34,9 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "款式id")
     private String skuId;
 
+    @ApiModelProperty(value = "款式名称")
+    private String skuTitle;
+
     @ApiModelProperty(value = "盲盒抽取的款式id")
     private String boxSkuId;
 
@@ -138,6 +141,7 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
         this.setOrderId(source.getOrderId());
         this.setSpuId(source.getSpuId());
         this.setSkuId(source.getSkuId());
+        this.setSkuTitle(source.getSkuTitle());
         this.setBoxSkuId(source.getBoxSkuId());
         this.setNum(source.getNum());
         this.setStoreId(source.getStoreId());

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

@@ -40,6 +40,11 @@ public class GoblinNftOrder implements Serializable, Cloneable {
      */
     private String skuId;
 
+    /**
+     * 款式名称
+     */
+    private String skuTitle;
+
     /**
      * 盲盒抽取的款式id
      */

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

@@ -184,6 +184,8 @@ CREATE TABLE goblin_nft_order
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT 'NFT订单表';
+alter table goblin_nft_order add sku_title varchar(255) default null comment '商品标题+副标题' after sku_id;
+
 # -- >>------------------------------------------------------------------------------------
 DROP TABLE IF EXISTS goblin_nft_order_refund;
 CREATE TABLE goblin_nft_order_refund

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

@@ -185,7 +185,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 }*/
 
                 // 下单数据
-                GoblinNftOrder nftOrder = order(payParam, skuVo.getStoreId(), uid, spuId, number, orderId, orderCode, totalPrice, voucherPrice, storeVoucherPrice, boxSkuId);
+                GoblinNftOrder nftOrder = order(payParam, skuVo.getStoreId(), uid, spuId, number, orderId, orderCode, totalPrice, voucherPrice, storeVoucherPrice, boxSkuId, skuVo.getName() + skuVo.getSubtitle());
                 if (null == nftOrder) {
                     nftOrderUtils.backSkuCountAndStock(uid, stockSkuId, skuId, number);
                     return ResponseDto.failure("下单失败～");
@@ -303,7 +303,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
     private GoblinNftOrder order(
             GoblinNftOrderPayParam payParam, String storeId, String uid, String spuId, int number,
             String orderId, String orderCode,
-            BigDecimal totalPrice, BigDecimal voucherPrice, BigDecimal storeVoucherPrice, String boxSkuId
+            BigDecimal totalPrice, BigDecimal voucherPrice, BigDecimal storeVoucherPrice, String boxSkuId, String skuTitle
     ) {
         try {
             LocalDateTime now = LocalDateTime.now();
@@ -321,6 +321,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
             nftOrder.setOrderId(orderId);
             nftOrder.setSpuId(spuId);
             nftOrder.setSkuId(payParam.getSkuId());
+            nftOrder.setSkuTitle(skuTitle);
             nftOrder.setBoxSkuId(boxSkuId);
             nftOrder.setNum(number);
             nftOrder.setStoreId(storeId);
@@ -437,7 +438,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                     nftOrder.getOrderId(), nftOrder.getSpuId(), nftOrder.getSkuId(), nftOrder.getBoxSkuId(),
                     nftOrder.getNum(), nftOrder.getStoreId(), nftOrder.getStoreName(), nftOrder.getOrderCode(), nftOrder.getUserId(), nftOrder.getUserName(), nftOrder.getUserMobile(), nftOrder.getPriceTotal(), nftOrder.getPriceCoupon(),
                     nftOrder.getStorePriceCoupon(), nftOrder.getPriceRedEnvelope(), nftOrder.getPriceVoucher(), nftOrder.getPriceActual(), nftOrder.getUcouponId(), nftOrder.getStoreCouponId(), nftOrder.getRedEnvelopeCode(), nftOrder.getStatus(), nftOrder.getSource(),
-                    nftOrder.getOrderType(), nftOrder.getPayType(), nftOrder.getDeviceFrom(), nftOrder.getVersion(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt(), nftOrder.getPayCode()
+                    nftOrder.getOrderType(), nftOrder.getPayType(), nftOrder.getDeviceFrom(), nftOrder.getVersion(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt(), nftOrder.getPayCode(),
+                    nftOrder.getSkuTitle()
             });
 
             // 订单vo

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

@@ -47,7 +47,7 @@ goblin_order.store.refundLog=INSERT INTO goblin_back_order_log (`back_order_log_
 goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`status`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 #-------- NFT -------
-goblin_nft_order.insert=INSERT INTO goblin_nft_order (`order_id`,`spu_id`,`sku_id`,`box_sku_id`,`num`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_coupon`,`store_price_coupon`,`price_red_envelope`,`price_voucher`,`price_actual`,`ucoupon_id`,`store_coupon_id`,`red_envelope_code`,`status`,`source`,`order_type`,`pay_type`,`device_from`,`version`,`pay_countdown_minute`,`ip_address`,`created_at`,`pay_code`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_nft_order.insert=INSERT INTO goblin_nft_order (`order_id`,`spu_id`,`sku_id`,`box_sku_id`,`num`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_coupon`,`store_price_coupon`,`price_red_envelope`,`price_voucher`,`price_actual`,`ucoupon_id`,`store_coupon_id`,`red_envelope_code`,`status`,`source`,`order_type`,`pay_type`,`device_from`,`version`,`pay_countdown_minute`,`ip_address`,`created_at`,`pay_code`,sku_title) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_nft_order.update.pay=UPDATE goblin_nft_order SET payment_type = ?, payment_id=?, pay_code = ?, pay_time = ?, status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_nft_order.update.refund=UPDATE goblin_nft_order SET status = ?, updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_nft_order_refund.insert=INSERT INTO goblin_nft_order_refund (`order_refund_id`,`refund_code`,`order_id`,`order_code`,`store_id`,`user_id`,`price`,`status`,`error_reason`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?)