From 0cfae728a16640048277237db02188d52ce3a6c0 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 30 Aug 2019 14:10:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=B4=A6=E5=8D=95=E7=BB=93=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/WxBillSettleController.java | 10 +++++ .../iformall/domain/po/WxBillSettleBill.java | 5 +++ .../iformall/enums/EnumSettleBillType.java | 37 ++++++++++++++++ .../mapper/WxBillSettleBillMapper.java | 2 +- .../service/impl/WxBillSettleServiceImpl.java | 12 +++++- .../mapper/WxBillSettleBillMapper.xml | 43 +++++++++++++++++++ 6 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumSettleBillType.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java index fba4b6dd5..5eae2cb64 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillSettleController.java @@ -2,6 +2,7 @@ package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.BaseEntity; @@ -49,6 +50,15 @@ public class WxBillSettleController extends BaseController { return new ResultData(page); } + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @ApiOperation("账单管理-结算单-id查找") + @SystemControllerLog(description = "账单管理-结算单-id查找") + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillSettleController::findById"); + return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id)); + } + @PostMapping("addOrUpdate") @ApiOperation("账单管理-结算单-新增或编辑") @SystemControllerLog(description = "账单管理-结算单-新增或编辑") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java index 0323776a6..5137b2efb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java @@ -37,5 +37,10 @@ public class WxBillSettleBill extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; + @Transient + private String billName; + @Transient + private String receivePay; + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSettleBillType.java b/mallinkService/src/main/java/com/iformall/enums/EnumSettleBillType.java new file mode 100644 index 000000000..a6fafdfe7 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSettleBillType.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumSettleBillType { + + // 0收款1承付 + R(0, "收款"), + P(1, "承付"), + ; + + public static EnumSettleBillType getEnum(Integer code) { + for (EnumSettleBillType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumSettleBillType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java index 59559616a..d611d6bf8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillSettleBillMapper.java @@ -10,7 +10,7 @@ import java.util.List; */ public interface WxBillSettleBillMapper extends CommonMapper { - List findList(WxBillSettleBill wxBillSettleBill); + List findBySettleId(WxBillSettleBill wxBillSettleBill); void update(WxBillSettleBill record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 232f29963..c0f7fa99e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.enums.EnumBillRentStatus; import com.iformall.enums.EnumBillType; +import com.iformall.enums.EnumSettleBillType; import com.iformall.mapper.*; import com.iformall.service.WxBillSettleService; import com.iformall.service.WxFlowService; @@ -51,10 +52,19 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { } @Override - public WxBillSettle getById(Long id) { + public WxBillSettle getById(Long id){ WxBillSettle billSettle = wxBillSettleMapper.selectByPrimaryKey(id); + if(billSettle != null) { + WxBillSettleBill wxBillSettleBill = new WxBillSettleBill(); + wxBillSettleBill.setTenantId(billSettle.getTenantId()); + wxBillSettleBill.setSettleId(billSettle.getId()); + wxBillSettleBill.setType(EnumSettleBillType.R.getCode()); + billSettle.setReceiveBillIds(wxBillSettleBillMapper.findBySettleId(wxBillSettleBill)); + wxBillSettleBill.setType(EnumSettleBillType.P.getCode()); + billSettle.setPayBillIds(wxBillSettleBillMapper.findBySettleId(wxBillSettleBill)); + } return billSettle; } diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index 0296dbf5c..2e38f0b47 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -12,6 +12,8 @@ + + @@ -41,6 +43,47 @@ + + delete from wx_bill_settle_bill where settle_id = #{id}