Browse Source

[预账单][添加][创建合同添加预账单]

release_toaliyun_real
luozukai 7 years ago
committed by Stormeye Wu
parent
commit
eb9e79ef1e
4 changed files with 36 additions and 20 deletions
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java
  3. +30
    -20
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

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

@@ -207,6 +207,7 @@ public class WxRentContract implements Serializable {

// 预账单列表
@Transient
@io.swagger.annotations.ApiModelProperty(value = "预账单列表", name = "previewBillRentList")
private List<WxBillRent> previewBillRentList;

public List<WxBillRent> getPreviewBillRentList() {


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

@@ -25,4 +25,6 @@ public interface WxBillRentMapper extends CommonMapper<WxBillRent, Long> {
void updateInvalidStatus(WxBillRent wxBillRent);

void deletePreviewBill(WxRentContract wxRentContract);

void update(WxBillRent record);
}

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

@@ -255,7 +255,29 @@ public class WxRentContractServiceImpl implements WxRentContractService {
logger.error("启动审批流失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.FLOW_FAIL.getCode(), "FLOW FAILD " + e.getMessage());
}
return resultData;
WxRentContract wxRentContract = (WxRentContract)resultData.data;

//删除预账单
if(record.getReceivePeriod() != null && record.getLease()!=null && record.getRentalStartDate()!=null && record.getPrice()!= null){
wxBillRentMapper.deletePreviewBill(record);
//重新生成
WxMerchant wxMerchant = new WxMerchant();
buildRent(wxMerchant,null);
int receivePeriod = record.getReceivePeriod().intValue();
Integer lease = record.getLease();
Date rentalStartDate = record.getRentalStartDate();
Integer price = record.getPrice();
//按月计租
List<WxBillRent> resultList;
if (record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode())) {
resultList = buildRentMonth(wxMerchant, userId, record, receivePeriod, lease, rentalStartDate, price,EnumIsPreview.YES.getCode());
} else {
//按日计租
resultList = buildRent(lease, receivePeriod, price, rentalStartDate, Calendar.DAY_OF_MONTH, record, userId, wxMerchant, 0,EnumIsPreview.YES.getCode());
}
wxRentContract.setPreviewBillRentList(resultList);
}
return new ResultData(wxRentContract);
}

public ResultData getResultDataForUpdate(WxRentContract record, Long userId) {
@@ -312,25 +334,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
logger.error("更新租赁合同信息失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
}

//删除预账单
wxBillRentMapper.deletePreviewBill(record);
//重新生成
WxMerchant wxMerchant = new WxMerchant();
buildRent(wxMerchant,null);
int receivePeriod = record.getReceivePeriod().intValue();
Integer lease = record.getLease();
Date rentalStartDate = record.getRentalStartDate();
Integer price = record.getPrice();
//按月计租
List<WxBillRent> resultList;
if (record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode())) {
resultList = buildRentMonth(wxMerchant, userId, record, receivePeriod, lease, rentalStartDate, price,EnumIsPreview.YES.getCode());
} else {
//按日计租
resultList = buildRent(lease, receivePeriod, price, rentalStartDate, Calendar.DAY_OF_MONTH, record, userId, wxMerchant, 0,EnumIsPreview.YES.getCode());
}
wxRentContract.setPreviewBillRentList(resultList);
return new ResultData(Result.SUCCESS, "保存租赁合同信息成功", wxRentContract);
}

@@ -888,6 +891,13 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxRentContractMapper.updateStatus(updateRentContract);
logger.info("id:{},启动审批流成功,是否补录:{}",record.getId().toString(),record.getMerchantId() != null);
}

// 保存调整金额(预账单调整)
if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){
for (WxBillRent wxBillRent:record.getPreviewBillRentList()) {
wxBillRentMapper.update(wxBillRent);
}
}
} catch (Exception e) {
logger.error("启动审批流失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.FLOW_FAIL.getCode(), "FLOW FAILD " + e.getMessage());


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

@@ -130,4 +130,7 @@
delete from wx_bill_rent where rent_contract_id = #{id}
</delete>

<update id="update" parameterType="com.iformall.domain.po.WxBillRent">
update wx_bill_rent set receive_pay = #{receivePay} where id = #{id}
</update>
</mapper>

Loading…
Cancel
Save