Ver a proveniência

fix bill

release_toaliyun_real
zhengfangyuan há 3 anos
ascendente
cometimento
8fb39b8f98
5 ficheiros alterados com 99 adições e 3 eliminações
  1. +9
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +8
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillAllService.java
  4. +22
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  5. +58
    -0
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 9
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Ver ficheiro

@@ -78,6 +78,15 @@ public class WxBillAllController extends BaseController {
Map<String, Object> result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize);
return new ResultData(result);
}
@GetMapping("detail")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "编号", dataType = "long", paramType = "query", required = true),
@ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true)})
public ResultData detail( Long id, Integer type) {
Map<String, Object> result = wxBillAllService.detail(id, type);
return new ResultData(result);
}

@GetMapping("allDepositList")
@SystemControllerLog(description = "账单总览-所有押金列表")


+ 8
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java Ver ficheiro

@@ -27,7 +27,6 @@ public interface WxBillAllMapper {
List<WxBillAllVo> listOtherBill(WxBillAll record);
List<WxBillAllVo> listOtherDepositBill(WxBillAll record);

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

Map<String,Object> queryPaidInfo(WxBillAll record);
@@ -41,6 +40,14 @@ public interface WxBillAllMapper {
List<Map<String,Object>> listOtherDepositBillData(WxBillAll wxBillAll);
List<Map<String,Object>> listSettleBillData(WxBillAll wxBillAll);
Map<String,Object> detailRentBillData(@Param("id")Long id);
Map<String,Object> detailRentDepositBillData(@Param("id")Long id);
Map<String,Object> detailPropertyBillData(@Param("id")Long id);
Map<String,Object> detailPropertyDepositBillData(@Param("id")Long id);
Map<String,Object> detailDailyBillData(@Param("id")Long id);
Map<String,Object> detailOtherBillData(@Param("id")Long id);
Map<String,Object> detailOtherDepositBillData(@Param("id")Long id);
List<Map<String, Object>> getWaitPayBill();

List<Map<String, Object>> getOweBill();


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxBillAllService.java Ver ficheiro

@@ -29,6 +29,8 @@ public interface WxBillAllService {
ResultData pageListBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay);
List<Map<String, Object>> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasSet,boolean hasShop,boolean hasPayBill,boolean hasReceivePay);

Map<String,Object> detail(Long id,Integer type);
void updateBill(Map<String, Object> bill);

void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillAll wxBillAll);


+ 22
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Ver ficheiro

