Merge branch 'hotfix-20190325' into test6.8.9

@@ -47,8 +47,7 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
     @Value("${deposit.prestore}")
     @Value("${deposit.prestore}")
     private Double depositPreStore;
     private Double depositPreStore;
 
 
-    @Value("${deposit.earnestMoneyDepositLimit:100}")
-    private BigDecimal earnestMoneyDepositLimit;
+    private BigDecimal depositEarnestMoneyLimit;
 
 
     @Autowired
     @Autowired
     UfoServiceCaller ufoServiceCaller;
     UfoServiceCaller ufoServiceCaller;
@@ -88,6 +87,11 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
     @Autowired
     @Autowired
     SellerWalletMapper sellerWalletMapper;
     SellerWalletMapper sellerWalletMapper;
 
 
+    @Value("${deposit.earnest.money.limit:5000}")
+    private void depositEarnestMoneyLimit(double depositEarnestMoneyLimit){
+        this.depositEarnestMoneyLimit = BigDecimal.valueOf(depositEarnestMoneyLimit);
+    }
+
     /**
     /**
      * 充值保证金
      * 充值保证金
      */
      */
@@ -118,8 +122,8 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
         }
         }
         BigDecimal totalEarnestMoney = sw.getAmount();
         BigDecimal totalEarnestMoney = sw.getAmount();
 
 
-        if (totalEarnestMoney.add(amount).compareTo(earnestMoneyDepositLimit) > 0) {
-            throw new UfoServiceException(400, "账户余额不能超过" + earnestMoneyDepositLimit);
+        if (totalEarnestMoney.add(amount).compareTo(depositEarnestMoneyLimit) > 0) {
+            throw new UfoServiceException(400, "账户余额不能超过" + depositEarnestMoneyLimit);
         }
         }
 
 
         // 生成订单号
         // 生成订单号

@@ -2,6 +2,7 @@
 deposit.prestore=${depositPrestore}
 deposit.prestore=${depositPrestore}
 # 保证金充值列表
 # 保证金充值列表
 deposit.recharge.list=${depositRechargeList}
 deposit.recharge.list=${depositRechargeList}
+deposit.earnest.money.limit=${depositEarnestMoneyLimit}
 
 
 # 芝麻认证开始开关,如果为false，芝麻认知直接返回通过
 # 芝麻认证开始开关,如果为false，芝麻认知直接返回通过
 zhimacert.switch=${zhiMaCertSwitch}
 zhimacert.switch=${zhiMaCertSwitch}