convert user card amount to yuan

huanggang
1 parent 7587a56d
Showing 3 changed files with 12 additions and 20 deletions
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/card/UserCardDTO.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/util/CurrencyUtils.java
@@ -11,6 +11,7 @@ import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
 import com.diligrp.cashier.shared.type.SourceType;
+import com.diligrp.cashier.shared.util.CurrencyUtils;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.slf4j.Logger;
@@ -69,8 +70,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
             LOG.debug("Received from card payment pipeline: {}", result.responseText);
-            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {
-            });
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 Map<String, Object> data = (Map<String, Object>) response.get("data");
                 String outTradeNo = (String) data.get("outTradeNo");
@@ -101,8 +101,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
             LOG.debug("Received from card payment pipeline: {}", result.responseText);
-            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {
-            });
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 return new OnlineRefundResponse(request.getRefundId(), null, now,
                         PaymentState.SUCCESS, "园区卡退款成功");
@@ -124,18 +123,17 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         HttpResult result = send(uri, payload);
         if (result.statusCode == 200) {
             LOG.debug("Received from card payment pipeline: {}", result.responseText);
-            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {
-            });
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 List<UserCardDTO> userCards = new ArrayList<>();
                 Object data = response.get("data");
                 if (data != null) {
-                    List<Map<String, Object>> cardList = JsonUtils.convertValue(data, new TypeReference<>() {
-                    });
+                    List<Map<String, Object>> cardList = JsonUtils.convertValue(data, new TypeReference<>() {});
                     for (Map<String, Object> card : cardList) {
+                        String amount = CurrencyUtils.toNoSymbolCurrency(convertLong(card.get("amount")));
                         UserCardDTO userCard = new UserCardDTO(convertLong(card.get("customerId")),
-                                convertLong(card.get("accountId")), (String) card.get("cardNo"),
-                                (String) card.get("customerName"), convertLong(card.get("amount")));
+                            convertLong(card.get("accountId")), (String) card.get("cardNo"),
+                            (String) card.get("customerName"), amount);
                         userCards.add(userCard);
                     }
                 }
@@ -13,12 +13,12 @@ public class UserCardDTO {
     // 持卡人名称
     private String name;
     // 卡余额
-    private Long amount;
+    private String amount;
     public UserCardDTO() {
     }
-    public UserCardDTO(Long customerId, Long accountId, String cardNo, String name, Long amount) {
+    public UserCardDTO(Long customerId, Long accountId, String cardNo, String name, String amount) {
         this.customerId = customerId;
         this.accountId = accountId;
         this.cardNo = cardNo;
@@ -58,11 +58,11 @@ public class UserCardDTO {
         this.name = name;
     }
-    public Long getAmount() {
+    public String getAmount() {
         return amount;
     }
-    public void setAmount(Long amount) {
+    public void setAmount(String amount) {
         this.amount = amount;
     }
 }
@@ -98,10 +98,4 @@ 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));
-    }
 }