diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index c9ad6cf6d..96c6f662a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -770,7 +770,7 @@ public class WxFinanceController extends BaseController { return new ResultData(Result.ERROR,"finishId参数不能为空"); } record.updateTenantInfo(getTenantInfo()); - wxFinanceService.auditReceive(record, getUser()); + wxFinanceService.auditFinish(record, getUser()); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 5e7604efc..f3265b56c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -84,7 +84,7 @@ public interface WxFinanceService { WxFinanceReceiveSumVo getReceiveSumByFinish(WxFinanceFinish record); WxFinanceReceiveSumVo getReceiveRedSetSumByFinish(WxFinanceFinish record); List getReceiveVoListByFinish(WxFinanceFinish record); - void auditReceive(WxFinanceFinish record,MallUserInfo user); + void auditFinish(WxFinanceFinish record,MallUserInfo user); Integer getReceiveUnFinisedCount(WxFinanceReceive record); void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user); void deleteFinish(WxFinanceFinish record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index f3dc4fb68..ae54688a7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1624,7 +1624,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override - public void auditReceive(WxFinanceFinish record, MallUserInfo user) { + public void auditFinish(WxFinanceFinish record, MallUserInfo user) { WxFinanceFinish finish = this.getFinishById(record, record.getId()); //更新批次, WxFinanceFinish ff = new WxFinanceFinish(); diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 074c94f95..eb778da43 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -171,8 +171,14 @@ update wx_finance_receive set is_finish = #{isFinish} - - and status not in (2,3,4) + where status not in (2,3,4) + + and id in + + #{idItem} + + +