Просмотр исходного кода

fix cashout

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
0839fb8ee9
1 измененных файлов: 10 добавлений и 1 удалений
  1. +10
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java

+ 10
- 1
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.*;
import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.po.base.BaseEntity.SortField;
import com.iformall.enums.EnumCashOutStatus; import com.iformall.enums.EnumCashOutStatus;
import com.iformall.enums.EnumPayShare;
import com.iformall.enums.EnumPayWay; import com.iformall.enums.EnumPayWay;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
@@ -45,6 +46,8 @@ public class WxCashOutController extends BaseController {
WxMerchantService wxMerchantService; WxMerchantService wxMerchantService;
@Autowired @Autowired
WxMallService wxMallService; WxMallService wxMallService;
@Autowired
WxPayAccountService wxPayAccountService;
@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@@ -107,7 +110,13 @@ public class WxCashOutController extends BaseController {
Map<String,Object> resultMap = new HashMap<String,Object>(); Map<String,Object> resultMap = new HashMap<String,Object>();
resultMap.put("cashOutCount", merchant.getCashOutCount()); resultMap.put("cashOutCount", merchant.getCashOutCount());
resultMap.put("cashOutNumber", merchant.getCashOutNumber()); 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("cashOutLimit", mall.getCashOutLimit());
resultMap.put("cashOutOpenNickName", mUser.getNickName()); resultMap.put("cashOutOpenNickName", mUser.getNickName());
resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl()); resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl());


Загрузка…
Отмена
Сохранить