From f456b96780118a972f14446b7995fdfcda7d68e1 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 2 Sep 2019 16:57:58 +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 --- .../iformall/controller/WxBillController.java | 22 +++-- .../com/iformall/domain/po/WxBillSettle.java | 4 + .../iformall/domain/po/WxBillSettleBill.java | 7 +- .../com/iformall/enums/EnumSettleWay.java | 36 +++++++ .../service/impl/WxBillSettleServiceImpl.java | 5 + .../main/resources/mapper/WxBillAllMapper.xml | 99 +++++++++++++++++-- .../mapper/WxBillSettleBillMapper.xml | 22 +++-- 7 files changed, 168 insertions(+), 27 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumSettleWay.java diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index e4f584ebd..0ac69f54f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -2,23 +2,23 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxBillAll; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxBillAllService; +import com.iformall.service.WxBillSettleService; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -34,12 +34,10 @@ public class WxBillController extends BaseController { @Autowired WxBillAllService wxBillAllService; - - @Autowired - WxMerchantBUserService wxMerchantBUserService; - @Autowired WxMerchantService wxMerchantService; + @Autowired + WxBillSettleService wxBillSettleService; @ApiOperation("所有欠缴和待缴的数据") @PostMapping("listBillOweAndWaitPay") @@ -90,4 +88,12 @@ public class WxBillController extends BaseController { return wxBillAllService.listBill(wxBillAll); } + + @GetMapping("/findSettleById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @ApiOperation("账单管理-结算单-id查找") + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS, "查询成功", wxBillSettleService.getById(id)); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java index 5c40af608..5d9bcaba9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -83,4 +83,8 @@ public class WxBillSettle extends BaseEntity { @Transient @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") private Date endTime; + + @Transient + @io.swagger.annotations.ApiModelProperty(value="清算方向 1商场结款 2商户结款",name="settleWay") + private Integer settleWay; } 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 5137b2efb..970fb621c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettleBill.java @@ -37,10 +37,15 @@ public class WxBillSettleBill extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; + @io.swagger.annotations.ApiModelProperty(value="账单类型/名称",name="billName") @Transient private String billName; + @io.swagger.annotations.ApiModelProperty(value="应收金额",name="receivePay") @Transient private String receivePay; - + @io.swagger.annotations.ApiModelProperty(value="账单开始时间",name="starttime") + private Date starttime; + @io.swagger.annotations.ApiModelProperty(value="账单结束时间",name="endtime") + private Date endtime; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSettleWay.java b/mallinkService/src/main/java/com/iformall/enums/EnumSettleWay.java new file mode 100644 index 000000000..96aea91e5 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSettleWay.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumSettleWay { + + M(1, "商场结款"), + B(2, "商户结款"), + ; + + public static EnumSettleWay getEnum(Integer code) { + for (EnumSettleWay value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumSettleWay(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/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 8d9b14d85..dbde10048 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -69,6 +69,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { WxBillSettle billSettle = wxBillSettleMapper.selectByPrimaryKey(id); if(billSettle != null) { + if(billSettle.getReceiveMoney() > billSettle.getPayMoney()){ + billSettle.setSettleWay(EnumSettleWay.B.getCode()); + }else{ + billSettle.setSettleWay(EnumSettleWay.M.getCode()); + } WxBillSettleBill wxBillSettleBill = new WxBillSettleBill(); wxBillSettleBill.setTenantId(billSettle.getTenantId()); wxBillSettleBill.setSettleId(billSettle.getId()); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 424f1359b..a8feded4b 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -240,58 +240,141 @@