Kaynağa Gözat

fix

release_toaliyun_real
winter 2 yıl önce
ebeveyn
işleme
a289154e97
10 değiştirilmiş dosya ile 82 ekleme ve 65 silme
  1. +49
    -49
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java
  3. +3
    -2
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  4. +3
    -2
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  5. +4
    -2
      mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml
  6. +4
    -2
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  7. +4
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  8. +3
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  9. +3
    -2
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  10. +4
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 49
- 49
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Dosyayı Görüntüle

@@ -317,31 +317,31 @@ public class WxBillAllController extends BaseController {
}
// /**
// * 欠缴商户列表
// * @param wxBillAll
// * @param pageNum
// * @param pageSize
// * @return
// */
// @GetMapping("oweMerchantlist")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
// @SystemControllerLog(description = "费用收缴数据-欠缴商户列表")
// public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist");
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// //默认查当月第一天到今天
// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize);
// return new ResultData(result);
// }
/**
* 欠缴商户列表
* @param wxBillAll
* @param pageNum
* @param pageSize
* @return
*/
@GetMapping("oweMerchantlist")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "费用收缴数据-欠缴商户列表")
public ResultData oweMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
//默认查当月第一天到今天
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59");
}
wxBillAll.updateTenantInfo(getTenantInfo());
Map<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize);
return new ResultData(result);
}

@@ -422,30 +422,30 @@ public class WxBillAllController extends BaseController {
// }


// /**
// * 应收、承付商户列表
// * @param wxBillAll
// * @param pageNum
// * @param pageSize
// * @return
// */
// @GetMapping("receiveAndPayMerchantlist")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
// @SystemControllerLog(description = "账单管理-应收、承付商户列表")
// @ApiOperation("应收、承付商户列表")
// public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
// logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist");
// if (null == wxBillAll) {
// wxBillAll = new WxBillAll();
// }
// wxBillAll.updateTenantInfo(getTenantInfo());
// PageInfo<Map> page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize);
// Map<String, Object> result = new HashMap<>();
// result.put("pageInfo", page);
// return new ResultData(result);
// }
/**
* 应收、承付商户列表
* @param wxBillAll
* @param pageNum
* @param pageSize
* @return
*/
@GetMapping("receiveAndPayMerchantlist")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "账单管理-应收、承付商户列表")
@ApiOperation("应收、承付商户列表")
public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
wxBillAll.updateTenantInfo(getTenantInfo());
PageInfo<Map> page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize);
Map<String, Object> result = new HashMap<>();
result.put("pageInfo", page);
return new ResultData(result);
}

