diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 2fa42b317..a3342839f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -128,8 +128,6 @@ public class WxShopController extends BaseController { } wxShop.updateTenantInfo(getTenantInfo()); 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); }else { wxShop.setSortColumn("shop_number asc"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index a32b62d18..aab0249a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/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 shoprate = shoprentArea.divide(new BigDecimal(wxRentContract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); 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.setShopId(sid); rs.setNeedPay(new BigDecimal(rb.getNeedPay()).multiply(shoprate).setScale(wxRentContract.getDecimalSize(),BigDecimal.ROUND_HALF_UP).toPlainString());