Просмотр исходного кода

[合同][修改][开发账单结算]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
df910df819
5 измененных файлов: 38 добавлений и 1 удалений
  1. +18
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
  3. +7
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillAllService.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  5. +6
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 18
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -120,6 +120,24 @@ public class WxBillAllController extends BaseController {
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


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java Просмотреть файл

@@ -49,4 +49,6 @@ public interface WxBillAllMapper {
*/
List<Map<String, Object>> getReceiveAndPayBillAsPage(WxBillAll record);

Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record);

}

+ 7
- 0
mallinkService/src/main/java/com/iformall/service/WxBillAllService.java Просмотреть файл

@@ -56,6 +56,13 @@ public interface WxBillAllService {
*/
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 exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response);


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -1576,6 +1576,11 @@ public class WxBillAllServiceImpl implements WxBillAllService {
excelService.exportExcel(list, null, name, OweMerchantVo.class, name + ".xlsx", response, false);
}

@Override
public Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record) {
return null;
}

@Override
public void exportReceiveAndPayBillAsPage(WxBillAll record, HttpServletRequest request, HttpServletResponse response) {
List<Map<String, Object>> data = wxBillAllMapper.getReceiveAndPayBillAsPage(record);


+ 6
- 1
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Просмотреть файл

@@ -642,7 +642,7 @@
</select>

<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(
(select sum(bill.receive_pay) from (
@@ -731,8 +731,11 @@
)/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
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
<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 != sortColumns"> order by ${sortColumns} </if>
@@ -741,4 +744,6 @@





</mapper>

Загрузка…
Отмена
Сохранить