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

Commit 616060e4 authored by jiangxiulong's avatar jiangxiulong

title

parent 8b5eccc8
...@@ -311,7 +311,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -311,7 +311,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
GoblinNftOrderPayParam payParam, String storeId, String uid, String spuId, int number, GoblinNftOrderPayParam payParam, String storeId, String uid, String spuId, int number,
String orderId, String orderCode, String orderId, String orderCode,
BigDecimal totalPrice, BigDecimal voucherPrice, BigDecimal storeVoucherPrice, String boxSkuId, String skuTitle BigDecimal totalPrice, BigDecimal voucherPrice, BigDecimal storeVoucherPrice, String boxSkuId, String skuTitle
int orderType ,int orderType
) { ) {
try { try {
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
...@@ -818,7 +818,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService { ...@@ -818,7 +818,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
String orderCode = IDGenerator.storeCode(orderId); String orderCode = IDGenerator.storeCode(orderId);
BigDecimal totalPrice = BigDecimal.ZERO; BigDecimal totalPrice = BigDecimal.ZERO;
String boxSkuId = goblinNftExCodeVo.getBoxSkuId(); String boxSkuId = goblinNftExCodeVo.getBoxSkuId();
GoblinNftOrder nftOrder = order(payParam, goblinNftExCodeVo.getStoreId(), uid, goblinNftExCodeVo.getSpuId(), 1, orderId, orderCode, totalPrice, totalPrice, totalPrice, null == boxSkuId ? "" : boxSkuId, orderType); GoblinGoodsSkuInfoVo skuVo = goblinRedisUtils.getGoodsSkuInfoVo(goblinNftExCodeVo.getSkuId());
GoblinNftOrder nftOrder = order(payParam, goblinNftExCodeVo.getStoreId(), uid, goblinNftExCodeVo.getSpuId(), 1, orderId, orderCode, totalPrice, totalPrice, totalPrice, null == boxSkuId ? "" : boxSkuId, skuVo.getName() + " " + skuVo.getSubtitle(), orderType);
if (null == nftOrder) { if (null == nftOrder) {
return ResponseDto.failure("兑换失败~"); return ResponseDto.failure("兑换失败~");
} }
......
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