upgrade after testing

huanggang
1 parent d123ce1a
Showing 3 changed files with 25 additions and 2 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderVO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/util/CurrencyUtils.java
@@ -7,13 +7,20 @@ import java.util.List;
 public class CashierOrderVO {
     // 业务系统用户标识
     private final String userId;
+    // 商品描述
+    private final String goods;
+    // 付款金额-元
+    private final String amount;
     // 页面回调地址
     private final String redirectUrl;
     // 支付通道
     private final List<PaymentPipeline> pipelines;
-    public CashierOrderVO(String userId, String redirectUrl, List<PaymentPipeline> pipelines) {
+    public CashierOrderVO(String userId, String goods, String amount,
+                          String redirectUrl, List<PaymentPipeline> pipelines) {
         this.userId = userId;
+        this.goods = goods;
+        this.amount = amount;
         this.redirectUrl = redirectUrl;
         this.pipelines = pipelines;
     }
@@ -22,6 +29,14 @@ public class CashierOrderVO {
         return userId;
     }
+    public String getGoods() {
+        return goods;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
     public String getRedirectUrl() {
         return redirectUrl;
     }
@@ -12,6 +12,7 @@ import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.util.CurrencyUtils;
 import com.diligrp.cashier.shared.util.ObjectUtils;
 import com.diligrp.cashier.trade.domain.*;
 import com.diligrp.cashier.trade.model.TradeOrder;
@@ -86,7 +87,8 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         List<PaymentPipeline> pipelines = paymentPipelineManager.listPipelines(orderToken.getMchId(), PaymentPipeline.class);
         List<CashierOrderVO.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
             new CashierOrderVO.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel())).toList();
-        return new CashierOrderVO(orderToken.getUserId(), orderToken.getRedirectUrl(), pipelineList);
+        String amount = CurrencyUtils.toNoSymbolCurrency(trade.getMaxAmount());
+        return new CashierOrderVO(orderToken.getUserId(), trade.getGoods(), amount, orderToken.getRedirectUrl(), pipelineList);
     }
     /**
@@ -98,4 +98,10 @@ public class CurrencyUtils {
         currency.setCharAt(0, currencySymbol);
         currency.setCharAt(1, negativeSymbol);
     }
+
+    public static void main(String[] args) {
+        System.out.println(toNoSymbolCurrency(-1L));
+        System.out.println(toCurrency(-1L));
+        System.out.println(cent2TenNoSymbol(-1L));
+    }
 }