去掉 会员价 去掉是否会员

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

@@ -174,7 +174,6 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
         this.setCancelReason(source.getCancelReason());
         this.setSource(source.getSource());
         this.setVersion(source.getVersion());
-        this.setIsMember(source.getIsMember());
         this.setOrderType(source.getOrderType());
         this.setPayCountdownMinute(source.getPayCountdownMinute());
         this.setIpAddress(source.getIpAddress());

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

@@ -111,9 +111,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         String orderId = IDGenerator.nextSnowId();
         String orderCode = IDGenerator.storeCode(orderId);
         BigDecimal totalPrice = skuVo.getPrice();
-        /*if (isVip) {// 会员价
-            totalPrice = skuVo.getPriceMember();
-        }*/
         /*if (!StringUtils.isEmpty(platVoucherCode)) {// 平台券
             GoblinUseResultVo useResultVo = nftOrderUtils.useCoupon(platVoucherCode, "购买NFT商品[" + orderCode + "]", totalPrice, spuId, uid);
             String typeVoucher = useResultVo.getCouType();
@@ -136,7 +133,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         }*/
 
         // 下单数据
-        GoblinNftOrder nftOrder = order(payParam, skuVo.getStoreId(), uid, spuId, number, orderId, orderCode, totalPrice, voucherPrice, storeVoucherPrice, isVip);
+        GoblinNftOrder nftOrder = order(payParam, skuVo.getStoreId(), uid, spuId, number, orderId, orderCode, totalPrice, voucherPrice, storeVoucherPrice);
 
         // 下单唤起支付
         GoblinNftPayResultVo nftPayResultVo = payOrder(nftOrder, uid, payParam);
@@ -146,8 +143,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,
-            boolean isVip
+            BigDecimal totalPrice, BigDecimal voucherPrice, BigDecimal storeVoucherPrice
     ) {
         LocalDateTime now = LocalDateTime.now();
 
@@ -186,7 +182,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         nftOrder.setDeviceFrom(payParam.getDeviceFrom());
         nftOrder.setSource(source);
         nftOrder.setVersion(version);
-        nftOrder.setIsMember(isVip ? 1 : 0);
         nftOrder.setOrderType(GoblinStatusConst.NftStatus.ORDER_TYPE_1.getValue());
         nftOrder.setPayCountdownMinute(5);
         nftOrder.setIpAddress(CurrentUtil.getCliIpAddr());
@@ -259,7 +254,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 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()
+                nftOrder.getSource(), nftOrder.getVersion(), nftOrder.getOrderType(), nftOrder.getPayCountdownMinute(), nftOrder.getIpAddress(), nftOrder.getCreatedAt()
         });
 
         // 订单vo

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

@@ -67,16 +67,6 @@ public class GoblinNftOrderUtils {
         long incr = redisUtil.incr(redisKey2, number);
     }
 
-    // 是否是会员
-    public boolean isVipMember(String uid) {
-        Integer member = goblinRedisUtils.getMember(uid);
-        if (null == member) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
     // 订单详情vo
     public void setNftOrder(GoblinNftOrderVo vo) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_ORDER_INFO.concat(vo.getOrderId());

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 (`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.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`,`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 (?,?,?,?,?,?,?,?,?,?,?)