Преглед изворни кода

Merge commit 'refs/tags/jenkins-back-end-1510^{}' into release

release_toaliyun_real
hupeng пре 7 година
родитељ
комит
b1d1d051fc
2 измењених фајлова са 7 додато и 7 уклоњено
  1. +7
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. +0
    -2
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 7
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Прегледај датотеку

@@ -344,11 +344,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return resultData; return resultData;
} }


if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) {
//删除预账单,重新生成
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) {
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0)) {
//删除预账单,重新生成
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
}
} }
/* //有改变,删除预账单,重新生成 /* //有改变,删除预账单,重新生成
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null


+ 0
- 2
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Прегледај датотеку

@@ -415,7 +415,6 @@
SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is null SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is null
<if test="null != tenantId"> <if test="null != tenantId">
and cubi.tenant_id =#{tenantId} and cubi.tenant_id =#{tenantId}
and cu.tenant_id =#{tenantId}
</if> </if>
</select> </select>


@@ -423,7 +422,6 @@
SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is not null SELECT count(*) FROM wx_c_user_basic_info cubi left join wx_c_user cu on cubi.id=cu.id where cu.id is not null
<if test="null != tenantId"> <if test="null != tenantId">
and cubi.tenant_id =#{tenantId} and cubi.tenant_id =#{tenantId}
and cu.tenant_id =#{tenantId}
</if> </if>
</select> </select>
</mapper> </mapper>


Loading…
Откажи
Сачувај