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

Commit 37a79091 authored by 胡佳晨's avatar 胡佳晨

提交平台券

parent dfd7ee1a
...@@ -161,8 +161,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -161,8 +161,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
if (noZhengzaiOrder(uid)) { if (noZhengzaiOrder(uid)) {
redisUtils.decrSkuCountByUid(uid, skuId, number); redisUtils.decrSkuCountByUid(uid, skuId, number);
} }
log.error("回滚库存 skuId:{}",skuId);
} }
log.error("回滚库存");
if (e.getMessage() == null) { if (e.getMessage() == null) {
return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
} else if (e.getMessage().equals("券不可用")) { } else if (e.getMessage().equals("券不可用")) {
...@@ -258,7 +258,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -258,7 +258,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
for (GoblinOrderSkuParam item:storeParam.getGoblinOrderSkuParamArrayList()){ for (GoblinOrderSkuParam item:storeParam.getGoblinOrderSkuParamArrayList()){
spuIds=spuIds.concat(item.getSpuId()); spuIds=spuIds.concat(item.getSpuId());
} }
HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds);//todo HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds);
voucherPrice = (BigDecimal) hashMap.get("voucher"); voucherPrice = (BigDecimal) hashMap.get("voucher");
Integer typeVoucher = (Integer) hashMap.get("type"); Integer typeVoucher = (Integer) hashMap.get("type");
if (typeVoucher.equals(-1)) { if (typeVoucher.equals(-1)) {
......
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