|
|
|
@@ -13,14 +13,16 @@ import com.iformall.domain.vo.BillTimeVo; |
|
|
|
import com.iformall.enums.*; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.*; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.service.WxFlowRecordService; |
|
|
|
import com.iformall.service.WxFlowService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.WxRentContractService; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import com.iformall.utils.DownFileUtil; |
|
|
|
import com.iformall.utils.PriceUtil; |
|
|
|
import com.iformall.utils.WordUtil; |
|
|
|
import org.apache.commons.collections.map.HashedMap; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.poi.ss.usermodel.DateUtil; |
|
|
|
import org.apache.shiro.SecurityUtils; |
|
|
|
import org.flowable.engine.RuntimeService; |
|
|
|
import org.flowable.engine.TaskService; |
|
|
|
@@ -38,7 +40,6 @@ import java.io.File; |
|
|
|
import java.io.IOException; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.RoundingMode; |
|
|
|
import java.text.DecimalFormat; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
@@ -1385,13 +1386,20 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
double priceRent = new BigDecimal(wxRentContract.getPrice()) |
|
|
|
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("priceRent", priceRent); |
|
|
|
double unitPrice = new BigDecimal(wxRentContract.getPrice()) |
|
|
|
.divide(new BigDecimal(wxRentContract.getRentArea()), 2, RoundingMode.HALF_EVEN) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("unitPriceRent", unitPrice); |
|
|
|
result.put("priceRentUpper", PriceUtil.digitUppercase(priceRent)); |
|
|
|
result.put("unitPriceRentUpper", PriceUtil.digitUppercase(unitPrice)); |
|
|
|
if (!wxRentContract.getRentArea().equals("0")) { |
|
|
|
double unitPrice = new BigDecimal(wxRentContract.getPrice()) |
|
|
|
.divide(new BigDecimal(wxRentContract.getRentArea()), 2, RoundingMode.HALF_EVEN) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("unitPriceRent", unitPrice); |
|
|
|
result.put("priceRentUpper", PriceUtil.digitUppercase(priceRent)); |
|
|
|
result.put("unitPriceRentUpper", PriceUtil.digitUppercase(unitPrice)); |
|
|
|
} else { |
|
|
|
result.put("unitPriceRent", 0); |
|
|
|
result.put("priceRentUpper", "0"); |
|
|
|
result.put("unitPriceRentUpper", "0"); |
|
|
|
} |
|
|
|
|
|
|
|
//租赁保证金 |
|
|
|
int cashDepositMonthRent = 3; |
|
|
|
double cashDepositRent = new BigDecimal(wxRentContract.getPrice()).multiply(new BigDecimal(cashDepositMonthRent)) |
|
|
|
|