| @@ -120,6 +120,24 @@ public class WxBillAllController extends BaseController { | |||||
| return new ResultData(result); | return new ResultData(result); | ||||
| } | } | ||||
| /** | |||||
| * 应收、承付商户详情 | |||||
| * @param wxBillAll | |||||
| * @return | |||||
| */ | |||||
| @GetMapping("receiveAndPayMerchantDetail") | |||||
| @SystemControllerLog(description = "账单管理-应收、承付商户详情") | |||||
| @ApiOperation("应收、承付商户详情") | |||||
| public ResultData receiveAndPayMerchantDetail(@ModelAttribute WxBillAll wxBillAll) { | |||||
| logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantDetail"); | |||||
| if (null == wxBillAll) { | |||||
| wxBillAll = new WxBillAll(); | |||||
| } | |||||
| wxBillAll.setTenantId(getTenantId()); | |||||
| Map<String, Object> result = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); | |||||
| return new ResultData(result); | |||||
| } | |||||
| /** | /** | ||||
| * 导出应收、承付商户列表 | * 导出应收、承付商户列表 | ||||
| * @param wxBillAll | * @param wxBillAll | ||||
| @@ -49,4 +49,6 @@ public interface WxBillAllMapper { | |||||
| */ | */ | ||||
| List<Map<String, Object>> getReceiveAndPayBillAsPage(WxBillAll record); | List<Map<String, Object>> getReceiveAndPayBillAsPage(WxBillAll record); | ||||
| Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record); | |||||
| } | } | ||||
| @@ -56,6 +56,13 @@ public interface WxBillAllService { | |||||
| */ | */ | ||||
| Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); | Map<String, Object> getReceiveAndPayBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); | ||||
| /** | |||||
| * 应收和承付商户分页详情 | |||||
| * | |||||
| * @return | |||||
| */ | |||||
| Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record); | |||||
| void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | ||||
| void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); | ||||
| @@ -1576,6 +1576,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); | excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false); | ||||
| } | } | ||||
| @Override | |||||
| public Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record) { | |||||
| return null; | |||||
| } | |||||
| @Override | @Override | ||||
| public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { | public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) { | ||||
| List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); | List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record); | ||||
| @@ -642,7 +642,7 @@ | |||||
| </select> | </select> | ||||
| <select id="getReceiveAndPayBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> | <select id="getReceiveAndPayBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> | ||||
| select m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_line_phone linkPhone, | |||||
| select m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_line_phone linkPhone,xb.title business,rc.rental_start_date,rc.rental_end_date, | |||||
| round( | round( | ||||
| (select sum(bill.receive_pay) from ( | (select sum(bill.receive_pay) from ( | ||||
| @@ -731,8 +731,11 @@ | |||||
| )/100,2)) balance | )/100,2)) balance | ||||
| from wx_merchant m left join wx_merchant_shop wms on wms.merchant_id = m.id left join wx_shop ws on wms.shop_id = ws.id | from wx_merchant m left join wx_merchant_shop wms on wms.merchant_id = m.id left join wx_shop ws on wms.shop_id = ws.id | ||||
| left join wx_business xb on(m.business_id = xb.id) | |||||
| left join wx_rent_contract rc on(rc.merchant_id = m.id) | |||||
| where 1=1 | where 1=1 | ||||
| <if test=" null != tenantId"> and m.tenant_id = #{tenantId} </if> | <if test=" null != tenantId"> and m.tenant_id = #{tenantId} </if> | ||||
| <if test=" null != merchantId"> and m.id = #{merchantId} </if> | |||||
| <if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> | <if test=" null != merchantName"> and m.name like concat('%', #{merchantName},'%') </if> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| @@ -741,4 +744,6 @@ | |||||
| </mapper> | </mapper> | ||||