Merge branch 'master-wallet-bug-fix' into dev

2443abde · libin · 625aeefe · 82085ffd · 2443abde
Commit 2443abde authored Sep 24, 2019 by libin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

AppUserSellingWaterBiz.java ...ub/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java +1 -0

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
@@ -375,6 +375,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
            }
            //取消单
            if (Objects.nonNull(sellingWalletVo.getSellerStatus())) {
+                sellingWalletVo.setSellerStatus(SellerWallterStatus.CANCEL.getCode());
                sellingWalletVo.setStatusText(SellerWallterStatus.CANCEL.getText());
            }else {
                if (sellingWalletVo.getWaiting()==SellerWallterStatus.POST.getCode()){