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

如果结算金额为0，减去优惠金额后为负数，还设置为0

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-02-19 11:36:55 +08:00
parent 5aed246b69
commit 092111bf91
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java
View File

@@ -59,25 +59,6 @@ public class BillingTemplateValidateRequestHandler extends AbstractHandler{
byte[] billingTemplateCodeByte = BytesUtil.copyBytes(msgBody, startIndex, length);
String billingTemplateCode = BytesUtil.binary(billingTemplateCodeByte, 16);
// 根据桩号查询计费模板
// BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn);
// String templateCode = null;
// if (billingTemplateVO != null) {
// templateCode = billingTemplateVO.getTemplateCode();
// }
// log.info("桩传的计费模型编码：{}, 根据桩号:{} 查询到的计费模型编码：{}", billingTemplateCode, pileSn, templateCode);
// log.info("桩传的计费模型编码：{}", billingTemplateCode);
/**
* 应答 0x00 桩计费模型与平台一致 0x01 桩计费模型与平台不一致
*/
// byte[] flag;
// if (StringUtils.equals(billingTemplateCode, "100")){
// flag = Constants.zeroByteArray;
// }else {
// }
byte[] flag = Constants.oneByteArray;
// 消息体
byte[] messageBody = Bytes.concat(pileSnByte, billingTemplateCodeByte, flag);

4
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -895,6 +895,10 @@ public abstract class AbstractProgramLogic implements InitializingBean {
// 更新结算金额 结算金额 = 消费金额 - 虚拟金额 - 优惠金额
BigDecimal newSettleAmount = orderBasicInfo.getSettleAmount().subtract(discountAmount);
if (newSettleAmount.compareTo(BigDecimal.ZERO) < 0) {
// 如果结算金额为0，减去优惠金额后为负数，还设置为0
newSettleAmount = BigDecimal.ZERO;
}
orderBasicInfo.setSettleAmount(newSettleAmount);
// 优惠后总消费金额 = 折扣后电费 + 折扣后服务费