From 0839fb8ee995dc5f3481e7e8c567660781ab5068 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 26 Apr 2021 14:12:36 +0800 Subject: [PATCH] fix cashout --- .../com/iformall/controller/WxCashOutController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 43167540d..e5baabe51 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.enums.EnumCashOutStatus; +import com.iformall.enums.EnumPayShare; import com.iformall.enums.EnumPayWay; import com.iformall.service.*; import com.iformall.utils.DateUtils; @@ -45,6 +46,8 @@ public class WxCashOutController extends BaseController { WxMerchantService wxMerchantService; @Autowired WxMallService wxMallService; + @Autowired + WxPayAccountService wxPayAccountService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -107,7 +110,13 @@ public class WxCashOutController extends BaseController { Map resultMap = new HashMap(); resultMap.put("cashOutCount", merchant.getCashOutCount()); resultMap.put("cashOutNumber", merchant.getCashOutNumber()); - resultMap.put("cashOutSupport", mall.getCashOutSupport()); + + WxPayAccount payAccount= wxPayAccountService.getByTenantId(mall.getTenantId()); + if (payAccount.getShare().intValue() == EnumPayShare.YES.getCode().intValue()) { + resultMap.put("cashOutSupport", 0); + }else { + resultMap.put("cashOutSupport", mall.getCashOutSupport()); + } resultMap.put("cashOutLimit", mall.getCashOutLimit()); resultMap.put("cashOutOpenNickName", mUser.getNickName()); resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl());