|
@@ -349,8 +349,14 @@ public class PayCenterWebhookServiceImpl implements PayCenterWebhookService {
|
|
String formattedDate = sdf.format(date);
|
|
String formattedDate = sdf.format(date);
|
|
contentMap.put("@date@",formattedDate);
|
|
contentMap.put("@date@",formattedDate);
|
|
String price = ObjectUtils.isNotEmpty(ordersVO.getReducedPrice())? ordersVO.getReducedPrice().toEngineeringString() : ordersVO.getPrice().toEngineeringString();
|
|
String price = ObjectUtils.isNotEmpty(ordersVO.getReducedPrice())? ordersVO.getReducedPrice().toEngineeringString() : ordersVO.getPrice().toEngineeringString();
|
|
- contentMap.put("@payPrice@", price);
|
|
|
|
- contentMap.put("@renewPrice@", productVO.getPrice().toEngineeringString());
|
|
|
|
|
|
+ String currencySign;
|
|
|
|
+ if (ordersVO.getPayment() == 1 || ordersVO.getPayment() == 2) {
|
|
|
|
+ currencySign = "¥";
|
|
|
|
+ } else {
|
|
|
|
+ currencySign = "$";
|
|
|
|
+ }
|
|
|
|
+ contentMap.put("@payPrice@", currencySign + price);
|
|
|
|
+ contentMap.put("@renewPrice@", currencySign + price);
|
|
bo.setSendContent(contentMap);
|
|
bo.setSendContent(contentMap);
|
|
log.info("获取发票");
|
|
log.info("获取发票");
|
|
String invoiceHtml = null;
|
|
String invoiceHtml = null;
|