[优化合同需求][修改][调整年的租价]

mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java

@@ -92,6 +92,7 @@ public class MqBaseConsumer {
 
                 if(null != baseMsg){
                     if(baseMsg.getDelayTimeLevel() < 4){
+                        log.info("消息重试，DelayTimeLevel: "+baseMsg.getDelayTimeLevel());
                         Thread.sleep(5000);
                         baseMsg.setDelayTimeLevel(baseMsg.getDelayTimeLevel()+1);
                         mqBaseProducer.sendMessage(baseMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());

mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

@@ -811,6 +811,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
             Integer lease = wxPropertyContract.getLease();
             Date rentalStartDate = propertyContract.getRentalStartDate();
             Long price = propertyContract.getPrice();
+            if(EnumPriceUnit.Y.getCode().equals(propertyContract.getPriceUnit())){
+                price = price/12;
+            }
 
             //按月计租
             if (propertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode())

mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

@@ -707,6 +707,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
 
             Date rentalStartDate = wxRentContract.getRentalStartDate();
             Long price = wxRentContract.getPrice();
+            if(EnumPriceUnit.Y.getCode().equals(wxRentContract.getPriceUnit())){
+                price = price/12;
+            }
 
             //按月计租
             if (wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode())