winter 1 год назад
Родитель
Сommit
75c6e3cc97
3 измененных файлов: 16 добавлений и 0 удалений
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  3. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

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

@@ -689,6 +689,14 @@ public class WxFinanceController extends BaseController {
return new ResultData(page);
}
@ApiOperation("交款红冲总计")
@PostMapping("finishRedSetSum")
public ResultData finishRedSetSum(@RequestBody WxFinanceFinish record) {
record.updateTenantInfo(getTenantInfo());
WxFinanceReceiveSumVo page = wxFinanceService.getReceiveRedSetSumByFinish(record);
return new ResultData(page);
}
@ApiOperation("交款收付单列表")
@PostMapping("finishReceiveList")
public ResultData finishReceiveList(@RequestBody WxFinanceFinish record) {


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

@@ -82,6 +82,7 @@ public interface WxFinanceService {
List<WxFinanceReceivePayway> getReceivePaywaysSum(WxFinanceFinish record);
List<WxFinanceReceiveBill> getReceiveFeesSum(WxFinanceFinish record);
WxFinanceReceiveSumVo getReceiveSumByFinish(WxFinanceFinish record);
WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record);
List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record);
void auditReceive(WxFinanceFinish record,MallUserInfo user);
Integer getReceiveUnFinisedCount(WxFinanceReceive record);


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

@@ -1800,6 +1800,13 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxFinanceReceive fr = generateReceiveQueryByFinish(record);
return wxFinanceReceiveMapper.getReceiveSum(fr);
}
@Override
public WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record) {
WxFinanceReceive fr = generateReceiveQueryByFinish(record);
fr.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode());
return wxFinanceReceiveMapper.getReceiveSum(fr);
}

@Override
public List<WxFinanceReceiveVo> getReceiveVoListByFinish(WxFinanceFinish record) {


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