提现界面去掉汇率相关的东西

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/user/WithdrawalHistory.java

@@ -39,9 +39,6 @@ public class WithdrawalHistory implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Integer uid;
 
-    @ApiModelProperty(value = "提现汇率")
-    private BigDecimal rate;
-
     @ApiModelProperty(value = "提现代币数量")
     private BigDecimal amount;
 
@@ -57,9 +54,6 @@ public class WithdrawalHistory implements Serializable {
     @ApiModelProperty(value = "提现交易ID")
     private String transactionId;
 
-    @ApiModelProperty(value = "扣款rmb")
-    private BigDecimal amountToRmb;
-
     @ApiModelProperty(value = "1成功，2失败，0处理中")
     private Integer status;
 
@@ -78,11 +72,8 @@ public class WithdrawalHistory implements Serializable {
     @ApiModelProperty(value = "区块链过来的不知道是什么")
     private String txHash;
 
-    @ApiModelProperty(value = "手续费SL")
-    private BigDecimal handlingFeeSl;
-
-    @ApiModelProperty(value = "手续费RMB")
-    private BigDecimal handlingFeeRmb;
+    @ApiModelProperty(value = "手续费")
+    private BigDecimal handlingFee;
 
     @ApiModelProperty(value = "用户账号")
     @TableField(exist = false)

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/PaymentMoneyToUser.java

@@ -34,8 +34,4 @@ public class PaymentMoneyToUser implements Serializable {
     @ApiModelProperty(value = "提现地址")
     @NotBlank(message = "提现地址不能为空")
     private String address;
-
-    @ApiModelProperty(value = "提现时汇率")
-    @NotNull(message = "汇率不能为空")
-    private BigDecimal rate;
 }

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java

@@ -929,8 +929,8 @@ public class PayServiceImpl implements PayService {
 
         PaymentMoneyToUserResponse paymentMoneyToUserResponse = new PaymentMoneyToUserResponse();
         // 提现手续费，实际到账是扣掉手续费的
-        BigDecimal handlingFeeSl = request.getAmount().multiply(new BigDecimal("0.05")).setScale(2, RoundingMode.UP);
-        BigDecimal amount = request.getAmount().subtract(handlingFeeSl);
+        BigDecimal handlingFee = request.getAmount().multiply(new BigDecimal("0.05")).setScale(2, RoundingMode.UP);
+        BigDecimal amount = request.getAmount().subtract(handlingFee);
 
         // 之前说要直接自动到账，这儿调用了接口，后面说要手动并且加审核这儿关掉
         // Map<String, Object> res = DaibiUtils.withdrawalSLgns(request.getAddress(), amount.toString());
@@ -942,15 +942,12 @@ public class PayServiceImpl implements PayService {
 
         withdrawalHistory.setUid(user.getId());
         withdrawalHistory.setAddress(request.getAddress());
-        withdrawalHistory.setRate(request.getRate());
         withdrawalHistory.setAmount(amount);
-        withdrawalHistory.setAmountToRmb(request.getRate().multiply(amount));
         withdrawalHistory.setTransactionId(res.get("request_id").toString());
         withdrawalHistory.setToken(res.get("token").toString());
         withdrawalHistory.setTokenType("slgns");
         withdrawalHistory.setRemark(res.get("message").toString());
-        withdrawalHistory.setHandlingFeeRmb(request.getRate().multiply(handlingFeeSl));
-        withdrawalHistory.setHandlingFeeSl(handlingFeeSl);
+        withdrawalHistory.setHandlingFee(handlingFee);
         if ((Boolean) res.get("status")) {
             // 提现发起成功
             withdrawalHistory.setStatus(0);
@@ -987,7 +984,6 @@ public class PayServiceImpl implements PayService {
             UserBalanceRecord userBalanceRecord = new UserBalanceRecord();
             userBalanceRecord.setUid(user.getId());
             userBalanceRecord.setLinkId(requestId);
-            userBalanceRecord.setRate(request.getRate());
             userBalanceRecord.setLinkType(BalanceRecordConstants.BALANCE_RECORD_LINK_TYPE_WITHDRAW);
             userBalanceRecord.setType(BalanceRecordConstants.BALANCE_RECORD_TYPE_SUB);
             userBalanceRecord.setAmount(request.getAmount());

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/user/WithdrawalHistoryServiceImpl.java

@@ -59,14 +59,13 @@ public class WithdrawalHistoryServiceImpl extends ServiceImpl<WithdrawalHistoryD
         if (request.getStatus().equals(2)) {
             User userInfo = userService.fromUidSelectUserInfo(withdrawalHistory.getUid());
             Boolean update = Boolean.FALSE;
-            BigDecimal amount = withdrawalHistory.getAmount().add(withdrawalHistory.getHandlingFeeSl());
+            BigDecimal amount = withdrawalHistory.getAmount().add(withdrawalHistory.getHandlingFee());
             update = userService.updateNowMoney(userInfo.getId(), amount, Constants.OPERATION_TYPE_ADD);
             if (update) {
                 // 用户余额记录
                 UserBalanceRecord userBalanceRecord = new UserBalanceRecord();
                 userBalanceRecord.setUid(userInfo.getId());
                 userBalanceRecord.setLinkId(withdrawalHistory.getTransactionId());
-                userBalanceRecord.setRate(withdrawalHistory.getRate());
                 userBalanceRecord.setLinkType(BalanceRecordConstants.BALANCE_RECORD_LINK_TYPE_WITHDRAW_REFUSE);
                 userBalanceRecord.setType(BalanceRecordConstants.BALANCE_RECORD_TYPE_ADD);
                 userBalanceRecord.setAmount(amount);

crmeb_src/mer_uniapp/pages/users/user_withd_slgns/index.vue

@@ -82,7 +82,7 @@
 <script>
 	
 	import { mapGetters } from "vuex";
-	import { sLgnsWithdrawApi,getRechargeApi } from "@/api/user.js";
+	import { sLgnsWithdrawApi } from "@/api/user.js";
 	// #ifdef H5
 	import jsQR from "jsqr";
 	// #endif