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

解决未到生效时间优惠券显示的问题

Browse Source
This commit is contained in:
602090531@qq.com 2022-03-21 16:11:23 +08:00
parent cf44fb3cb2
commit 30fdd63443
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -471,6 +471,7 @@ public class OrderService {
}else{//没有优惠券的计算总价逻辑 }else{//没有优惠券的计算总价逻辑
Map<String, Object> resultMap = addOrdersEntityInfo(ordersEntityList, ordersEntity, couponJson, total_fee); Map<String, Object> resultMap = addOrdersEntityInfo(ordersEntityList, ordersEntity, couponJson, total_fee);
total_fee = new BigDecimal(ordersEntity.getOrderAmount()); total_fee = new BigDecimal(ordersEntity.getOrderAmount());
orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson");
} }
ordersEntity.setMemberId(memberId); ordersEntity.setMemberId(memberId);
@ -581,6 +582,7 @@ public class OrderService {
}else{//没有优惠券的计算总价逻辑 }else{//没有优惠券的计算总价逻辑
Map<String, Object> resultMap = addOrdersEntityInfo(ordersEntityList, ordersEntity, couponJson, total_fee); Map<String, Object> resultMap = addOrdersEntityInfo(ordersEntityList, ordersEntity, couponJson, total_fee);
total_fee = new BigDecimal(ordersEntity.getOrderAmount()); total_fee = new BigDecimal(ordersEntity.getOrderAmount());
orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson");
} }
ordersEntity.setMemberId(memberId); ordersEntity.setMemberId(memberId);
@ -631,7 +633,6 @@ public class OrderService {
productCodes = couponJson.getString("productCodes").toString().split(","); productCodes = couponJson.getString("productCodes").toString().split(",");
} }
for (OrdersEntity order : ordersEntityList) { for (OrdersEntity order : ordersEntityList) {
//从crm获取商品的json数据信息 //从crm获取商品的json数据信息
JSONObject goodsObject = gainGoodsObject(order); JSONObject goodsObject = gainGoodsObject(order);