下单完善

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

@@ -150,6 +150,9 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
 
     public GoblinNftOrderVo copy(GoblinNftOrder source) {
         if (null == source) return this;
+        this.setSpuId(source.getSpuId());
+        this.setSkuId(source.getSkuId());
+        this.setNum(source.getNum());
         this.setOrderId(source.getOrderId());
         this.setStoreId(source.getStoreId());
         this.setStoreName(source.getStoreName());

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

@@ -136,7 +136,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         }
 
         // 下单数据
-        GoblinNftOrder nftOrder = order(payParam, skuVo.getStoreId(), uid, orderId, orderCode, totalPrice, voucherPrice, storeVoucherPrice, isVip);
+        GoblinNftOrder nftOrder = order(payParam, skuVo.getStoreId(), uid, spuId, number, orderId, orderCode, totalPrice, voucherPrice, storeVoucherPrice, isVip);
 
         // 下单唤起支付
         GoblinNftPayResultVo nftPayResultVo = payOrder(nftOrder, uid, payParam);
@@ -144,7 +144,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
     }
 
     private GoblinNftOrder order(
-            GoblinNftOrderPayParam payParam, String storeId, String uid,
+            GoblinNftOrderPayParam payParam, String storeId, String uid, String spuId, int number,
             String orderId, String orderCode,
             BigDecimal totalPrice, BigDecimal voucherPrice, BigDecimal storeVoucherPrice,
             boolean isVip
@@ -165,6 +165,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         nftOrder.setOrderCode(orderCode);
         nftOrder.setStoreId(storeId);
         nftOrder.setSkuId(payParam.getSkuId());
+        nftOrder.setSpuId(spuId);
+        nftOrder.setNum(number);
         nftOrder.setStoreName(storeName);
         nftOrder.setUserId(uid);
         nftOrder.setUserName(StringUtils.defaultString(((String) token.get(CurrentUtil.TOKEN_NICKNAME)), ""));
@@ -251,6 +253,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
 
         nftOrder.setPayCode(payCode);
         sqlDataOrder.add(new Object[]{
+                nftOrder.getSpuId(), nftOrder.getSkuId(), nftOrder.getNum(),
                 nftOrder.getOrderId(), nftOrder.getStoreId(), nftOrder.getStoreName(), nftOrder.getOrderCode(), nftOrder.getUserId(), nftOrder.getUserName(), nftOrder.getUserMobile(), nftOrder.getPriceTotal(), nftOrder.getPayCode(),
                 nftOrder.getPriceActual(), nftOrder.getPriceCoupon(), nftOrder.getStorePriceCoupon(), nftOrder.getPriceVoucher(), nftOrder.getStatus(), nftOrder.getUcouponId(), nftOrder.getStoreCouponId(), nftOrder.getPayType(), nftOrder.getDeviceFrom(),
                 nftOrder.getSource(), nftOrder.getVersion(), nftOrder.getIsMember(), nftOrder.getOrderType(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt()

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`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`pay_code`,`price_actual`,`price_coupon`,`store_price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`store_coupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`pay_countdown_minute`,`ip_address`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_nft_order.insert=INSERT INTO goblin_nft_order (`spu_id`,`sku_id`,`num`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`pay_code`,`price_actual`,`price_coupon`,`store_price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`store_coupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`pay_countdown_minute`,`ip_address`,`created_at`) 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`,`sku_id_nums`,`real_back_price`,`status`,`refund_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?)