diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java index 539bf3afc..1cbfae482 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java @@ -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); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index bbbb172fa..4dc08daea 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -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); // 优惠后总消费金额 = 折扣后电费 + 折扣后服务费