diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql index eb4169a85..a41739295 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql @@ -5,6 +5,8 @@ UPDATE wx_mall SET cash_out_support = 0 ; ALTER TABLE wx_merchant ADD COLUMN `cash_out_number` INT(11) DEFAULT 0 COMMENT '商户待提现金额(分)' ; +UPDATE wx_merchant SET cash_out_number = 0 ; + ###页面添加工作流,提现审批,22, 初始化里面也加上 CREATE TABLE `wx_cash_out` ( diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 8be63e6e1..ffdd11182 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -38,6 +38,9 @@ public class WxCashOutController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCashOut wxCashOut, Integer pageNum, Integer pageSize) { if (null == wxCashOut) wxCashOut = new WxCashOut(); + WxMerchantBUser buser = getLoginBUser(); + wxCashOut.updateTenantInfo(buser); + wxCashOut.setMerchantId(buser.getMerchantId()); final PageInfo page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize); return new ResultData(page); }