|
|
|
@@ -173,25 +173,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
Date date = new Date(); |
|
|
|
record.setCreatetime(date); |
|
|
|
record.setUpdatetime(date); |
|
|
|
|
|
|
|
record.setStatus(EnumRentContractStatus.WAIT_SIGN.getCode()); |
|
|
|
try { |
|
|
|
wxPropertyContractMapper.insertSelective(record); |
|
|
|
//建立账单 |
|
|
|
if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) |
|
|
|
&& record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { |
|
|
|
WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
wxBillProperty.setMerchantId(record.getMerchantId()); |
|
|
|
List<Map<String, Object>> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); |
|
|
|
if (billPropertyList.size() == 0) { |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setId(record.getMerchantId()); |
|
|
|
wxMerchant.setTenantId(record.getTenantId()); |
|
|
|
//物业账单 |
|
|
|
buildProperty(wxMerchant, userId); |
|
|
|
//物业押金账单 |
|
|
|
buildDeposit(wxMerchant, userId); |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("保存物业合同信息失败,e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
@@ -229,8 +213,38 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultData updatePropertyContractStatus(Long id) { |
|
|
|
if (id == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
} |
|
|
|
//更新合同状态为签约 |
|
|
|
WxPropertyContract wxPropertyContract = new WxPropertyContract(); |
|
|
|
wxPropertyContract.setId(id); |
|
|
|
wxPropertyContract.setStatus(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()); |
|
|
|
wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); |
|
|
|
//建立账单 |
|
|
|
WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id); |
|
|
|
if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) |
|
|
|
&& record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { |
|
|
|
WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
wxBillProperty.setMerchantId(record.getMerchantId()); |
|
|
|
List<Map<String, Object>> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); |
|
|
|
if (billPropertyList.size() == 0) { |
|
|
|
WxMerchant wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setId(record.getMerchantId()); |
|
|
|
wxMerchant.setTenantId(record.getTenantId()); |
|
|
|
//物业账单 |
|
|
|
buildProperty(wxMerchant); |
|
|
|
//物业押金账单 |
|
|
|
buildDeposit(wxMerchant); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "操作成功"); |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = {Exception.class}) |
|
|
|
public void buildDeposit(WxMerchant wxMerchant, Long userId) { |
|
|
|
public void buildDeposit(WxMerchant wxMerchant) { |
|
|
|
WxPropertyContract wxPropertyContract = new WxPropertyContract(); |
|
|
|
wxPropertyContract.setMerchantId(wxMerchant.getId()); |
|
|
|
List<WxPropertyContract> list = wxPropertyContractMapper.findList(wxPropertyContract); |
|
|
|
@@ -274,7 +288,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
wxBillDeposit.setTenantId(wxMerchant.getTenantId()); |
|
|
|
wxBillDeposit.setIsDel(0); |
|
|
|
wxBillDeposit.setMerchantId(wxMerchant.getId()); |
|
|
|
wxBillDeposit.setUserId(userId); |
|
|
|
wxBillDeposit.setShopId(wxPropertyContract.getShopId()); |
|
|
|
wxBillDeposit.setCreatetime(date); |
|
|
|
wxBillDeposit.setUpdatetime(date); |
|
|
|
@@ -289,7 +302,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = {Exception.class}) |
|
|
|
public void buildProperty(WxMerchant wxMerchant, Long userId) { |
|
|
|
public void buildProperty(WxMerchant wxMerchant) { |
|
|
|
//根据商户ID找出合同 |
|
|
|
WxPropertyContract wxPropertyContract = new WxPropertyContract(); |
|
|
|
wxPropertyContract.setMerchantId(wxMerchant.getId()); |
|
|
|
@@ -367,7 +380,6 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
wxBillProperty.setTenantId(wxMerchant.getTenantId()); |
|
|
|
wxBillProperty.setIsDel(0); |
|
|
|
wxBillProperty.setMerchantId(wxMerchant.getId()); |
|
|
|
wxBillProperty.setUserId(userId); |
|
|
|
wxBillProperty.setShopId(wxPropertyContract.getShopId()); |
|
|
|
wxBillProperty.setCreatetime(date); |
|
|
|
wxBillProperty.setUpdatetime(date); |
|
|
|
|