autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-05 02:20:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-02-19 10:36:02 +08:00
parent d5222812ed
commit 8388a81a93
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
View File

@@ -374,7 +374,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
OrderDetail orderDetail = returnUpdateOrderDetail(orderBasicInfo, data);
// 计算订单折扣 calculateOrderDiscounts
// calculateOrderDiscounts(orderBasicInfo, orderDetail);
// calculateOrderDiscountsV2(orderBasicInfo, orderDetail);
calculateOrderDiscountsV2(orderBasicInfo, orderDetail);
// 更新数据库
OrderTransactionDTO dto = new OrderTransactionDTO();

2
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -389,7 +389,7 @@
t6.apply_time AS valleyApplyDate
FROM
pile_basic_info t1
JOIN pile_billing_template t2 ON t1.station_id = t2.station_id and t2.status = '1'
JOIN pile_billing_template t2 ON t1.station_id = t2.station_id and t2.status = '1' and t2.member_flag = '0'
JOIN pile_billing_detail t3 ON t3.template_code = t2.template_code AND t3.time_type = '1'
JOIN pile_billing_detail t4 ON t4.template_code = t2.template_code AND t4.time_type = '2'
JOIN pile_billing_detail t5 ON t5.template_code = t2.template_code AND t5.time_type = '3'