winter 11 месяцев назад
Родитель
Сommit
1dccb70d93
4 измененных файлов: 13 добавлений и 8 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  3. +5
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +6
    -3
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

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

@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;


/** /**
* @author gongbiao
* 如字段有更新,需同步更新到wx_rent_contract_valid_delete
*/ */
@TableName(value = "wx_rent_contract") @TableName(value = "wx_rent_contract")
@Data @Data


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

@@ -41,6 +41,7 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Long>
List<WxRentContract> findToEndContractList(WxRentContract rentContract); List<WxRentContract> findToEndContractList(WxRentContract rentContract);
void copyValidDeleteContract(@Param("tenantId") String tenantId,@Param("id") Long id);
void deleteContract(@Param("tenantId") String tenantId,@Param("id") Long id); void deleteContract(@Param("tenantId") String tenantId,@Param("id") Long id);
void updateContractId(@Param("tenantId") String tenantId,@Param("oldId") Long oldId,@Param("newId") Long newId); void updateContractId(@Param("tenantId") String tenantId,@Param("oldId") Long oldId,@Param("newId") Long newId);
} }

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

@@ -520,8 +520,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
Long orginId = record.getOrginId(); Long orginId = record.getOrginId();
if (record.isYingZiContract()){ if (record.isYingZiContract()){
isYingzi = true; isYingzi = true;
wxRentContractMapper.deleteContract(record.getTenantId(),id);
wxRentContractMapper.updateContractId(record.getTenantId(), id, record.getOrginId());
wxRentContractMapper.copyValidDeleteContract(record.getTenantId(), orginId);
wxRentContractMapper.deleteContract(record.getTenantId(),orginId);
wxRentContractMapper.updateContractId(record.getTenantId(), id, orginId);
record.setId(orginId); record.setId(orginId);
} }
@@ -553,13 +554,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//影子合同处理,源合同账单则需要清空当前时间之后未处理的账单 //影子合同处理,源合同账单则需要清空当前时间之后未处理的账单
if (isYingzi) { if (isYingzi) {
//当前时间之后的未处理过的账单,全部删除,之前的账单,还有以后已经处理过的账单,不处理。需财务手工处理这些账单
//原合同账单处理:当前时间之后的未处理过的账单,全部删除,之前的账单,还有以后已经处理过的账单,不处理。需财务手工处理这些账单
WxAllBill bq = new WxAllBill(); WxAllBill bq = new WxAllBill();
bq.updateTenantInfo(wxRentContract); bq.updateTenantInfo(wxRentContract);
bq.setRentContractId(orginId); bq.setRentContractId(orginId);
bq.setShopEndtime(record.getRentalStartDate()); bq.setShopEndtime(record.getRentalStartDate());
wxAllBillMapper.deleteNoNeedPayBill(bq); wxAllBillMapper.deleteNoNeedPayBill(bq);
//把账单的合同编号更改为源合同ID
//新合同的账单:把账单的合同编号更改为源合同ID
wxAllBillMapper.updateContractId(id, orginId, wxRentContract.getTenantId()); wxAllBillMapper.updateContractId(id, orginId, wxRentContract.getTenantId());
} }


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

@@ -243,13 +243,16 @@
where `tenant_id` = #{tenantId} and status = 3 and end_contract_time &lt;= now(); where `tenant_id` = #{tenantId} and status = 3 and end_contract_time &lt;= now();
</select> </select>
<update id="copyValidDeleteContract" parameterType="java.util.Map">
insert into wx_rent_contract_valid_delete select * from wx_rent_contract where id = #{id} and `tenant_id` = #{tenantId}
</update>
<delete id="deleteContract" parameterType="java.util.Map"> <delete id="deleteContract" parameterType="java.util.Map">
insert into wx_rent_contract_valid_delete select * from wx_rent_contract where id = #{id} and `tenant_id` = #{tenantId};
delete from wx_rent_contract where `tenant_id` = #{tenantId} and id = #{id};
delete from wx_rent_contract where `tenant_id` = #{tenantId} and id = #{id}
</delete> </delete>
<update id = "updateContractId" parameterType="java.util.Map" > <update id = "updateContractId" parameterType="java.util.Map" >
update wx_rent_contract set id = #{newId} where id = #{oldId} and `tenant_id` = #{tenantId};
update wx_rent_contract set id = #{newId},orgin_id = null, where id = #{oldId} and `tenant_id` = #{tenantId}
</update> </update>
</mapper> </mapper>


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