Przeglądaj źródła

[铜锣湾][修改][失效账单]

release_toaliyun_real
luozukai 7 lat temu
rodzic
commit
67e5f83d6c
3 zmienionych plików z 41 dodań i 41 usunięć
  1. +41
    -39
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. +0
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  3. +0
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 41
- 39
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Wyświetl plik

@@ -246,58 +246,56 @@ public class WxRentContractServiceImpl implements WxRentContractService {
@Transactional(rollbackFor = {Exception.class}) @Transactional(rollbackFor = {Exception.class})
@Override @Override
public ResultData update(WxRentContract record, Long userId,String userName) { public ResultData update(WxRentContract record, Long userId,String userName) {
//删除预账单
List<WxBillRent> resultList = new ArrayList<>();
if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null){
//对比上一次,是否有更改,有,重新生成预账单
WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(record.getId());
boolean change = false;

if(record.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())){
if(!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
||!record.getLease().equals(dbRent.getLease())
||!record.getType().equals(dbRent.getType())
||!record.getPrice().equals(dbRent.getPrice())
||!record.getAdjustRatio().equals(dbRent.getAdjustRatio())
//对比上一次,是否有更改,有,重新生成预账单
WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(record.getId());
boolean change = false;
if(record.getReceivePeriod() != null && record.getLease()!=null && record.getPrice()!= null) {
if (record.getType().equals(EnumRentContractType.RENT_BY_AREA.getCode())) {
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
|| !record.getLease().equals(dbRent.getLease())
|| !record.getType().equals(dbRent.getType())
|| !record.getPrice().equals(dbRent.getPrice())
|| !record.getAdjustRatio().equals(dbRent.getAdjustRatio())
) { ) {
change = true; change = true;
} }
}else if(record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())){
if(!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
||!record.getLease().equals(dbRent.getLease())
||!record.getType().equals(dbRent.getType())
||!record.getRevenue().equals(dbRent.getRevenue())
||!record.getPayRatio().equals(dbRent.getPayRatio())
} else if (record.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
|| !record.getLease().equals(dbRent.getLease())
|| !record.getType().equals(dbRent.getType())
|| !record.getRevenue().equals(dbRent.getRevenue())
|| !record.getPayRatio().equals(dbRent.getPayRatio())
) { ) {
change = true; change = true;
} }
}else if(record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())){
if(!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
||!record.getLease().equals(dbRent.getLease())
||!record.getType().equals(dbRent.getType())
||!record.getPrice().equals(dbRent.getPrice())
||!record.getPayRatio().equals(dbRent.getPayRatio())
} else if (record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) {
if (!record.getReceivePeriod().equals(dbRent.getReceivePeriod())
|| !record.getLease().equals(dbRent.getLease())
|| !record.getType().equals(dbRent.getType())
|| !record.getPrice().equals(dbRent.getPrice())
|| !record.getPayRatio().equals(dbRent.getPayRatio())
) { ) {
change = true; change = true;
} }
} }

if(change) {
wxBillRentMapper.deletePreviewBill(record);
//重新生成
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
}else{
//查询预账单用于展示
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setRentContractId(record.getId());
wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
resultList = wxBillRentMapper.findList(wxBillRent);
}
} }
// 更新
ResultData resultData = getResultDataForUpdate(record, userId); ResultData resultData = getResultDataForUpdate(record, userId);


//有改变,删除预账单,重新生成
List<WxBillRent> resultList;
if(change) {
wxBillRentMapper.deletePreviewBill(record);
resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode());
}else{
//查询预账单用于展示
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setRentContractId(record.getId());
wxBillRent.setSortColumns(WxBillRent.Field.Period_ASC);
wxBillRent.setIsPreview(EnumIsPreview.YES.getCode());
resultList = wxBillRentMapper.findList(wxBillRent);
}

//启动审批流 //启动审批流
if(record.getFlowParams() != null){ if(record.getFlowParams() != null){
record.getFlowParams().put("businessId",record.getId().toString()); record.getFlowParams().put("businessId",record.getId().toString());
@@ -314,6 +312,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
logger.info("id:{},启动审批流成功 ,是否补录:{}",record.getId().toString(),record.getMerchantId() != null); logger.info("id:{},启动审批流成功 ,是否补录:{}",record.getId().toString(),record.getMerchantId() != null);
} }



WxRentContract wxRentContract = (WxRentContract)resultData.data; WxRentContract wxRentContract = (WxRentContract)resultData.data;
wxRentContract.setPreviewBillRentList(resultList); wxRentContract.setPreviewBillRentList(resultList);
return new ResultData(wxRentContract); return new ResultData(wxRentContract);
@@ -524,7 +523,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRent.setId(idWorker.nextId()); wxBillRent.setId(idWorker.nextId());
wxBillRent.setRentContractId(wxRentContract.getId()); wxBillRent.setRentContractId(wxRentContract.getId());
wxBillRent.setPay(0); wxBillRent.setPay(0);
System.out.println("-----------price:"+price+",receivePeriod:"+receivePeriod);
int needpay = price * receivePeriod; int needpay = price * receivePeriod;
System.out.println("--------needpay:"+needpay);



Date date = new Date(); Date date = new Date();
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();


+ 0
- 1
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Wyświetl plik

@@ -141,7 +141,6 @@
<update id="update" parameterType="com.iformall.domain.po.WxBillProperty"> <update id="update" parameterType="com.iformall.domain.po.WxBillProperty">
update wx_bill_property set updatetime = now() update wx_bill_property set updatetime = now()
<if test=" null != receivePay ">,receive_pay = #{receivePay}</if> <if test=" null != receivePay ">,receive_pay = #{receivePay}</if>
<if test=" null != needPay ">,need_pay = #{needPay}</if>
where id = #{id} where id = #{id}
</update> </update>




+ 0
- 1
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Wyświetl plik

@@ -136,7 +136,6 @@
<update id="update" parameterType="com.iformall.domain.po.WxBillRent"> <update id="update" parameterType="com.iformall.domain.po.WxBillRent">
update wx_bill_rent set updatetime = now() update wx_bill_rent set updatetime = now()
<if test=" null != receivePay ">,receive_pay = #{receivePay}</if> <if test=" null != receivePay ">,receive_pay = #{receivePay}</if>
<if test=" null != needPay ">,need_pay = #{needPay}</if>
where id = #{id} where id = #{id}
</update> </update>




Ładowanie…
Anuluj
Zapisz