/**
* 导出应收、承付商户列表


+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java Dosyayı Görüntüle

@@ -64,9 +64,14 @@ public class WxBillBaseEntity extends TenantEntity {
@TableField(exist = false)
protected String realReceivePay;

@Excel(name = "实际应收总金额(元)(包括滞纳金服务费等)", width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value="账单类型名称",name="billTypeName")
protected String billTypeName;
@Excel(name = "实际应收总金额(元)(包括滞纳金服务费等)", width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value="备注",name="billRemark")
protected String billRemark;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false)
protected Long building;


+ 3
- 2
mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml Dosyayı Görüntüle

@@ -33,12 +33,13 @@
<result column="build_way" property="buildWay"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" jdbcType="VARCHAR" property="billRemark"/>
</resultMap>
<sql id="allColumns">
`id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`tenant_id`,`parent_tenant_id`,`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`type`,
`rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,
`rent_shop_type`,`pay_way`,`price_detail`,`starttime`,`endtime`,freeze,build_way,service_charge_pay,`bill_remark`,
case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name
</sql>

@@ -119,7 +120,7 @@
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` ,
case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id,
br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`bill_remark`,
case type when 1 then '水费' when 2 then '电费' when 3 then '空调费' else '日常费用' end bill_type_name
from wx_bill_daily br
<include refid="queryBillDailyListConditions" />


+ 3
- 2
mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml Dosyayı Görüntüle

@@ -32,12 +32,13 @@
<result column="merchant_name" property="merchantName"/>
<result column="shop_number" property="shopNumber"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,
`expired_day`,`owe`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name
`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark
</sql>

<sql id="dynamicWhereConditions">
@@ -96,7 +97,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="BaseResultMap">
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,
br.`owe`,br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,'租赁押金' bill_type_name
br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,'租赁押金' bill_type_name,'' bill_remark
from wx_bill_rent_deposit br
<include refid="queryBillRentListCondition"/>
order by br.id desc


+ 4
- 2
mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml Dosyayı Görüntüle

@@ -34,12 +34,14 @@
<result column="endtime" property="endtime"/>
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,
`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay
`rent_shop_type`,`return_price`,`pay_way`,`starttime`,`endtime`,freeze,service_charge_pay,'其他押金' bill_type_name,CONCAT(`name`,',',`comments`) bill_remark
</sql>
<sql id="dynamicWhereConditions">
@@ -121,7 +123,7 @@
<select id="queryBillList" parameterType="com.iformall.domain.po.WxBillOtherDeposit" resultMap="BaseResultMap">
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,
br.`owe`,br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay
br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他押金' bill_type_name,CONCAT(`name`,',',`comments`) bill_remark
from wx_bill_other_deposit br
<include refid="queryBillListConditions"/>
<if test=" null != sortColumns"> order by ${sortColumns} </if>


+ 4
- 2
mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml Dosyayı Görüntüle

@@ -35,12 +35,14 @@
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,`expired_day`,
`owe`,`status`,`is_del`,`merchant_id`,`user_id`,`shop_id`,`shop_name`,`updatetime`,`name`,`comments`,
`rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`,'其他费用' bill_type_name
`rent_shop_type`,`pay_way`,`starttime`,`endtime`,endtime,service_charge_pay,`apply_status`,`apply_pay_img`,`apply_update_time`,
'其他费用' bill_type_name, CONCAT(`name`,',',`comments`) bill_remark
</sql>

<sql id="dynamicWhereConditions">
@@ -118,7 +120,7 @@
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`,
case when br.status=1 then br.owe else 0 end owe,br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`,
br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`,
br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他费用' bill_type_name
br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay,'其他费用' bill_type_name, CONCAT(br.`name`,',',br.`comments`) bill_remark
from wx_bill_other br
<include refid="queryBillListConditions" />
<if test=" null != sortColumns"> order by ${sortColumns} </if>


+ 4
- 2
mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml Dosyayı Görüntüle

@@ -32,12 +32,14 @@
<result column="merchant_name" property="merchantName"/>
<result column="shop_number" property="shopNumber"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`property_contract_id`,`receive_pay`,`pay`,`receive_date`,
`pay_date`,`createtime`,`expired_day`,`owe`,`status`,`is_del`,`need_pay`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay,'物业押金' bill_type_name
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`return_price`,`shop_info`,`pay_way`,freeze,service_charge_pay,
'物业押金' bill_type_name,'' bill_remark
</sql>

<sql id="dynamicWhereConditions">
@@ -127,7 +129,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="BaseResultMap">
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`owe`,br.`status`,
br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,'物业押金' bill_type_name
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,'物业押金' bill_type_name,'' bill_remark
from wx_bill_property_deposit br
<include refid="queryBillDepositListConditions"/>
order by id desc


+ 3
- 2
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Dosyayı Görüntüle

@@ -47,6 +47,7 @@
<result column="freeze" property="freeze"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
</resultMap>

<sql id="allColumns">
@@ -54,7 +55,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,'物业费' bill_type_name
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,freeze,service_charge_pay,'物业费' bill_type_name,'' bill_remark
</sql>

<sql id="dynamicWhereConditions">
@@ -163,7 +164,7 @@
case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`period`,
br.`revenue`,br.`late_pay_time`,br.`property_contract_id`,br.late_pay_price,br.`shop_info`,br.pay_way,br.late_pay_status,
br.`comments`,br.starttime,br.endtime,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.freeze,br.service_charge_pay,
br.`late_pay_ratio`,'物业费' bill_type_name
br.`late_pay_ratio`,'物业费' bill_type_name,'' bill_remark
from wx_bill_property br
<include refid="queryBillPropertyListConditions"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>


+ 3
- 2
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml Dosyayı Görüntüle

@@ -40,6 +40,7 @@
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
</resultMap>

<sql id="allColumns">
@@ -47,7 +48,7 @@
`createtime`,`expired_day`,`owe`,`status`,`apply_status`,`apply_pay_img`,`apply_update_time`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,
`period`,`shop_info`,`pay_way`,`late_pay_status`,starttime,endtime,freeze,service_charge_pay,manage_fee_type,
case manage_fee_type when 1 then '商业管理费' when 2 then '运营管理费' else '管理费' end bill_type_name
case manage_fee_type when 1 then '商业管理费' when 2 then '运营管理费' else '管理费' end bill_type_name,'' bill_remark
</sql>

<sql id="dynamicWhereConditions">
@@ -142,7 +143,7 @@
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.starttime,br.endtime,
br.freeze,br.service_charge_pay,br.manage_fee_type,br.`late_pay_ratio`,
case br.manage_fee_type when 1 then '商业管理费' when 2 then '运营管理费' else '管理费' end bill_type_name
case br.manage_fee_type when 1 then '商业管理费' when 2 then '运营管理费' else '管理费' end bill_type_name,'' bill_remark
from wx_bill_rent_manage br
<include refid="queryBillManageListConditions"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>


+ 4
- 2
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Dosyayı Görüntüle

@@ -56,6 +56,7 @@
<result column="join_rent_price" property="joinRentPrice"/>
<result column="service_charge_pay" property="serviceChargePay"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
</resultMap>

<sql id="allColumns">
@@ -63,7 +64,7 @@
`createtime`,`expired_day`,`owe`,`status`,`is_del`,`contract_need_pay`,`rent_price_info`,`need_pay`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay,'租金' bill_type_name
`pay_way`,`late_pay_status`,`comments`,starttime,endtime,bus_discount_ratio,freeze,join_rent_price,service_charge_pay,'租金' bill_type_name,'' bill_remark
</sql>

<sql id="dynamicWhereConditions">
@@ -160,7 +161,8 @@
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,
case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`contract_need_pay`,br.`rent_price_info`,br.`need_pay`,br.`bussiness_manage_fee_need_pay`,br.`operating_manage_fee_need_pay`,
br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`revenue`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`,
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay,'租金' bill_type_name
br.late_pay_price,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime,br.bus_discount_ratio,br.freeze,br.join_rent_price,br.service_charge_pay,
'租金' bill_type_name,'' bill_remark
from wx_bill_rent br
<include refid="queryBillRentListCondition"/>
<if test=" null != sortColumns">order by ${sortColumns}</if>


Yükleniyor…
İptal
Kaydet