winter 1 год назад
Родитель
Сommit
5b6b6f0c57
5 измененных файлов: 109 добавлений и 9 удалений
  1. +101
    -1
      mallinkAdmin/src/main/resources/db/migration/V202405010.sql
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
  4. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  5. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml

+ 101
- 1
mallinkAdmin/src/main/resources/db/migration/V202405010.sql Просмотреть файл

@@ -4,5 +4,105 @@ ALTER TABLE wx_property_contract ADD COLUMN shop_numbers VARCHAR(100) COMMENT '
ALTER TABLE wx_rent_contract ADD COLUMN price_detail TEXT COMMENT '费用详细说明' AFTER rent_price;
ALTER TABLE wx_property_contract ADD COLUMN price_detail TEXT COMMENT '费用详细说明' AFTER rent_price;
ALTER TABLE wx_property_contract ADD COLUMN fees_standards_info TEXT COMMENT '其他标准费用信息' ;
ALTER TABLE wx_property_contract ADD COLUMN parent_bill_id bigint(20) COMMENT '主账单id' ;

ALTER TABLE wx_bill_property_0 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_1 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_2 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_3 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_4 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_5 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_6 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_7 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_8 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_9 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_10 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_11 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_12 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_13 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_14 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_15 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_16 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_17 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_18 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_19 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_20 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_21 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_22 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_23 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_24 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_25 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_26 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_27 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_28 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_29 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_30 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_31 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_32 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_33 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_34 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_35 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_36 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_37 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_38 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_39 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_40 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_41 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_42 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_43 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_44 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_45 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_46 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_47 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_48 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_49 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_50 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_51 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_52 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_53 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_54 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_55 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_56 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_57 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_58 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_59 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_60 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_61 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_62 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_63 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_64 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_65 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_66 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_67 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_68 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_69 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_70 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_71 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_72 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_73 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_74 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_75 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_76 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_77 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_78 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_79 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_80 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_81 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_82 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_83 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_84 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_85 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_86 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_87 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_88 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_89 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_90 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_91 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_92 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_93 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_94 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_95 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_96 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_97 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_98 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;
ALTER TABLE wx_bill_property_99 ADD COLUMN parent_bill_id BIGINT(20) COMMENT '主账单id' ;


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

@@ -53,7 +53,7 @@ public interface WxBillPropertyMapper extends CommonMapper<WxBillProperty, Long>

void updateBills(List<WxBillProperty> resultList);

void insertBills(List<WxBillProperty> resultList);
void insertBills(@Param("tenantId")String tenantId, @Param("list") List<WxBillProperty> resultList);

WxBillProperty selectBillOne(WxBillProperty propertyQuery);



+ 2
- 2
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java Просмотреть файл

@@ -493,9 +493,9 @@ public class WxRentContractHelper {
vo.setEnd(billEndDate);
vo.setTotal(fees.calcuteTotalMoney(decimalSize, billStartDate, billEndDate, "1"));
vo.setReceiveDate(DateUtils.getDaySet(billStartDate,Calendar.DATE,-1));
vo.setFeeStandards(fees);
retList.add(vo);
}
vo.setFeeStandards(fees);
retList.add(vo);
}else {
if (fees.getFixedPrice().intValue() == EnumYesOrNo.NO.getCode().intValue()) {
vo.setFeeStandards(fees);


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

@@ -296,7 +296,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//bill.setOwe(new BigDecimal(bill.getReceivePay()).toPlainString());
count++;
}
wxBillPropertyMapper.insertBills(record.getPreviewBillRentList());
wxBillPropertyMapper.insertBills(record.getTenantId(),record.getPreviewBillRentList());
}

@Override
@@ -684,7 +684,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
String standarsTotal = "0";
//非一次性费用的,跟随物业账单的周期
List<WxBillFeesStandardsListVo> unFixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),billStartDate,billEndDate,true);
List<WxBillFeesStandardsListVo> unFixedList = WxRentContractHelper.getStandardsBillList(wxPropertyContract.getDecimalSize(),wxPropertyContract.getFeesStardarsList(),null,null,false);

boolean flag = false;
@@ -759,7 +759,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//批量生成预账单
if(saveDb && resultList.size() > 0 ) {
wxBillPropertyMapper.insertBills(resultList);
wxBillPropertyMapper.insertBills(wxPropertyContract.getTenantId() ,resultList);
//for (int i = 0 ; i < resultList.size() ; i++) {
// wxBillPropertyMapper.insert(resultList.get(i));
//}


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

@@ -364,7 +364,7 @@
where c.id = br.property_contract_id and br.status = 1 and c.id = #{contractId}
</select>

<insert id="insertBills" parameterType="java.util.List">
<insert id="insertBills" parameterType="hashmap">
INSERT INTO wx_bill_property (id,property_contract_id, receive_pay, pay, receive_date, pay_date, createtime,
expired_day,
tenant_id, parent_tenant_id, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime,
@@ -379,7 +379,7 @@
#{item.status},#{item.isDel},#{item.needPay},#{item.merchantId},
#{item.userId},#{item.shopId},#{item.updatetime},#{item.starttime},#{item.endtime},#{item.rentShopType},#{item.revenue},
#{item.latePayRatio},#{item.latePayTime},#{item.latePayPrice},#{item.period},#{item.isPreview},#{item.shopInfo},
#{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{parentBillId}
#{item.payWay},#{item.latePayStatus},#{item.comments},#{item.serviceChargePay},#{item.parentBillId}
)
</foreach>
</insert>


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