xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!250 Leung

Browse Source 
Merge pull request !250 from Admin/LTL_20220314
This commit is contained in:
Admin 2022-03-21 11:11:15 +00:00 committed by Gitee
commit 47982a5126
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -437,7 +437,7 @@ public class OrderService {
orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson"); orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson");
//得到当前能用优惠券的商品总金额 //得到当前能用优惠券的商品总金额
BigDecimal total_Coupon = (BigDecimal) resultMap.get("total_Coupon"); BigDecimal total_Coupon = (BigDecimal) resultMap.get("total_Coupon");
BigDecimal minCount = (BigDecimal) resultMap.get("minCount"); int minCount = (int) resultMap.get("minCount");
//校验当前订单金额小于优惠券金额 //校验当前订单金额小于优惠券金额
if(jsonObjectData.getString("couponAmount") != null ){ if(jsonObjectData.getString("couponAmount") != null ){
@ -449,7 +449,8 @@ public class OrderService {
//校验当前指定商品的总数量有没有大于等于minCount //校验当前指定商品的总数量有没有大于等于minCount
if(jsonObjectData.getString("minCount") != null ){ if(jsonObjectData.getString("minCount") != null ){
if(minCount.compareTo(new BigDecimal(jsonObjectData.getString("minCount"))) == -1){ int count = Integer.parseInt(jsonObjectData.getString("minCount"));
if(minCount < count ){
return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL); return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
} }
} }
@ -563,7 +564,7 @@ public class OrderService {
orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson"); orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson");
//得到当前能用优惠券的商品总金额 //得到当前能用优惠券的商品总金额
BigDecimal total_Coupon = (BigDecimal) resultMap.get("total_Coupon"); BigDecimal total_Coupon = (BigDecimal) resultMap.get("total_Coupon");
BigDecimal minCount = (BigDecimal) resultMap.get("minCount"); int minCount = (int) resultMap.get("minCount");
//校验当前订单金额小于优惠券金额 //校验当前订单金额小于优惠券金额
if(jsonObjectData.getString("couponAmount") != null ){ if(jsonObjectData.getString("couponAmount") != null ){
@ -574,7 +575,8 @@ public class OrderService {
} }
//校验当前指定商品的总数量有没有大于等于minCount //校验当前指定商品的总数量有没有大于等于minCount
if(jsonObjectData.getString("minCount") != null ){ if(jsonObjectData.getString("minCount") != null ){
if(minCount.compareTo(new BigDecimal(jsonObjectData.getString("minCount"))) == -1){ int count = Integer.parseInt(jsonObjectData.getString("minCount"));
if(minCount < count ){
return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL); return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
} }
} }