Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
8a180c3563
9 ha cambiato i file con 347 aggiunte e 209 eliminazioni
  1. +317
    -0
      mallinkAdmin/src/main/resources/db/migration/V202411000000001.sql
  2. +0
    -5
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java
  3. +8
    -11
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java
  4. +0
    -75
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  5. +0
    -49
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
  6. +12
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java
  7. +4
    -10
      mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml
  8. +1
    -10
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml
  9. +5
    -40
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml

+ 317
- 0
mallinkAdmin/src/main/resources/db/migration/V202411000000001.sql Vedi File

@@ -30,6 +30,18 @@ alter table wx_rent_contract_agile_un_deposit_item drop column merchant_id;
alter table wx_rent_contract drop column is_private_merchant;
alter table wx_rent_contract drop column private_rent_shop_type;

alter table wx_property_contract drop column merchant_id;
alter table wx_property_contract drop column merchant_name;
alter table wx_property_contract drop column is_private_merchant;
alter table wx_property_contract drop column private_rent_shop_type;
alter table wx_property_contract drop column brand;
alter table wx_property_contract drop column business_id;
alter table wx_property_contract drop column shop_type;
alter table wx_property_contract drop column shop_ids;
alter table wx_property_contract drop column shop_numbers;
alter table wx_property_contract drop column pay_date;


#此处要把万星的合同,根据商户的刷成customers_id (商业和soho的)
alter table wx_rent_contract add column customers_id bigint(20) not null comment '客户ID';

@@ -369,4 +381,309 @@ alter table wx_all_bill_97 modify column shop_id bigint(20) not null;
alter table wx_all_bill_98 modify column shop_id bigint(20) not null;
alter table wx_all_bill_99 modify column shop_id bigint(20) not null;

