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 2db40e1eb..8281d796f 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.WxFinanceReceiveSetoff; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.FinanceBillSetoffSum; +import com.iformall.domain.vo.WxFinanceReceiveBillSum; import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.enums.EnumBillAllType; @@ -439,6 +440,15 @@ public class WxFinanceController extends BaseController { return new ResultData(page); } + @ApiOperation("收款记录子账单求和") + @GetMapping("receiveBillSum") + public ResultData receiveBillSum(@ModelAttribute WxFinanceReceiveBill record) { + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + WxFinanceReceiveBillSum sum = wxFinanceService.receiveBillSum(record); + return new ResultData(sum); + } + @ApiOperation("收款记录子账单列表") @GetMapping("receiveBillListExport") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveBillSum.java new file mode 100644 index 000000000..ae7581aed --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveBillSum.java @@ -0,0 +1,16 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; + +@Data +public class WxFinanceReceiveBillSum implements Serializable { + + private static final long serialVersionUID = 1L; + + //收款总金额 + private String receive = "0"; + //付款总金额 + private String pay = "0"; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveBillMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveBillMapper.java index 951925fb6..8685a2c49 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveBillMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveBillMapper.java @@ -2,6 +2,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxFinanceReceiveBill; +import com.iformall.domain.vo.WxFinanceReceiveBillSum; + import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,5 +18,7 @@ public interface WxFinanceReceiveBillMapper extends CommonMapper findBillIdList(WxFinanceReceiveBill wxBillRent); + + WxFinanceReceiveBillSum findSum(WxFinanceReceiveBill wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 81096aa6b..2ed9895dd 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -23,6 +23,7 @@ import com.iformall.domain.po.WxFinanceReceivePayway; import com.iformall.domain.po.WxFinanceReceiveSetoff; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.FinanceBillSetoffSum; +import com.iformall.domain.vo.WxFinanceReceiveBillSum; import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveVo; /** @@ -41,6 +42,7 @@ public interface WxFinanceService { PageInfo receiveVoListWithBillsAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); PageInfo receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); PageInfo receiveBillListAsPage(WxFinanceReceiveBill record, Integer pageIndex, Integer pageSize); + WxFinanceReceiveBillSum receiveBillSum(WxFinanceReceiveBill record); void exportReceiveBill(WxFinanceReceiveBill record,HttpServletRequest request, HttpServletResponse response); List findReceiveList(WxFinanceReceive record); Map createReceive(WxFinanceReceive record,MallUserInfo user); 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 086efd63c..0ca0d4817 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -32,6 +32,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.FinanceAdvanceBillVo; import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.FinanceSetOffDetailVo; +import com.iformall.domain.vo.WxFinanceReceiveBillSum; import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.enums.EnumBillAllType; @@ -603,6 +604,12 @@ public class WxFinanceServiceImpl implements WxFinanceService { return page; } + @Override + public WxFinanceReceiveBillSum receiveBillSum(WxFinanceReceiveBill record) { + initReceiveBillQueryParam(record); + return wxFinanceReceiveBillMapper.findSum(record); + } + private void initReceiveBillQueryParam(WxFinanceReceiveBill record) { if (StringUtils.isNotBlank(record.getMerchantName()) || StringUtils.isNotBlank(record.getShopNumber())) { record.setMerchantName(StringContentUtils.unescapeHtml(record.getMerchantName())); diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml index cfa294a64..36b9e873c 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml @@ -100,6 +100,17 @@ + + + + +