From 6471d435c7ac931a162f1052b6ec42168983bca2 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 21:15:27 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 25 +++++++++++++++++++ .../enums/EnumFinanceReceiveStatus.java | 2 +- .../impl/WxFinancePrintServiceImpl.java | 4 ++- 3 files changed, 29 insertions(+), 2 deletions(-) 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 82a31160b..ed675efc0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -19,6 +19,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumFinanceCashierType; import com.iformall.enums.EnumFinanceFinishStatus; import com.iformall.enums.EnumFinanceReceiveStatus; import com.iformall.enums.EnumFinanceReceiveType; @@ -258,6 +259,18 @@ public class WxFinanceController extends BaseController { return new ResultData(list); } + @GetMapping("cashierTypes") + public ResultData cashierTypes() { + List list = new ArrayList(); + for (EnumFinanceCashierType t : EnumFinanceCashierType.values()) { + Map m = new HashMap(); + m.put("id", t.getCode()); + m.put("name", t.getMessage()); + list.add(m); + } + return new ResultData(list); + } + @ApiOperation("收款记录列表") @GetMapping("receiveList") @ApiImplicitParams({ @@ -331,6 +344,18 @@ public class WxFinanceController extends BaseController { return new ResultData(list); } + @GetMapping("finishReceiveStatus") + public ResultData finishReceiveStatus() { + List list = new ArrayList(); + for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getFinishStatus()) { + Map m = new HashMap(); + m.put("id", t.getCode()); + m.put("name", t.getMessage()); + list.add(m); + } + return new ResultData(list); + } + @ApiOperation("过账列表") @GetMapping("finishList") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java index 4a9cd627e..a23b50292 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceReceiveStatus.java @@ -39,7 +39,7 @@ public enum EnumFinanceReceiveStatus { return message; } - public static List getSetoff() { + public static List getFinishStatus() { List list = new ArrayList(); list.add(NORMAL); list.add(FINISH); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index 0dae107f0..a7a084ccd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -16,6 +16,7 @@ import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.WxFinanceReceive; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumFinancePrintDataType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxFinancePrintDataMapper; import com.iformall.mapper.WxFinancePrintTemplateMapper; @@ -113,7 +114,8 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { t.setCreateTime(new Date()); t.setUpdateTime(new Date()); t.setName(t.getName()+"复制"); - wxFinancePrintTemplateMapper.insert(record); + t.setIsDel(EnumYesOrNo.NO.getCode()); + wxFinancePrintTemplateMapper.insert(t); } @Override