保证金缴纳3

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

@@ -27,6 +27,8 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -61,7 +63,9 @@ public class AuctionEarnestServiceImpl implements AuctionEarnestService {
             earnestOrder.setUpdateTime(new Date());
             earnestOrder.setState(EarnestEnum.EarnestOrderStateEnum.PRE_PAY.getCode());
             earnestOrderDao.insert(earnestOrder);
-            return Result.success();
+            Map<String, String> map = new HashMap<>();
+            map.put("earnestOrderId", earnestOrderId);
+            return Result.success(map);
         } catch (Exception e) {
             logger.error("创建支付保证金订单 error : {}", e);
         }

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

@@ -87,7 +87,10 @@ public class EarnestRecordServiceImpl implements EarnestRecordService {
             earnestRecordRequestDto.setType(EarnestEnum.TypeEnum.OCCUPY.getCode());
             earnestRecordRequestDto.setState(EarnestEnum.StateEnum.VALID.getCode());
             long occupyAmount = earnestRecordDao.sumForOccupy(earnestRecordRequestDto);
-            map.put("usedAmount", PriceUtil.convertPriceFenToYuan(occupyAmount));
+            //已用保证金
+            map.put("usedEarnestAmount", PriceUtil.convertPriceFenToYuan(occupyAmount));
+            //已用出价
+            map.put("usedAuctionAmount", PriceUtil.convertPriceFenToYuan(occupyAmount * 20));
 
             //查询用户的保证金账户
             UserAccount userAccount = userAccountDao.findByUserId(dto.getUserId());