缴纳拍卖保证金

ch-core/src/main/java/com/wwdz/ch/core/entity/UserAccountVo.java

@@ -58,7 +58,12 @@ public class UserAccountVo implements Entity{
     private String earnestAmount;
 
     /**
-     * 保证金可用金额
+     * 总保证金金额(充值 + 赠送的)
+     */
+    private String totalEarnestAmount;
+
+    /**
+     * 保证金可用金额（未被占用的（充值+赠送的金额））
      */
     private String earnestUsableAmount;
 
@@ -98,6 +103,7 @@ public class UserAccountVo implements Entity{
         userAccountVo.setIntroduceWaitEntryAmount(PriceUtil.convertPriceFenToYuan(userAccount.getIntroduceWaitEntryAmount()));
         userAccountVo.setTotalIntroduceAmount(PriceUtil.convertPriceFenToYuan(userAccount.getIntroduceAmount() + userAccount.getIntroduceWaitEntryAmount()));
         userAccountVo.setEarnestAmount(PriceUtil.convertPriceFenToYuan(userAccount.getEarnestAmount()));
+        userAccountVo.setTotalEarnestAmount(PriceUtil.convertPriceFenToYuan(userAccount.getEarnestAmount() + userAccount.getGiftEarnestAmount()));
         userAccountVo.setEarnestUsableAmount(PriceUtil.convertPriceFenToYuan(userAccount.getEarnestUsableAmount()));
         userAccountVo.setGiftEarnestAmount(PriceUtil.convertPriceFenToYuan(userAccount.getGiftEarnestAmount()));
         userAccountVo.setUsableOfferAmount(PriceUtil.convertPriceFenToYuan(userAccount.getEarnestUsableAmount() * CommConsts.EARNEST_TRANSFORM_AUCTION_REBATE));

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/openShop/AuctionEarnestServiceImpl.java

@@ -81,7 +81,7 @@ public class AuctionEarnestServiceImpl implements AuctionEarnestService {
             prePayDto.setDistributionOrderId(orderId);
             String itemName = "拍卖保证金";
             prePayDto.setBuyerOpenid(earnestOrder.getUserOpenId());
-            prePayDto.setAmount(PriceUtil.convertPriceFenToYuan(earnestOrder.getAmount()));
+            prePayDto.setAmount(String.valueOf(earnestOrder.getAmount()));
             prePayDto.setItemName(itemName);
             Result prePayResult = wxPayServiceApi.createPrepareOrder(prePayDto);
             if (!prePayResult.getSuccess()) {