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 96ecc1822..ead2d17bb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -219,6 +219,15 @@ public class WxFinanceController extends BaseController { return new ResultData(tmap); } + @GetMapping("receiveSetoffStatus") + public ResultData receiveSetoffStatus() { + Map tmap = new HashMap(); + for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getSetoff()) { + tmap.put(t.getCode(), t); + } + return new ResultData(tmap); + } + @GetMapping("receiveTypes") public ResultData receiveTypes() { Map tmap = new HashMap(); @@ -282,4 +291,12 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("过账") + @PostMapping("receiveFinish") + public ResultData receiveFinish(@RequestBody WxFinanceReceive record) { + record.updateTenantInfo(getTenantInfo()); + wxFinanceService.finishReceive(record, getUser()); + return new ResultData(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java index 6afc988da..4a9cd627e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java @@ -1,5 +1,7 @@ package com.iformall.enums; +import java.util.ArrayList; +import java.util.List; /** */ @@ -36,4 +38,11 @@ public enum EnumFinanceReceiveStatus { public String getMessage() { return message; } + + public static List getSetoff() { + List list = new ArrayList(); + list.add(NORMAL); + list.add(FINISH); + return list; + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java index a8a71be4d..a4945f067 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java @@ -16,5 +16,7 @@ public interface WxFinanceReceiveMapper extends CommonMapper getMerchantAdvanceGroupSumList(WxFinanceReceive record); + + void finish(WxFinanceReceive wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 1b72b0ed0..140f79a35 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -30,6 +30,7 @@ public interface WxFinanceService { WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); void redSetoffReceive(WxFinanceReceive record,MallUserInfo user); + void finishReceive(WxFinanceReceive record,MallUserInfo user); //预收款 List calcuetSetOff(FinanceSetOffDTO dto,MallUserInfo user); FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive 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 483998c09..6eb35daca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -761,6 +761,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { record.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); wxFinanceReceiveMapper.insert(record); } + + @Override + public void finishReceive(WxFinanceReceive record, MallUserInfo user) { + wxFinanceReceiveMapper.finish(record); + } @Override public PageInfo receiveSetoffListAsPage(WxFinanceReceive record, Integer pageIndex, diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 18243310a..1b9f34f19 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -89,6 +89,14 @@ and money - use_money > 0 group by fees_id + + + update wx_finance_receive set status = 4 where status = 1 + and id in + + #{idItem} + +