alter table wx_finance_receive_0 drop column merchant_id;
alter table wx_finance_receive_1 drop column merchant_id;
alter table wx_finance_receive_2 drop column merchant_id;
alter table wx_finance_receive_3 drop column merchant_id;
alter table wx_finance_receive_4 drop column merchant_id;
alter table wx_finance_receive_5 drop column merchant_id;
alter table wx_finance_receive_6 drop column merchant_id;
alter table wx_finance_receive_7 drop column merchant_id;
alter table wx_finance_receive_8 drop column merchant_id;
alter table wx_finance_receive_9 drop column merchant_id;
alter table wx_finance_receive_10 drop column merchant_id;
alter table wx_finance_receive_11 drop column merchant_id;
alter table wx_finance_receive_12 drop column merchant_id;
alter table wx_finance_receive_13 drop column merchant_id;
alter table wx_finance_receive_14 drop column merchant_id;
alter table wx_finance_receive_15 drop column merchant_id;
alter table wx_finance_receive_16 drop column merchant_id;
alter table wx_finance_receive_17 drop column merchant_id;
alter table wx_finance_receive_18 drop column merchant_id;
alter table wx_finance_receive_19 drop column merchant_id;
alter table wx_finance_receive_20 drop column merchant_id;
alter table wx_finance_receive_21 drop column merchant_id;
alter table wx_finance_receive_22 drop column merchant_id;
alter table wx_finance_receive_23 drop column merchant_id;
alter table wx_finance_receive_24 drop column merchant_id;
alter table wx_finance_receive_25 drop column merchant_id;
alter table wx_finance_receive_26 drop column merchant_id;
alter table wx_finance_receive_27 drop column merchant_id;
alter table wx_finance_receive_28 drop column merchant_id;
alter table wx_finance_receive_29 drop column merchant_id;
alter table wx_finance_receive_30 drop column merchant_id;
alter table wx_finance_receive_31 drop column merchant_id;
alter table wx_finance_receive_32 drop column merchant_id;
alter table wx_finance_receive_33 drop column merchant_id;
alter table wx_finance_receive_34 drop column merchant_id;
alter table wx_finance_receive_35 drop column merchant_id;
alter table wx_finance_receive_36 drop column merchant_id;
alter table wx_finance_receive_37 drop column merchant_id;
alter table wx_finance_receive_38 drop column merchant_id;
alter table wx_finance_receive_39 drop column merchant_id;
alter table wx_finance_receive_40 drop column merchant_id;
alter table wx_finance_receive_41 drop column merchant_id;
alter table wx_finance_receive_42 drop column merchant_id;
alter table wx_finance_receive_43 drop column merchant_id;
alter table wx_finance_receive_44 drop column merchant_id;
alter table wx_finance_receive_45 drop column merchant_id;
alter table wx_finance_receive_46 drop column merchant_id;
alter table wx_finance_receive_47 drop column merchant_id;
alter table wx_finance_receive_48 drop column merchant_id;
alter table wx_finance_receive_49 drop column merchant_id;
alter table wx_finance_receive_50 drop column merchant_id;
alter table wx_finance_receive_51 drop column merchant_id;
alter table wx_finance_receive_52 drop column merchant_id;
alter table wx_finance_receive_53 drop column merchant_id;
alter table wx_finance_receive_54 drop column merchant_id;
alter table wx_finance_receive_55 drop column merchant_id;
alter table wx_finance_receive_56 drop column merchant_id;
alter table wx_finance_receive_57 drop column merchant_id;
alter table wx_finance_receive_58 drop column merchant_id;
alter table wx_finance_receive_59 drop column merchant_id;
alter table wx_finance_receive_60 drop column merchant_id;
alter table wx_finance_receive_61 drop column merchant_id;
alter table wx_finance_receive_62 drop column merchant_id;
alter table wx_finance_receive_63 drop column merchant_id;
alter table wx_finance_receive_64 drop column merchant_id;
alter table wx_finance_receive_65 drop column merchant_id;
alter table wx_finance_receive_66 drop column merchant_id;
alter table wx_finance_receive_67 drop column merchant_id;
alter table wx_finance_receive_68 drop column merchant_id;
alter table wx_finance_receive_69 drop column merchant_id;
alter table wx_finance_receive_70 drop column merchant_id;
alter table wx_finance_receive_71 drop column merchant_id;
alter table wx_finance_receive_72 drop column merchant_id;
alter table wx_finance_receive_73 drop column merchant_id;
alter table wx_finance_receive_74 drop column merchant_id;
alter table wx_finance_receive_75 drop column merchant_id;
alter table wx_finance_receive_76 drop column merchant_id;
alter table wx_finance_receive_77 drop column merchant_id;
alter table wx_finance_receive_78 drop column merchant_id;
alter table wx_finance_receive_79 drop column merchant_id;
alter table wx_finance_receive_80 drop column merchant_id;
alter table wx_finance_receive_81 drop column merchant_id;
alter table wx_finance_receive_82 drop column merchant_id;
alter table wx_finance_receive_83 drop column merchant_id;
alter table wx_finance_receive_84 drop column merchant_id;
alter table wx_finance_receive_85 drop column merchant_id;
alter table wx_finance_receive_86 drop column merchant_id;
alter table wx_finance_receive_87 drop column merchant_id;
alter table wx_finance_receive_88 drop column merchant_id;
alter table wx_finance_receive_89 drop column merchant_id;
alter table wx_finance_receive_90 drop column merchant_id;
alter table wx_finance_receive_91 drop column merchant_id;
alter table wx_finance_receive_92 drop column merchant_id;
alter table wx_finance_receive_93 drop column merchant_id;
alter table wx_finance_receive_94 drop column merchant_id;
alter table wx_finance_receive_95 drop column merchant_id;
alter table wx_finance_receive_96 drop column merchant_id;
alter table wx_finance_receive_97 drop column merchant_id;
alter table wx_finance_receive_98 drop column merchant_id;
alter table wx_finance_receive_99 drop column merchant_id;

