记得上下班打卡 | git大法好,push需谨慎

Commit f414c93b authored by jiangxiulong's avatar jiangxiulong

Merge remote-tracking branch 'origin/jxl_220622_nft_buy' into pre

parents 2efcd1bf 1513ee9c
...@@ -132,7 +132,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -132,7 +132,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
return ResponseDto.failure("您已超出限购数量~"); return ResponseDto.failure("您已超出限购数量~");
} }
} }
// 权限限购 // 权限限购 分批购不用这个规则
if (null == listId) {
boolean isVip = nftOrderUtils.isVipMember(uid); boolean isVip = nftOrderUtils.isVipMember(uid);
String buyFactor = skuVo.getBuyFactor(); String buyFactor = skuVo.getBuyFactor();
if (null == buyFactor) { if (null == buyFactor) {
...@@ -142,6 +143,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -142,6 +143,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
if (!isAuthBuy) { if (!isAuthBuy) {
return ResponseDto.failure("该商品仅限特定用户购买~"); return ResponseDto.failure("该商品仅限特定用户购买~");
} }
}
// 判断优惠券不能一起使用 // 判断优惠券不能一起使用
/*String platVoucherCode = payParam.getPlatVoucherCode(); /*String platVoucherCode = payParam.getPlatVoucherCode();
String storeVoucherCode = payParam.getStoreVoucherCode(); String storeVoucherCode = payParam.getStoreVoucherCode();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment