diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java new file mode 100644 index 000000000..0fa0f4132 --- /dev/null +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -0,0 +1,39 @@ +package com.iformall.controller; + + +import com.iformall.common.ResultData; +import com.iformall.domain.vo.WxBillAll; +import com.iformall.service.WxBillAllService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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 java.util.List; +import java.util.Map; + +/** + * @author gongbiao + */ +@RestController +@Api(description = "账单") +@RequestMapping("/api/bill") +public class WxBillController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxBillAllService wxBillAllService; + + @ApiOperation("所有欠缴和待缴的数据") + @PostMapping("listBillOweAndWaitPay") + public ResultData listBillOweAndWaitPay(@RequestBody WxBillAll wxBillAll) { + List> result=wxBillAllService.listBillOweAndWaitPay(wxBillAll); + return new ResultData(result); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java index dbf822fad..b1506100d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java @@ -1,5 +1,8 @@ package com.iformall.domain.vo; +import java.util.Date; +import java.util.List; + /** * @author gongbiao */ @@ -20,6 +23,83 @@ public class WxBillAll { @io.swagger.annotations.ApiModelProperty(value="日期",name="month") private String month; + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") + private Date starttime; + + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") + private Date endtime; + + @io.swagger.annotations.ApiModelProperty(value="商户Id",name="merchantId") + private Long merchantId; + + @io.swagger.annotations.ApiModelProperty(value="多个状态",name="statusList") + private List statusList; + + @io.swagger.annotations.ApiModelProperty(value="多个账单类型",name="typeList") + private List typeList; + + @io.swagger.annotations.ApiModelProperty(value="页码",name="pageIndex") + private Integer pageIndex; + + @io.swagger.annotations.ApiModelProperty(value="条数",name="pageSize") + private Integer pageSize; + + public Integer getPageIndex() { + return pageIndex; + } + + public void setPageIndex(Integer pageIndex) { + this.pageIndex = pageIndex; + } + + public Integer getPageSize() { + return pageSize; + } + + public void setPageSize(Integer pageSize) { + this.pageSize = pageSize; + } + + public List getStatusList() { + return statusList; + } + + public void setStatusList(List statusList) { + this.statusList = statusList; + } + + public List getTypeList() { + return typeList; + } + + public void setTypeList(List typeList) { + this.typeList = typeList; + } + + public Date getStarttime() { + return starttime; + } + + public void setStarttime(Date starttime) { + this.starttime = starttime; + } + + public Date getEndtime() { + return endtime; + } + + public void setEndtime(Date endtime) { + this.endtime = endtime; + } + + public Long getMerchantId() { + return merchantId; + } + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; + } + public String getTenantId() { return tenantId; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index ba7a3c31e..6b9d28eb1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -19,4 +19,6 @@ public interface WxBillAllMapper extends CommonMapper { Map queryPaidInfo(WxBillAll record); + List> listData(WxBillAll wxBillAll); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 7af7af202..476e1727b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.iformall.domain.vo.WxBillAll; +import java.util.List; import java.util.Map; /** @@ -11,4 +12,6 @@ public interface WxBillAllService { Map listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); + List> listBillOweAndWaitPay(WxBillAll wxBillAll); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 04431a3af..03039f213 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -65,6 +66,17 @@ public class WxBillAllServiceImpl implements WxBillAllService { return result; } + @Override + public List> listBillOweAndWaitPay(WxBillAll wxBillAll) { + //更新各账单状态 + updateBillStatus(wxBillAll); + ArrayList statusList = new ArrayList<>(); + statusList.add(EnumBillRentStatus.NOT_PAID.getCode()); + statusList.add(EnumBillRentStatus.WAIT_PAY.getCode()); + wxBillAll.setStatusList(statusList); + return wxBillAllMapper.listData(wxBillAll); + } + private void updateBillStatus(WxBillAll record) { logger.info("更新各账单状态开始"); //更新日常账单状态 diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 3c9651a95..82cf199b3 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -71,5 +71,46 @@ + +