alter table wx_finance_receive_bill_0 drop column merchant_id;
alter table wx_finance_receive_bill_1 drop column merchant_id;
alter table wx_finance_receive_bill_2 drop column merchant_id;
alter table wx_finance_receive_bill_3 drop column merchant_id;
alter table wx_finance_receive_bill_4 drop column merchant_id;
alter table wx_finance_receive_bill_5 drop column merchant_id;
alter table wx_finance_receive_bill_6 drop column merchant_id;
alter table wx_finance_receive_bill_7 drop column merchant_id;
alter table wx_finance_receive_bill_8 drop column merchant_id;
alter table wx_finance_receive_bill_9 drop column merchant_id;
alter table wx_finance_receive_bill_10 drop column merchant_id;
alter table wx_finance_receive_bill_11 drop column merchant_id;
alter table wx_finance_receive_bill_12 drop column merchant_id;
alter table wx_finance_receive_bill_13 drop column merchant_id;
alter table wx_finance_receive_bill_14 drop column merchant_id;
alter table wx_finance_receive_bill_15 drop column merchant_id;
alter table wx_finance_receive_bill_16 drop column merchant_id;
alter table wx_finance_receive_bill_17 drop column merchant_id;
alter table wx_finance_receive_bill_18 drop column merchant_id;
alter table wx_finance_receive_bill_19 drop column merchant_id;
alter table wx_finance_receive_bill_20 drop column merchant_id;
alter table wx_finance_receive_bill_21 drop column merchant_id;
alter table wx_finance_receive_bill_22 drop column merchant_id;
alter table wx_finance_receive_bill_23 drop column merchant_id;
alter table wx_finance_receive_bill_24 drop column merchant_id;
alter table wx_finance_receive_bill_25 drop column merchant_id;
alter table wx_finance_receive_bill_26 drop column merchant_id;
alter table wx_finance_receive_bill_27 drop column merchant_id;
alter table wx_finance_receive_bill_28 drop column merchant_id;
alter table wx_finance_receive_bill_29 drop column merchant_id;
alter table wx_finance_receive_bill_30 drop column merchant_id;
alter table wx_finance_receive_bill_31 drop column merchant_id;
alter table wx_finance_receive_bill_32 drop column merchant_id;
alter table wx_finance_receive_bill_33 drop column merchant_id;
alter table wx_finance_receive_bill_34 drop column merchant_id;
alter table wx_finance_receive_bill_35 drop column merchant_id;
alter table wx_finance_receive_bill_36 drop column merchant_id;
alter table wx_finance_receive_bill_37 drop column merchant_id;
alter table wx_finance_receive_bill_38 drop column merchant_id;
alter table wx_finance_receive_bill_39 drop column merchant_id;
alter table wx_finance_receive_bill_40 drop column merchant_id;
alter table wx_finance_receive_bill_41 drop column merchant_id;
alter table wx_finance_receive_bill_42 drop column merchant_id;
alter table wx_finance_receive_bill_43 drop column merchant_id;
alter table wx_finance_receive_bill_44 drop column merchant_id;
alter table wx_finance_receive_bill_45 drop column merchant_id;
alter table wx_finance_receive_bill_46 drop column merchant_id;
alter table wx_finance_receive_bill_47 drop column merchant_id;
alter table wx_finance_receive_bill_48 drop column merchant_id;
alter table wx_finance_receive_bill_49 drop column merchant_id;
alter table wx_finance_receive_bill_50 drop column merchant_id;
alter table wx_finance_receive_bill_51 drop column merchant_id;
alter table wx_finance_receive_bill_52 drop column merchant_id;
alter table wx_finance_receive_bill_53 drop column merchant_id;
alter table wx_finance_receive_bill_54 drop column merchant_id;
alter table wx_finance_receive_bill_55 drop column merchant_id;
alter table wx_finance_receive_bill_56 drop column merchant_id;
alter table wx_finance_receive_bill_57 drop column merchant_id;
alter table wx_finance_receive_bill_58 drop column merchant_id;
alter table wx_finance_receive_bill_59 drop column merchant_id;
alter table wx_finance_receive_bill_60 drop column merchant_id;
alter table wx_finance_receive_bill_61 drop column merchant_id;
alter table wx_finance_receive_bill_62 drop column merchant_id;
alter table wx_finance_receive_bill_63 drop column merchant_id;
alter table wx_finance_receive_bill_64 drop column merchant_id;
alter table wx_finance_receive_bill_65 drop column merchant_id;
alter table wx_finance_receive_bill_66 drop column merchant_id;
alter table wx_finance_receive_bill_67 drop column merchant_id;
alter table wx_finance_receive_bill_68 drop column merchant_id;
alter table wx_finance_receive_bill_69 drop column merchant_id;
alter table wx_finance_receive_bill_70 drop column merchant_id;
alter table wx_finance_receive_bill_71 drop column merchant_id;
alter table wx_finance_receive_bill_72 drop column merchant_id;
alter table wx_finance_receive_bill_73 drop column merchant_id;
alter table wx_finance_receive_bill_74 drop column merchant_id;
alter table wx_finance_receive_bill_75 drop column merchant_id;
alter table wx_finance_receive_bill_76 drop column merchant_id;
alter table wx_finance_receive_bill_77 drop column merchant_id;
alter table wx_finance_receive_bill_78 drop column merchant_id;
alter table wx_finance_receive_bill_79 drop column merchant_id;
alter table wx_finance_receive_bill_80 drop column merchant_id;
alter table wx_finance_receive_bill_81 drop column merchant_id;
alter table wx_finance_receive_bill_82 drop column merchant_id;
alter table wx_finance_receive_bill_83 drop column merchant_id;
alter table wx_finance_receive_bill_84 drop column merchant_id;
alter table wx_finance_receive_bill_85 drop column merchant_id;
alter table wx_finance_receive_bill_86 drop column merchant_id;
alter table wx_finance_receive_bill_87 drop column merchant_id;
alter table wx_finance_receive_bill_88 drop column merchant_id;
alter table wx_finance_receive_bill_89 drop column merchant_id;
alter table wx_finance_receive_bill_90 drop column merchant_id;
alter table wx_finance_receive_bill_91 drop column merchant_id;
alter table wx_finance_receive_bill_92 drop column merchant_id;
alter table wx_finance_receive_bill_93 drop column merchant_id;
alter table wx_finance_receive_bill_94 drop column merchant_id;
alter table wx_finance_receive_bill_95 drop column merchant_id;
alter table wx_finance_receive_bill_96 drop column merchant_id;
alter table wx_finance_receive_bill_97 drop column merchant_id;
alter table wx_finance_receive_bill_98 drop column merchant_id;
alter table wx_finance_receive_bill_99 drop column merchant_id;

