diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 5850835bc..6fe0e42d8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.iformall.common.SortColumn; import com.iformall.domain.vo.WxCouponStatisVo; import org.apache.commons.lang3.StringUtils; @@ -61,15 +62,19 @@ public class WxCoupon extends BaseEntity { } @Transient + @SortColumn(column = "sale_price") private String salePriceStr; @Transient + @SortColumn(column = "use_price") private String usePriceStr; @Transient + @SortColumn(column = "price") private String priceStr; @Transient + @SortColumn(column = "subsidy_num") private String subsidyNumStr; @Transient diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index ce7539119..ea7db76d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -171,11 +171,11 @@ public class WxShopServiceImpl implements WxShopService { List notRentShopVoList = new ArrayList<>(); for (Map m:shops) { WxNotRentShopVo notRentShopVo = new WxNotRentShopVo(); - notRentShopVo.setBuildArea((String)m.get("buildArea")); - notRentShopVo.setBuilding((String)m.get("building")); + notRentShopVo.setBuildArea(((Long)m.get("buildArea")).toString()); + notRentShopVo.setBuilding(((String)m.get("building"))); notRentShopVo.setFloor((String)m.get("floor")); notRentShopVo.setFreeDay((Long) m.get("freeDay")); - notRentShopVo.setOperationArea((String) m.get("operationArea")); + notRentShopVo.setOperationArea(((Long) m.get("operationArea")).toString()); Integer point = (Integer) m.get("type"); if(point != null){ notRentShopVo.setPointType(EnumRentShopType.getEnum(point).getMessage());