|
|
|
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumCashOutStatus; |
|
|
|
import com.iformall.enums.EnumPayWay; |
|
|
|
import com.iformall.service.*; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -11,7 +12,9 @@ import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import org.slf4j.Logger; |
|
|
|
@@ -50,6 +53,30 @@ public class WxCashOutController extends BaseController { |
|
|
|
wxCashOut.updateTenantInfo(buser); |
|
|
|
wxCashOut.setMerchantId(buser.getMerchantId()); |
|
|
|
if (null != wxCashOut.getStatus() && wxCashOut.getStatus().intValue()<0) { |
|
|
|
//提现中 |
|
|
|
List<Integer> statusList = new ArrayList<Integer>(); |
|
|
|
if (wxCashOut.getStatus().intValue()==99) { |
|
|
|
statusList.add(EnumCashOutStatus.AUDIOING.getCode()); |
|
|
|
statusList.add(EnumCashOutStatus.WAITING.getCode()); |
|
|
|
wxCashOut.setStatusList(statusList); |
|
|
|
//提现成功 |
|
|
|
}else if (wxCashOut.getStatus().intValue()==98) { |
|
|
|
statusList.add(EnumCashOutStatus.SUCCESS.getCode()); |
|
|
|
wxCashOut.setStatusList(statusList); |
|
|
|
//提现失败 |
|
|
|
}else if (wxCashOut.getStatus().intValue()==97) { |
|
|
|
statusList.add(EnumCashOutStatus.FAIL.getCode()); |
|
|
|
statusList.add(EnumCashOutStatus.BACK.getCode()); |
|
|
|
wxCashOut.setStatusList(statusList); |
|
|
|
//提现拒绝 |
|
|
|
}else if (wxCashOut.getStatus().intValue()==96) { |
|
|
|
statusList.add(EnumCashOutStatus.REJECT.getCode()); |
|
|
|
wxCashOut.setStatusList(statusList); |
|
|
|
//审批中 |
|
|
|
}else if (wxCashOut.getStatus().intValue()==96) { |
|
|
|
statusList.add(EnumCashOutStatus.AUDIOING.getCode()); |
|
|
|
wxCashOut.setStatusList(statusList); |
|
|
|
} |
|
|
|
wxCashOut.setStatus(null); |
|
|
|
} |
|
|
|
final PageInfo<WxCashOut> page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize); |
|
|
|
|