alter table wx_finance_receive_bill_0 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_1 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_2 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_3 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_4 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_5 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_6 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_7 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_8 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_9 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_10 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_11 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_12 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_13 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_14 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_15 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_16 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_17 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_18 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_19 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_20 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_21 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_22 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_23 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_24 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_25 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_26 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_27 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_28 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_29 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_30 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_31 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_32 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_33 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_34 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_35 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_36 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_37 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_38 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_39 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_40 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_41 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_42 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_43 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_44 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_45 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_46 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_47 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_48 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_49 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_50 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_51 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_52 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_53 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_54 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_55 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_56 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_57 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_58 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_59 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_60 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_61 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_62 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_63 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_64 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_65 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_66 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_67 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_68 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_69 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_70 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_71 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_72 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_73 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_74 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_75 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_76 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_77 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_78 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_79 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_80 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_81 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_82 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_83 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_84 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_85 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_86 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_87 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_88 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_89 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_90 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_91 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_92 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_93 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_94 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_95 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_96 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_97 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_98 add column shop_id bigint(20) not null ;
alter table wx_finance_receive_bill_99 add column shop_id bigint(20) not null ;





+ 0
- 5
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java Vedi File

@@ -158,11 +158,6 @@ public class WxFinanceReceive extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "moneyDetail", name = "moneyDetail")
private String moneyDetail;
@io.swagger.annotations.ApiModelProperty(value = "merchantId", name = "merchantId")
private Long merchantId;
@TableField(exist = false)
private List<Long> merchantIdList;
@io.swagger.annotations.ApiModelProperty(value = "remark", name = "remark")
private String remark;


+ 8
- 11
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveBill.java Vedi File

@@ -60,6 +60,14 @@ public class WxFinanceReceiveBill extends TenantEntity {
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "铺位编号", name = "shopId")
private Long shopId;
@Excel(name = "店铺号", width = 20, orderNum = "4")
@TableField(exist = false)
private String shopNumber;
@io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId")
private Long feesId;
@Excel(name = "账单科目", width = 20, orderNum = "10")
@@ -92,12 +100,6 @@ public class WxFinanceReceiveBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="支付给商户金额",name="pay")
private String pay;
@io.swagger.annotations.ApiModelProperty(value="商户编号",name="feesId")
private Long merchantId;
@Excel(name = "商户", width = 20, orderNum = "3")
@TableField(exist = false)
private String merchantName;
@Excel(name = "账单开始周期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value="账单开始周期",name="starttime")
private Date starttime;
@@ -127,9 +129,6 @@ public class WxFinanceReceiveBill extends TenantEntity {
}
return setOff;
}
@Excel(name = "店铺号", width = 20, orderNum = "4")
@TableField(exist = false)
private String shopNumber;
@Excel(name = "楼栋", width = 20, orderNum = "5")
@TableField(exist = false)
private Long building;
@@ -148,7 +147,5 @@ public class WxFinanceReceiveBill extends TenantEntity {
@TableField(exist = false)
private Integer noReduce;
@TableField(exist = false)
private List<Long> merchantIdList;
@TableField(exist = false)
private String rentName;
}

+ 0
- 75
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Vedi File

