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

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
cba0d90e7a
3 измененных файлов: 0 добавлений и 30 удалений
  1. +0
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +0
    -7
      mallinkService/src/main/java/com/iformall/service/WxBillAllService.java
  3. +0
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 0
- 18
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -120,24 +120,6 @@ public class WxBillAllController extends BaseController {
return new ResultData(result); return new ResultData(result);
} }


/**
* 应收、承付商户详情
* @param wxBillAll
* @return
*/
@GetMapping("receiveAndPayMerchantDetail")
@SystemControllerLog(description = "账单管理-应收、承付商户详情")
@ApiOperation("应收、承付商户详情")
public ResultData receiveAndPayMerchantDetail(@ModelAttribute WxBillAll wxBillAll) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantDetail");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
wxBillAll.setTenantId(getTenantId());
Map<String, Object> result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize);
return new ResultData(result);
}

/** /**
* 导出应收、承付商户列表 * 导出应收、承付商户列表
* @param wxBillAll * @param wxBillAll


+ 0
- 7
mallinkService/src/main/java/com/iformall/service/WxBillAllService.java Просмотреть файл

@@ -56,13 +56,6 @@ public interface WxBillAllService {
*/ */
Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize);


/**
* 应收和承付商户分页详情
*
* @return
*/
Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record);

void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response);


void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response);


+ 0
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -1576,11 +1576,6 @@ public class WxBillAllServiceImpl implements WxBillAllService {
excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false);
} }


@Override
public Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record) {
return null;
}

@Override @Override
public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) {
List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record);


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