From 6191a2b98b227c477bdef99aeb8d3a102aa86af1 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Thu, 10 Apr 2025 15:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BE=AE=E4=BF=A1=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=B7=E6=8E=A8=E9=80=81=E7=9A=84=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=B8=BA=E5=88=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzh/GZHMessageTemplateService.java        | 33 ++++++++-----------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java b/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java
index ac01e3c..3f26841 100644
--- a/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java
+++ b/wechat-server/src/main/java/com/evotech/hd/wechat/service/gzh/GZHMessageTemplateService.java
@@ -1,11 +1,9 @@
 package com.evotech.hd.wechat.service.gzh;
 
-import java.math.BigDecimal;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.evotech.hd.common.core.dao.cloud.OrderSwapBatteryDao;
 import com.evotech.hd.common.core.dao.wechat.WechatUserDao;
@@ -17,20 +15,15 @@ import com.evotech.hd.common.core.entity.wechat.WechatUser;
 import com.evotech.hd.common.core.enums.CodeMsg;
 import com.evotech.hd.wechat.config.GZHProperties;
 import com.evotech.hd.wechat.config.XcxProperties;
-import com.evotech.hd.wechat.entity.gzh.templatemessage.ChargeTemplateData;
-import com.evotech.hd.wechat.entity.gzh.templatemessage.MessageTemplateSendData;
-import com.evotech.hd.wechat.entity.gzh.templatemessage.Miniprogram;
-import com.evotech.hd.wechat.entity.gzh.templatemessage.PayTemplateData;
-import com.evotech.hd.wechat.entity.gzh.templatemessage.PreOrderTemplateData;
-import com.evotech.hd.wechat.entity.gzh.templatemessage.SwapTemplateData;
-import com.evotech.hd.wechat.entity.gzh.templatemessage.WalletRechargeTemplateData;
+import com.evotech.hd.wechat.entity.gzh.templatemessage.*;
 import com.evotech.hd.wechat.utils.gzh.TemplateMessageUtil;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 @Slf4j
 @Service
@@ -143,8 +136,8 @@ public class GZHMessageTemplateService {
 			chargeData.setCharacter_string14(osb.getOrderNo());
 			chargeData.setCharacter_string31(osb.getReturnBatCode());
 			chargeData.setCharacter_string25(osb.getElectAmount() + "");
-			chargeData.setAmount34(osb.getServiceFee().toString());
-			chargeData.setAmount28(osb.getAmount() + "");
+			chargeData.setAmount34(osb.getServiceFee() != null ? osb.getServiceFee().divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_DOWN).setScale(2, RoundingMode.HALF_EVEN).toString().toString() : "");
+			chargeData.setAmount28(osb.getAmount() != null ? new BigDecimal(osb.getAmount()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_DOWN).setScale(2, RoundingMode.HALF_EVEN).toString(): "");
 			log.info("付款完成推送公众号消息=======>：{}", JSONUtil.parseObj(chargeData));
 			sendData.setData(JSONUtil.parseObj(chargeData));
 			break;