Merge remote-tracking branch 'origin/holiday-price' into holiday-price

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

@@ -248,10 +248,9 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 detail.setWithDrawOrderNo(orderNo);
                 detail.setSource(1);
                 myWaterBiz.updMyWater(detail);
-                if (orderType == 1 || orderType == 2) {
-                    myWaterBiz.updMyWalletUnbooked(userId, unbooked, 2);
-                }
-
+            }
+            if ((orderType == 1 || orderType == 2)&&unbooked.compareTo(BigDecimal.ZERO)==1 ){
+                myWaterBiz.updMyWalletUnbooked(userId, unbooked, 2);
             }
         }