Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
fe5e7da81b
2 ha cambiato i file con 13 aggiunte e 12 eliminazioni
  1. +11
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 11
- 11
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Vedi File

@@ -722,17 +722,6 @@ public class WxFinanceController extends BaseController {
return new ResultData();
}
@ApiOperation("审核/反审核交款")
@PostMapping("auditFinish")
public ResultData auditFinish(@RequestBody WxFinanceFinish record) {
if (null == record.getId()) {
return new ResultData(Result.ERROR,"finishId参数不能为空");
}
record.updateTenantInfo(getTenantInfo());
wxFinanceService.auditReceive(record, getUser());
return new ResultData();
}
@ApiOperation("删除交款")
@PostMapping("deleteFinish")
public ResultData deleteFinish(@RequestBody WxFinanceFinish record) {
@@ -758,6 +747,17 @@ public class WxFinanceController extends BaseController {
return new ResultData();
}
@ApiOperation("审核/反审核交款")
@PostMapping("auditFinish")
public ResultData auditFinish(@RequestBody WxFinanceFinish record) {
if (null == record.getId()) {
return new ResultData(Result.ERROR,"finishId参数不能为空");
}
record.updateTenantInfo(getTenantInfo());
wxFinanceService.auditReceive(record, getUser());
return new ResultData();
}
@ApiOperation("批次审核/反审核单据结账")
@PostMapping("batchReceiveFinish")
public ResultData batchReceiveFinish(@RequestBody WxFinanceFinish record) {


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Vedi File

@@ -1628,7 +1628,8 @@ public class WxFinanceServiceImpl implements WxFinanceService {
ff.setUpdateTime(new Date());
ff.setUpdateBy(user.getId());
ff.setUpdateByName(user.getName());
wxFinanceFinishMapper.updateById(ff);
ff.setAuditRemark(record.getAuditRemark());
wxFinanceFinishMapper.updateById(ff);
//更新收付款记录
WxFinanceFinishReceive ffr = new WxFinanceFinishReceive();
ffr.updateTenantInfo(record);


Caricamento…
Annulla
Salva