Merge branch 'exchangerate' into abroad_dev

netflix-service/src/main/java/com/cyksj/service/cryptomus/CryptomusService.java

@@ -3,10 +3,7 @@ package com.cyksj.service.cryptomus;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.crypto.digest.MD5;
 import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.cyksj.common.exception.BusinessRuntimeException;
-import com.cyksj.common.util.Codec;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.enums.GatewayApiCode;
 import com.cyksj.model.entity.OrderDon;
@@ -17,18 +14,16 @@ import com.cyksj.model.response.CryptomusPayRep;
 import com.cyksj.model.response.CryptomusRefundRep;
 import com.cyksj.model.response.CryptomusReturnRep;
 import com.cyksj.service.order.OrderDonService;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.crypto.digests.MD5Digest;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.*;
+import java.util.Date;
 
 /**
  * @author zwhui
@@ -62,7 +57,7 @@ public class CryptomusService {
         }
         CryptomusPayReq cryptomusPay = new CryptomusPayReq();
         cryptomusPay.setAmount(String.valueOf(orderDon.getMoney().divide(new BigDecimal(100), 2, RoundingMode.HALF_DOWN)));
-        cryptomusPay.setCurrency("USD");
+        cryptomusPay.setCurrency(orderDon.getCurrency());
         cryptomusPay.setLifetime(1800);
         cryptomusPay.setOrder_id(orderId.toString());
         cryptomusPay.setUrl_callback(host + "/applets/order/cryptomus/notify");