winter 1 год назад
Родитель
Сommit
358e81c107
2 измененных файлов: 2 добавлений и 3 удалений
  1. +0
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 0
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java Просмотреть файл

@@ -128,8 +128,6 @@ public class WxShopController extends BaseController {
} }
wxShop.updateTenantInfo(getTenantInfo()); wxShop.updateTenantInfo(getTenantInfo());
if (null != wxShop.getSortWay() && 1 == wxShop.getSortWay()) { if (null != wxShop.getSortWay() && 1 == wxShop.getSortWay()) {
wxShop.setSortColumns(SortField.CreateDate_DESC);
}else if (null != wxShop.getSortWay() && 2 == wxShop.getSortWay()) {
wxShop.setSortColumns(SortField.UpdateDate_DESC); wxShop.setSortColumns(SortField.UpdateDate_DESC);
}else { }else {
wxShop.setSortColumn("shop_number asc"); wxShop.setSortColumn("shop_number asc");


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -1574,7 +1574,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
BigDecimal shoprentArea = shopAreaRateMap.get(sid); BigDecimal shoprentArea = shopAreaRateMap.get(sid);
BigDecimal shoprate = shoprentArea.divide(new BigDecimal(wxRentContract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); BigDecimal shoprate = shoprentArea.divide(new BigDecimal(wxRentContract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP);
try { try {
BeanUtils.copyProperties(rs, rb);
System.out.println(" mmmmmmmmmmmm >>> rentArea:"+rb.getRentArea()+";period"+rb.getPeriod()+";receiveDate:"+rb.getReceiveDate());
BeanUtils.copyProperties(rs, rb);
rs.setId(idWorker.nextId()); rs.setId(idWorker.nextId());
rs.setShopId(sid); rs.setShopId(sid);
rs.setNeedPay(new BigDecimal(rb.getNeedPay()).multiply(shoprate).setScale(wxRentContract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString()); rs.setNeedPay(new BigDecimal(rb.getNeedPay()).multiply(shoprate).setScale(wxRentContract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString());


Загрузка…
Отмена
Сохранить