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

update 推送小程序停止充电接口金额改为实付金额

Browse Source
This commit is contained in:
Lemon
2024-03-07 10:40:10 +08:00
parent 3863f8bcc1
commit 3938271244
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java
View File

@@ -38,6 +38,11 @@ public class SendMessageVO {
*/ */
private String orderAmount; private String orderAmount;
/**
* 折扣金额
*/
private String discountAmount;
/** /**
* 结算金额 * 结算金额
*/ */

6
jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java
View File

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@@ -255,7 +256,10 @@ public class WxAppletRemoteService {
AppletTemplateMessageSendDTO.StopChargingMessage stopChargingMessage = new AppletTemplateMessageSendDTO.StopChargingMessage(); AppletTemplateMessageSendDTO.StopChargingMessage stopChargingMessage = new AppletTemplateMessageSendDTO.StopChargingMessage();
msgInfo.setStopChargingMessage(stopChargingMessage); msgInfo.setStopChargingMessage(stopChargingMessage);
stopChargingMessage.setChargingAmount(sendMessageVO.getSettleAmount()); // 订单金额 2024.03.05改为 结算金额 BigDecimal orderAmount = new BigDecimal(sendMessageVO.getOrderAmount());
BigDecimal discountAmount = new BigDecimal(sendMessageVO.getDiscountAmount());
stopChargingMessage.setChargingAmount(String.valueOf(orderAmount.subtract(discountAmount))); // 订单金额 2024.03.05改为 实付金额
stopChargingMessage.setEndReason(sendMessageVO.getStopReason()); // 结束原因 stopChargingMessage.setEndReason(sendMessageVO.getStopReason()); // 结束原因
stopChargingMessage.setOrderCode(sendMessageVO.getOrderCode()); // 订单号 stopChargingMessage.setOrderCode(sendMessageVO.getOrderCode()); // 订单号
stopChargingMessage.setChargingDegree(sendMessageVO.getChargingDegree()); // 充电度数 stopChargingMessage.setChargingDegree(sendMessageVO.getChargingDegree()); // 充电度数

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

@@ -2459,6 +2459,8 @@
t1.station_id as stationId, t1.station_id as stationId,
t2.station_name as stationName, t2.station_name as stationName,
t3.total_order_amount as orderAmount, t3.total_order_amount as orderAmount,
t1.order_amount as orderAmount,
t1.discount_amount as discountAmount,
t1.settle_amount as settleAmount, t1.settle_amount as settleAmount,
t3.total_used_electricity as chargingDegree, t3.total_used_electricity as chargingDegree,
t4.open_id as openId t4.open_id as openId