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

Commit dfd7ee1a authored by 胡佳晨's avatar 胡佳晨

提交平台券

parent 6b7486cf
...@@ -73,6 +73,12 @@ liquidnet: ...@@ -73,6 +73,12 @@ liquidnet:
host: 39.107.71.112 host: 39.107.71.112
port: 6379 port: 6379
password: 3Xa%8p password: 3Xa%8p
# goblin:
# dbs: 0,256
# database: 255
# host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
# port: 6380
# password: PO@B!Iud32
mongodb: mongodb:
host: 39.107.71.112:27017 host: 39.107.71.112:27017
port: 27017 port: 27017
......
...@@ -254,7 +254,11 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -254,7 +254,11 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
//优惠券 //优惠券
BigDecimal voucherPrice = BigDecimal.ZERO; BigDecimal voucherPrice = BigDecimal.ZERO;
if (platVoucherCode != null && !platVoucherCode.equals("")) { if (platVoucherCode != null && !platVoucherCode.equals("")) {
HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, "");//todo String spuIds = "";
for (GoblinOrderSkuParam item:storeParam.getGoblinOrderSkuParamArrayList()){
spuIds=spuIds.concat(item.getSpuId());
}
HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds);//todo
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