Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
6be75e3e37
6 changed files with 10 additions and 9 deletions
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
  4. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -10,6 +10,7 @@ import com.iformall.enums.EnumPriceUnit;
import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentContractAdjustPeriod;
import com.iformall.enums.EnumRentContractDepositType; import com.iformall.enums.EnumRentContractDepositType;
import com.iformall.enums.EnumRentContractType; import com.iformall.enums.EnumRentContractType;
import com.iformall.utils.Constant;


import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -458,7 +459,7 @@ public class WxRentContract extends TenantEntity {
//如果是按铺位数算,price不用计算,是填写的值 //如果是按铺位数算,price不用计算,是填写的值
if (!this.type.equals(EnumRentContractType.RENT_BY_COUNT.getCode())) { if (!this.type.equals(EnumRentContractType.RENT_BY_COUNT.getCode())) {
if (StringUtils.isNoneBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) { if (StringUtils.isNoneBlank(this.rentArea) && StringUtils.isNotBlank(this.rentPrice)) {
this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(this.decimalSize, RoundingMode.HALF_UP).toPlainString();
this.price = new BigDecimal(this.rentArea).multiply(new BigDecimal(this.rentPrice)).setScale(Constant.default_long_decimal_size, RoundingMode.HALF_UP).toPlainString();
} }
} }
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java View File

@@ -31,7 +31,7 @@ public interface WxBillRentManageMapper extends CommonMapper<WxBillRentManage, L
long oweBillCount(@Param("contractId") Long contractId); long oweBillCount(@Param("contractId") Long contractId);
void insertBills(List<WxBillRentManage> resultList);
void insertBills(@Param("tenantId")String tenantId, @Param("list")List<WxBillRentManage> resultList);
WxBillSum getBillMonthSum(WxBillRentManage wxBillRentManage); WxBillSum getBillMonthSum(WxBillRentManage wxBillRentManage);


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java View File

@@ -42,7 +42,7 @@ public interface WxBillRentMapper extends CommonMapper<WxBillRent, Long> {


Long oweBillCount(Long contractId); Long oweBillCount(Long contractId);


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


void updateBills(@Param("bills") List<WxBillRent> resultList); void updateBills(@Param("bills") List<WxBillRent> resultList);




+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -692,7 +692,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//bill.setOwe(bill.getReceivePay()); //bill.setOwe(bill.getReceivePay());
count++; count++;
} }
wxBillRentMapper.insertBills(record.getPreviewBillRentList());
wxBillRentMapper.insertBills(record.getTenantId(),record.getPreviewBillRentList());
} }
/** /**
@@ -761,7 +761,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
billList.add(bill); billList.add(bill);
} }
if (billList.size() > 0 ) { if (billList.size() > 0 ) {
wxBillRentManageMapper.insertBills(billList);
wxBillRentManageMapper.insertBills(record.getTenantId(),billList);
} }
} }


@@ -1632,9 +1632,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {


//批量插入账单 //批量插入账单
if(saveDb) { if(saveDb) {
wxBillRentMapper.insertBills(resultList);
wxBillRentMapper.insertBills(wxRentContract.getTenantId(),resultList);
if (manageList.size() > 0 ) { if (manageList.size() > 0 ) {
wxBillRentManageMapper.insertBills(manageList);
wxBillRentManageMapper.insertBills(wxRentContract.getTenantId(),manageList);
} }
} }
resultMap.put("billcount",billcount); resultMap.put("billcount",billcount);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml View File

@@ -245,7 +245,7 @@
and br.status = 1 and c.id = #{contractId} and br.status = 1 and c.id = #{contractId}
</select> </select>
<insert id="insertBills" parameterType="java.util.List">
<insert id="insertBills" parameterType="HashMap">
INSERT INTO wx_bill_rent_manage (id,tenant_id,parent_tenant_id, INSERT INTO wx_bill_rent_manage (id,tenant_id,parent_tenant_id,
rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day,
status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime, status, is_del, need_pay, merchant_id, user_id, shop_id, updatetime, starttime, endtime,


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -316,7 +316,7 @@
and br.status = 1 and c.id = #{contractId} and br.status = 1 and c.id = #{contractId}
</select> </select>
<insert id="insertBills" parameterType="java.util.List">
<insert id="insertBills" parameterType="HashMap">
INSERT INTO wx_bill_rent (id,tenant_id,parent_tenant_id, INSERT INTO wx_bill_rent (id,tenant_id,parent_tenant_id,
rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day, rent_contract_id, receive_pay, pay, receive_date, pay_date, createtime, expired_day,
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, starttime, endtime, 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, starttime, endtime,


Loading…
Cancel
Save