Merge branch 'holiday-price' into dev

bd4c989f · hezhen · 39c3c1ad · f336a529 · bd4c989f
Commit bd4c989f authored Nov 19, 2019 by hezhen
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

AppUserSellingWaterBiz.java ...ub/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java +3 -4

No files found.
--- a/ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java
+++ b/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);
            }
        }