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

Skip to content

L
liquidnet-bus-v1
Commit b9fe421f authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改券

parent 3e0551e7
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 12 deletions
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinCouponImpl.java
View file @ b9fe421f
...@@ -542,13 +542,11 @@ public class GoblinCouponImpl implements GoblinCouponService { ...@@ -542,13 +542,11 @@ public class GoblinCouponImpl implements GoblinCouponService {
} }
returnVo.setCouType(vo.getType()); returnVo.setCouType(vo.getType());
} else if (vo.getType().equals("2")) {//折扣 } else if (vo.getType().equals("2")) {//折扣
BigDecimal tempPrice = contentPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal tempPrice = contentPrice.subtract(contentPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP));
if (tempPrice.compareTo(vo.getDeduction()) > 0) { if (tempPrice.compareTo(vo.getDeduction()) > 0) {
tempPrice = vo.getDeduction(); tempPrice = vo.getDeduction();
returnVo.setValue(tempPrice);
} else {
returnVo.setValue(contentPrice.subtract(tempPrice));
} }
returnVo.setValue(tempPrice);
returnVo.setCouType(vo.getType()); returnVo.setCouType(vo.getType());
} else if (vo.getType().equals("3")) {//满减 } else if (vo.getType().equals("3")) {//满减
if (vo.getValMinus().compareTo(contentPrice) > 0) { if (vo.getValMinus().compareTo(contentPrice) > 0) {
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinOrderUtils.java
View file @ b9fe421f
...@@ -259,13 +259,11 @@ public class GoblinOrderUtils { ...@@ -259,13 +259,11 @@ public class GoblinOrderUtils {
returnVo.setValue(vo.getValFace()); returnVo.setValue(vo.getValFace());
returnVo.setCouType(vo.getType()); returnVo.setCouType(vo.getType());
} else if (vo.getType().equals("2")) {//折扣 } else if (vo.getType().equals("2")) {//折扣
BigDecimal tempPrice = totalPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal tempPrice = totalPrice.subtract(totalPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP));
if (tempPrice.compareTo(vo.getDeduction()) > 0) { if (tempPrice.compareTo(vo.getDeduction()) > 0) {
tempPrice = vo.getDeduction(); tempPrice = vo.getDeduction();
returnVo.setValue(tempPrice);
} else {
returnVo.setValue(totalPrice.subtract(tempPrice));
} }
returnVo.setValue(tempPrice);
returnVo.setCouType(vo.getType()); returnVo.setCouType(vo.getType());
} else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) <= 0) {//满减 } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) <= 0) {//满减
returnVo.setValue(vo.getValMinus()); returnVo.setValue(vo.getValMinus());
...@@ -305,13 +303,11 @@ public class GoblinOrderUtils { ...@@ -305,13 +303,11 @@ public class GoblinOrderUtils {
} }
returnVo.setCouType(vo.getType()); returnVo.setCouType(vo.getType());
} else if (vo.getType().equals("2")) {//折扣 } else if (vo.getType().equals("2")) {//折扣
BigDecimal tempPrice = contentPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal tempPrice = contentPrice.subtract(contentPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP));
if (tempPrice.compareTo(vo.getDeduction()) > 0) { if (tempPrice.compareTo(vo.getDeduction()) > 0) {
tempPrice = vo.getDeduction(); tempPrice = vo.getDeduction();
returnVo.setValue(tempPrice);
} else {
returnVo.setValue(totalPrice.subtract(tempPrice));
} }
returnVo.setValue(tempPrice);
returnVo.setCouType(vo.getType()); returnVo.setCouType(vo.getType());
} else if (vo.getType().equals("3")) {//满减 } else if (vo.getType().equals("3")) {//满减
if (vo.getValMinus().compareTo(contentPrice) > 0) { if (vo.getValMinus().compareTo(contentPrice) > 0) {
......
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