@@ -47,18 +47,8 @@ public class WxPropertyContract extends TenantEntity {
@SortColumn(column = "shopNumber")
private String shopNumber;

@TableField(exist = false)
private String brandName;


@io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize")
private Integer decimalSize = 2;
@io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value = "是不是私密商户(虚拟)", name = "isPrivateMerchant")
private Integer isPrivateMerchant;
@io.swagger.annotations.ApiModelProperty(value = "虚拟商户店铺类型EnumRentShopType", name = "privateRentShopType")
private Integer privateRentShopType;
/*月租金/分成(分)**/
@io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price")
private String price;
@@ -105,24 +95,9 @@ public class WxPropertyContract extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="押金",name="deposit")
private String deposit;

@io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate")
private Integer payDate;

@io.swagger.annotations.ApiModelProperty(value="是否删除1是0否",name="isDel")
private Integer isDel;

@io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName")
private String merchantName;

@io.swagger.annotations.ApiModelProperty(value="经营品牌",name="brand")
private Long brand;

@io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId")
private Integer businessId;

@io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType")
private Integer shopType;

@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime")
private Date updatetime;
@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy")
@@ -259,12 +234,6 @@ public class WxPropertyContract extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "创建方式EnumPropertyCreateType", name = "createType")
private Integer createType;
@io.swagger.annotations.ApiModelProperty(value = "店铺ids,根据店铺创建", name = "shopIds")
private String shopIds;
@io.swagger.annotations.ApiModelProperty(value = "店铺号", name = "shopNumbers")
private String shopNumbers;
@TableField(exist = false)
private List<Long> shopIdsQuery;
@io.swagger.annotations.ApiModelProperty(value = "首期账单开始时间", name = "firstBillDateStart")
private Date firstBillDateStart;
@@ -304,46 +273,6 @@ public class WxPropertyContract extends TenantEntity {
}
}
public String getBillShopNumber() {
if (null == this.createType) {
return "";
}
StringBuffer sb = new StringBuffer("");
if (this.createType.intValue() == EnumPropertyCreateType.BY_RENT.getCode().intValue()) {
String rentInfo = this.getRentInfo();
if (!StringUtils.isBlank(rentInfo)) {
JSONArray rentInfoArray = JSONArray.parseArray(rentInfo);
int size = rentInfoArray.size();
for (int i = 0; i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
String shopNumber = rentInfoObject.getString("shopNumber");
if (StringUtils.isNotBlank(shopNumber)) {
sb.append(shopNumber).append(",");
}
}
}
}else {
sb.append(this.shopNumbers);
}
return sb.toString();
}
public List<Long> shopIdsByShop() {
List<Long> shopList = Lists.newArrayList();
String shopids = this.getShopIds();
if (!StringUtils.isBlank(shopids)) {
String[] sids = shopids.split(",");
if (null != sids) {
for (int i = 0; i < sids.length; i++) {
if (StringUtils.isNotBlank(sids[i])) {
shopList.add(Long.parseLong(sids[i]));
}
}
}
}
return shopList;
}
public List<WxEnergyFees> getFeesStardarsList() {
if (StringUtils.isNotBlank(feesStandardsInfo)) {
return JSON.parseArray(feesStandardsInfo, WxEnergyFees.class);
@@ -377,10 +306,6 @@ public class WxPropertyContract extends TenantEntity {
@TableField(exist = false)
List<WxEnergyFees> feeStandards;
@TableField(exist = false)
private String queryShopNumber;
@TableField(exist = false)
private List<Integer> privateRentShopTypeList;

}

+ 0
- 49
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java Vedi File

@@ -118,55 +118,6 @@ public class WxBusinessServiceImpl implements WxBusinessService {
List<Map<String, Object>> resultList = wxBusinessMapper.businessDataList(wxBusiness);
resultList.stream().forEach(e -> {
BigDecimal businessSumMoney = new BigDecimal(0);
WxRentContract query = new WxRentContract();
query.setBusinessId((Integer) e.get("id"));
query.setIsDel(0);
query.updateTenantInfo(tenantEntity);
List<WxRentContract> rentContractList = wxRentContractMapper.selectList(new QueryWrapper<>(query));
for (WxRentContract dbRent : rentContractList) {
// if (dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) {
if (dbRent.getStatus().equals(EnumRentContractStatus.OUT_DATE.getCode()) ||
dbRent.getStatus().equals(EnumRentContractStatus.TERMINATE.getCode()) ||
dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) {
logger.warn("rent rentInfo is null-1: " + dbRent.getId());
continue;
}
String price = dbRent.getPrice();
Integer priceUnit = dbRent.getPriceUnit();
Integer type = dbRent.getType();
Integer period = dbRent.getReceivePeriod();
Integer busDiscountTime = 0;
BigDecimal priceDecimal = getPriceDecimal(dbRent.getDecimalSize(),day, price, priceUnit, type, period, busDiscountTime);
businessSumMoney = businessSumMoney.add(priceDecimal);
}

WxPropertyContract pquery = new WxPropertyContract();
pquery.setBusinessId((Integer) e.get("id"));
query.setIsDel(0);
pquery.updateTenantInfo(tenantEntity);
List<WxPropertyContract> propertyContractList = wxPropertyContractMapper.selectList(new QueryWrapper<>(pquery));
for (WxPropertyContract dbRent : propertyContractList) {
// if (dbRent.getStatus().equals(EnumRentContractStatus.INTENTION.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_END.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode()) ||
// dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) {
if (dbRent.getStatus().equals(EnumRentContractStatus.OUT_DATE.getCode()) ||
dbRent.getStatus().equals(EnumRentContractStatus.TERMINATE.getCode()) ||
dbRent.getStatus().equals(EnumRentContractStatus.INVALID.getCode())) {
logger.warn("property rentInfo is null-2:" + dbRent.getId());
continue;
}
logger.info("业态分析>>>>>>>>>>>>>>>>>>物业合同ID:" + dbRent.getId());
String price = dbRent.getPrice();
Integer priceUnit = dbRent.getPriceUnit();
BigDecimal priceDecimal = getPriceDecimal(dbRent.getDecimalSize(),day, price, priceUnit, EnumRentContractType.RENT_BY_AREA.getCode(), null, null);
businessSumMoney = businessSumMoney.add(priceDecimal);
}
logger.info("业态分析>>>>>>>>>>>>>>>>>>商铺面积:" + e.get("area").toString());
if (e.get("area") == null || "0".equals(e.get("area").toString()) ||
"0.0".equals(e.get("area").toString())) {


+ 12
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java Vedi File

@@ -19,11 +19,14 @@ import com.iformall.domain.po.WxFinancePrintTemplate;
import com.iformall.domain.po.WxFinanceReceive;
import com.iformall.domain.po.WxFinanceReceiveBill;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxShop;
import com.iformall.domain.po.WxShopUsers;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.PrintVo;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.domain.vo.WxShopBillVo;
import com.iformall.enums.EnumFinancePrintDataType;
import com.iformall.enums.EnumShopUsersStatus;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxFinancePrintDataMapper;
@@ -92,10 +95,6 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
@Autowired
PrintCustomedTableDataHandler printCustomedTableDataHandler;
@Lazy
@Autowired
WxMerchantService wxMerchantService;
@Lazy
@Autowired
WxShopService wxShopService;
@@ -256,14 +255,18 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
}
JSONArray items = o.getJSONArray("tempItems");
EnumFinancePrintDataType printDatatype = EnumFinancePrintDataType.getEnum(template.getType());
WxMerchant mq = new WxMerchant();
mq.setIsDel(EnumYesOrNo.NO.getCode());
mq.setTenantId(tenantId);
Map<Long,WxMerchant> merchantMap = wxMerchantService.findMerchantMap(mq);
WxShop shopq = new WxShop();
shopq.setTenantId(tenantId);
shopq.setIsDel(EnumYesOrNo.NO.getCode());
Map<Long, WxShop> shopMap = wxShopService.findShopMap(shopq);
WxShopUsers suq = new WxShopUsers();
suq.setTenantId(tenantId);
suq.setStatus(EnumShopUsersStatus.LIVE.getCode());
Map<Long, WxShopUsers> shopUserMap = wxShopService.getShopUserMap(suq);
WxEnergyFees feq = new WxEnergyFees();
feq.setTenantId(tenantId);
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(feq);
Map<Long,String> shopNumber = wxShopService.getMerchantShopNumberMap(mq, null, null);
//收付款单
if (printDatatype.getCode().intValue() == EnumFinancePrintDataType.FINANCE_RECEIVE.getCode()) {
WxFinanceReceive receiveq = new WxFinanceReceive();


+ 4
- 10
mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml Vedi File

@@ -9,12 +9,12 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="bill_id" jdbcType="BIGINT" property="billId"/>
<result column="bill_type" jdbcType="INTEGER" property="billType"/>
<result column="shop_id" jdbcType="BIGINT" property="shopId"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
<result column="pay_way" jdbcType="BIGINT" property="payWay"/>
<result column="receive_id" jdbcType="BIGINT" property="receiveId"/>
<result column="receive" jdbcType="VARCHAR" property="receive"/>
<result column="pay" jdbcType="VARCHAR" property="pay"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="starttime" jdbcType="TIMESTAMP" property="starttime"/>
<result column="endtime" jdbcType="TIMESTAMP" property="endtime"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
@@ -23,8 +23,8 @@
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`fees_id`,
`pay_way`,`receive_id`,`receive`,`pay`,`merchant_id`,`starttime`,`endtime`,`is_del`,`type`,`receive_date`
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`shop_id`,`fees_id`,
`pay_way`,`receive_id`,`receive`,`pay`,`starttime`,`endtime`,`is_del`,`type`,`receive_date`
</sql>

<sql id="dynamicWhereConditions">
@@ -38,10 +38,10 @@
</if>
<if test=" null != billId ">and `bill_id` = #{billId}</if>
<if test=" null != billType ">and `bill_type` = #{billType}</if>
<if test=" null != shopId ">and `shop_id` = #{shopId}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" null != receiveId ">and `receive_id` = #{receiveId}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
<if test=" null != isDel ">and `is_del` = #{isDel}</if>
<if test=" null != createTimeBegin ">and `create_time` &gt;= #{createTimeBegin}</if>
<if test=" null != createTimeEnd ">and `create_time` &lt;= #{createTimeEnd}</if>
@@ -49,12 +49,6 @@
<if test=" null != endtime ">and `endtime` &lt;= #{endtime}</if>
<if test=" 1 == noReduce ">and `pay_way` != 4 </if>
<if test=" null != type ">and type = #{type} </if>
<if test=" null != merchantIdList ">
and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">
#{midItem}
</foreach>
</if>
<if test=" null != feesIdList ">
and fees_id in
<foreach collection="feesIdList" index="index" item="fidItem" open="(" separator="," close=")">


+ 1
- 10
mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml Vedi File

@@ -19,7 +19,6 @@
<result column="create_by_name" jdbcType="VARCHAR" property="createByName"/>
<result column="update_by" jdbcType="BIGINT" property="updateBy"/>
<result column="update_by_name" jdbcType="VARCHAR" property="updateByName"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="fees_id" jdbcType="BIGINT" property="feesId"/>
<result column="is_print" jdbcType="INTEGER" property="isPrint"/>
@@ -29,7 +28,7 @@

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`receive_date`,`receive_money`,`pay_money`,`set_off_money`,`cut_money`,`status`,`type`,
`money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`remark`,`fees_id`,`is_print`,`is_finish`,`parent_id`
`money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`remark`,`fees_id`,`is_print`,`is_finish`,`parent_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -43,7 +42,6 @@
</if>
<if test=" null != status ">and `status` = #{status}</if>
<if test=" null != type ">and `type` = #{type}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
<if test=" null != createTimeBegin ">and `create_time` &gt;= #{createTimeBegin}</if>
<if test=" null != createTimeEnd ">and `create_time` &lt;= #{createTimeEnd}</if>
<if test=" null != receiveDateBegin ">and `receive_date` &gt;= #{receiveDateBegin}</if>
@@ -60,13 +58,6 @@
</foreach>
</if>
<if test=" null != merchantIdList ">
and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">
#{midItem}
</foreach>
</if>
<if test=" null != feesIdList ">
and fees_id in
<foreach collection="feesIdList" index="index" item="fidItem" open="(" separator="," close=")">


+ 5
- 40
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml Vedi File

@@ -3,9 +3,8 @@
<mapper namespace="com.iformall.mapper.WxPropertyContractMapper">
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxPropertyContract">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId"/>
<result column="is_private_merchant" jdbcType="INTEGER" property="isPrivateMerchant"/>
<result column="private_rent_shop_type" jdbcType="INTEGER" property="privateRentShopType"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="decimal_size" jdbcType="INTEGER" property="decimalSize"/>
<result column="price" jdbcType="VARCHAR" property="price"/>
<result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/>
@@ -14,18 +13,11 @@
<result column="receive_period" jdbcType="INTEGER" property="receivePeriod"/>
<result column="receive_period_unit" jdbcType="INTEGER" property="receivePeriodUnit"/>
<result column="pay_period_rate" jdbcType="INTEGER" property="payPeriodRate"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId" />
<result column="filepath" jdbcType="VARCHAR" property="filepath"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/>
<result column="deposit" jdbcType="VARCHAR" property="deposit"/>
<result column="pay_date" jdbcType="INTEGER" property="payDate"/>
<result column="is_del" jdbcType="INTEGER" property="isDel"/>
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName"/>
<result column="brand" jdbcType="VARCHAR" property="brand"/>
<result column="business_id" jdbcType="INTEGER" property="businessId"/>
<result column="shop_type" jdbcType="INTEGER" property="shopType"/>
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime"/>
<result column="createtime" jdbcType="TIMESTAMP" property="createtime"/>
<result column="rent_area" jdbcType="VARCHAR" property="rentArea"/>
@@ -62,8 +54,6 @@
<result column="out_date_notify_phone" jdbcType="VARCHAR" property="outDateNotifyPhone"/>
<result column="create_type" jdbcType="INTEGER" property="createType"/>
<result column="shop_ids" jdbcType="VARCHAR" property="shopIds"/>
<result column="shop_numbers" jdbcType="VARCHAR" property="shopNumbers"/>
<result column="price_detail" jdbcType="VARCHAR" property="priceDetail"/>
<result column="fees_standards_info" jdbcType="VARCHAR" property="feesStandardsInfo"/>
<result column="day_price_calcute" jdbcType="INTEGER" property="dayPriceCalcute"/>
@@ -75,9 +65,9 @@
</resultMap>
<sql id="allColumns">
`id`,`merchant_id`,`is_private_merchant`,`private_rent_shop_type`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,`shop_ids`,`shop_numbers`,
`sign_date`,`receive_period`,`tenant_id`,`parent_tenant_id`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by_name`,`update_by_name`,
`deposit`,`pay_date`,`is_del`,`merchant_name`,`brand`,`business_id`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`,
`id`,`tenant_id`,`parent_tenant_id`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,
`sign_date`,`receive_period`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by_name`,`update_by_name`,
`deposit`,`is_del`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`,
`shop_type`,`updatetime`,`createtime`,`rent_area`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`,
`link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`,`day_price_calcute`,`month_average_days`,
`start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`,fixed_price,`pay_period_rate`,
@@ -87,9 +77,6 @@
<sql id="dynamicWhereConditions">
where 1 = 1
<if test=" null != id ">and `id` = #{id}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
<if test=" null != isPrivateMerchant ">and `is_private_merchant` = #{isPrivateMerchant}</if>
<if test=" null != privateRentShopType ">and `private_rent_shop_type` = #{privateRentShopType}</if>
<if test=" null != price ">and `price` = #{price}</if>
<if test=" null != rentalStartDate ">and `rental_start_date` = #{rentalStartDate}</if>
<if test=" null != rentalEndDate ">and `rental_end_date` = #{rentalEndDate}</if>
@@ -109,12 +96,7 @@
<if test=" null != applyStatus ">and `apply_status` = #{applyStatus}</if>
<if test=" null != contractNumber and '' != contractNumber">and `contract_number` = #{contractNumber}</if>
<if test=" null != deposit ">and `deposit` = #{deposit}</if>
<if test=" null != payDate ">and `pay_date` = #{payDate}</if>
<if test=" null != isDel ">and `is_del` = #{isDel}</if>
<if test=" null != merchantName and '' != merchantName ">and `merchant_name` like concat('%', #{merchantName},'%') </if>
<if test=" null != brand ">and `brand` = #{brand}</if>
<if test=" null != businessId ">and `business_id` = #{businessId}</if>
<if test=" null != shopType ">and `shop_type` = #{shopType}</if>
<if test=" null != updatetime ">and `updatetime` = #{updatetime}</if>
<if test=" null != createtime ">and `createtime` = #{createtime}</if>
<if test=" null != rentArea ">and `rent_area` = #{rentArea}</if>
@@ -133,16 +115,6 @@
<if test=" null != businessForRule and '' != businessForRule ">
and business_id in (${businessForRule})
</if>
<if test=" null != queryShopNumber and queryShopNumber!=''">
and concat(',',shop_numbers,',') like concat('%,',#{queryShopNumber},',%')
</if>
<if test=" null != privateRentShopTypeList ">
and private_rent_shop_type in
<foreach collection="privateRentShopTypeList" index="index" item="pmItem" open="(" separator="," close=")">
#{pmItem}
</foreach>
</if>
<if test=" null != merchantIds ">
and merchant_id in
@@ -151,13 +123,6 @@
</foreach>
</if>
<if test=" null != shopIdsQuery ">
and
<foreach collection="shopIdsQuery" index="index" item="shopidItem" open="(" separator="or" close=")">
shop_ids like concat('%,', #{shopidItem},',%')
</foreach>
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Caricamento…
Annulla
Salva