@@ -244,7 +244,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
}
return retList;
}
public void cmputeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillAllVo e) {
if (e.getReceivePay() != null) {
if (e.getLatePayPrice() == null) {
@@ -365,7 +365,27 @@ public class WxBillAllServiceImpl implements WxBillAllService {
return maps;
}

@Override
public Map<String,Object> detail(Long id,Integer type) {
if (type.equals(EnumBillQueryType.RENT.getCode())) {
return wxBillAllMapper.detailRentBillData(id);
} else if (type.equals(EnumBillQueryType.RENT_DEPOSIT.getCode())) {
return wxBillAllMapper.detailRentDepositBillData(id);
} else if (type.equals(EnumBillQueryType.PROPERTY.getCode())) {
return wxBillAllMapper.detailPropertyBillData(id);
} else if (type.equals(EnumBillQueryType.PROPERTY_DEPOSIT.getCode())) {
return wxBillAllMapper.detailPropertyDepositBillData(id);
} else if (type.equals(EnumBillQueryType.WATER_POWER_AIR.getCode())) {
return wxBillAllMapper.detailDailyBillData(id);
} else if (type.equals(EnumBillQueryType.OTHER.getCode())) {
return wxBillAllMapper.detailOtherBillData(id);
} else if (type.equals(EnumBillQueryType.OTHER_DEPOSIT.getCode())) {
return wxBillAllMapper.detailOtherDepositBillData(id);
}
return null;
}
@Override
public void updateBill(Map<String, Object> bill) {
int billTypeValue = ((Long) bill.get("billTypeValue")).intValue();


+ 58
- 0
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Ver ficheiro

@@ -384,7 +384,65 @@
from wx_bill_settle_schedule bill where bill.status >0
<include refid="billSql"/>
</select>
<select id="detailRentBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,'租金' name,1 billTypeValue,'租金' billType,
need_pay needPay,receive_pay receivePay,pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe,
receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime,rent_shop_type rentShopType,'' priceDetail,
freeze,ifnull(late_pay_price,0) latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_rent bill
where bill.id = #{id}
</select>
<select id="detailRentDepositBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchant_id,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,'租赁押金' name,2 billTypeValue,'租赁押金' billType,
need_pay needPay,receive_pay receivePay,pay,(receive_pay-pay) owe,receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,
status,starttime,endtime,rent_shop_type rentShopType,'' priceDetail,freeze,0 latePayPrice,0 serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_rent_deposit bill
where bill.id = #{id}
</select>
<select id="detailPropertyBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,'物业费' name,3 billTypeValue,'物业费' billType,
need_pay needPay,receive_pay receivePay,pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe,receive_date receiveDate,pay_date payDate,
DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime,rent_shop_type rentShopType,'' priceDetail,freeze,ifnull(late_pay_price,0) latePayPrice,
service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_property bill
where bill.id = #{id}
</select>
<select id="detailPropertyDepositBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,'物业押金' name,4 billTypeValue,'物业押金' billType,
need_pay needPay,receive_pay receivePay,pay,(receive_pay-pay) owe,receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,
endtime,rent_shop_type rentShopType,'' priceDetail,freeze,0 latePayPrice,0 serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_property_deposit bill
where bill.id = #{id}
</select>
<select id="detailDailyBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,
case when type=1 then '水费' when type=2 then '电费' else '空调费' end name,
case when type=1 then 5 when type=2 then 6 else 9 end billTypeValue,
case when type=1 then '水费' when type=2 then '电费' else '空调费' end billType, 0 as needPay,receive_pay receivePay,
pay,(receive_pay+service_charge_pay-pay) owe,receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,starttime,endtime,
rent_shop_type rentShopType,price_detail priceDetail,freeze,0 latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_daily bill where bill.id = #{id}
</select>
<select id="detailOtherBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,name,7 billTypeValue,'其他费用' billType,0 as needPay,
receive_pay receivePay,pay,(receive_pay+service_charge_pay-pay) owe,receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,'' starttime,'' endtime,
rent_shop_type rentShopType,'' priceDetail,freeze,0 latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_other bill where bill.id = #{id}
</select>

<select id="detailOtherDepositBillData" resultType="hashmap" parameterType="com.iformall.domain.vo.WxBillAll">
select '' settle_number,id,merchant_id merchantId,shop_id shopId,tenant_id tenantId,parent_tenant_id parentTenantId,comments as name,8 billTypeValue,'其他押金' billType,
0 as needPay,receive_pay receivePay,pay,(receive_pay+service_charge_pay-pay) owe,receive_date receiveDate,pay_date payDate,DATEDIFF(now(),receive_date) expiredDay,status,
'' starttime,'' endtime,rent_shop_type rentShopType,'' priceDetail,freeze,0 latePayPrice,service_charge_pay serviceChargePay,apply_status applyStatus,apply_pay_img applyPayImg,apply_update_time applyUpdateTime
from wx_bill_other_deposit bill where bill.id = #{id}
</select>
<select id="getWaitPayBill" resultType="hashmap">
select bill.tenant_id tenantId,bill.parent_tenant_id parentTenantId,bill.merchant_id merchantId,m.name merchantName,bill.receive_date receiveDate,
bill.need_pay needPay,m.link_phone linkPhone,app.appname,m.email,bill.bill_type billType from (


Carregando…
Cancelar
Guardar