Преглед изворни кода

fix cashout

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
dce75571ce
2 измењених фајлова са 22 додато и 4 уклоњено
  1. +22
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  2. +0
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java

+ 22
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Прегледај датотеку

@@ -10,6 +10,10 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;

import java.util.HashMap;
import java.util.Map;

import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +34,10 @@ public class WxCashOutController extends BaseController {
private WxCashOutService wxCashOutService; private WxCashOutService wxCashOutService;
@Autowired @Autowired
WxCUserService wxCUserService; WxCUserService wxCUserService;
@Autowired
WxMerchantService wxMerchantService;
@Autowired
WxMallService wxMallService;
@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@@ -44,6 +52,20 @@ public class WxCashOutController extends BaseController {
final PageInfo<WxCashOut> page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize); final PageInfo<WxCashOut> page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }
@ApiOperation("查询当前提现信息")
@GetMapping("getCurrentCashOutData")
public ResultData getCurrentCashOutData() {
WxMerchantBUser buser = getLoginBUser();
WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId());
WxMall mall = wxMallService.getByTenantId(buser.getTenantId());
Map<String,Object> resultMap = new HashMap<String,Object>();
resultMap.put("cashOutCount", merchant.getCashOutCount());
resultMap.put("cashOutNumber", merchant.getCashOutNumber());
resultMap.put("cashOutSupport", mall.getCashOutSupport());
resultMap.put("cashOutLimit", mall.getCashOutLimit());
return new ResultData(resultMap);
}


@ApiOperation("微信B端提现") @ApiOperation("微信B端提现")
@PostMapping("cashout") @PostMapping("cashout")


+ 0
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java Прегледај датотеку

@@ -98,10 +98,6 @@ public class WxMerchantBUserController extends BaseController {
resultMap.put("merchant_id",merchant.getId()); resultMap.put("merchant_id",merchant.getId());
resultMap.put("is_admin",merchant.getIsAdmin()); resultMap.put("is_admin",merchant.getIsAdmin());
resultMap.put("businessId", merchant.getBusinessId()); resultMap.put("businessId", merchant.getBusinessId());
resultMap.put("cashOutCount", merchant.getCashOutCount());
resultMap.put("cashOutNumber", merchant.getCashOutNumber());
resultMap.put("cashOutSupport", mall.getCashOutSupport());
resultMap.put("cashOutLimit", mall.getCashOutLimit());


String mid = null; String mid = null;
try { try {


Loading…
Откажи
Сачувај