From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index 3ab0282..75a7ffd 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -221,9 +221,10 @@
return ResultUtil.error("优惠券已过期");
}
if(coupon.getType() == 1){//满减
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
- Double num2 = jsonObject.getDouble("num2");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ Double num2 = jsonObject.getDouble("deductionAmount");
if(payMoney.compareTo(num1) <= 0){
return ResultUtil.error("该优惠券无法使用");
}
@@ -232,7 +233,7 @@
}
if(coupon.getType() == 2){//代金券
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
if(payMoney.compareTo(num1) <= 0){
return ResultUtil.error("该优惠券无法使用");
}
@@ -277,11 +278,7 @@
return ResultUtil.success();
}
- public static void main(String[] args) {
- String a ="2023-07-28 10:30-15:30";
- String substring = a.substring(0,a.lastIndexOf("-"));
- System.out.println(substring);
- }
+
/**
* 课程微信支付
* @param paymentPrice
@@ -549,14 +546,15 @@
UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId()));
Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId());
if(coupon.getType() == 1){//满减
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
- Double num2 = jsonObject.getDouble("num2");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ Double num2 = jsonObject.getDouble("deductionAmount");
payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}
if(coupon.getType() == 2){//代金券
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}
userCoupon.setStatus(2);
@@ -614,14 +612,15 @@
UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId()));
Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId());
if(coupon.getType() == 1){//满减
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
- Double num2 = jsonObject.getDouble("num2");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ Double num2 = jsonObject.getDouble("deductionAmount");
payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}
if(coupon.getType() == 2){//代金券
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
- Double num1 = jsonObject.getDouble("num1");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}
}
--
Gitblit v1.7.1