Merge branch 'hz_master'

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -281,7 +281,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         BigDecimal balnece=sumDto.getBalance();
         //到账金额
         BigDecimal realAmount=amount;
-        if (amount.compareTo(realAmount)>0){
+        if ((realAmount.add(commission)).compareTo(balnece)>0){
             realAmount=balnece.subtract(commission);
         }
         log.info("-----提现申请-----proceduReates==="+sumDto.getProceduReates()+"----commission===="+commission+"---realAmount==="+realAmount);

ace-modules/ace-admin/src/main/resources/mapper/MyWaterMapper.xml

@@ -9,10 +9,10 @@
         <if test=" userId!=null and userId!=''">
             user_id=#{userId},
         </if>
-            <if test="balance!=null and balance!='' ">
+            <if test="balance!=null ">
              balance=#{balance},
          </if>
-         <if test="balance!=null and balance!='' ">
+         <if test="withdrawals!=null and withdrawals!='' ">
              withdrawals=#{withdrawals},
          </if>
          <if test="totalAmount!=null and totalAmount!='' ">

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java

@@ -67,7 +67,7 @@ public class AliYunSmsBiz {
     public static final String TEMPLATE_ID_CANCEL_E = "SMS_173345667";
     //租车押金退还 22
     //public static final String TEMPLATE_ID_FINISH_A = "460772";
-    public static final String TEMPLATE_ID_FINISH_A = "SMS_173340710";
+    public static final String TEMPLATE_ID_FINISH_A = "SMS_175240587";
     //违章押金退还 23
     //public static final String TEMPLATE_ID_FINISH_B = "460773";
     public static final String TEMPLATE_ID_FINISH_B = "SMS_173340712";