diff --git a/mallinkAdmin/src/main/resources/db/migration/V201907241543__G_ALTER_SHOP.sql b/mallinkAdmin/src/main/resources/db/migration/V201907241543__G_ALTER_SHOP.sql new file mode 100644 index 000000000..c24a0102d --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201907241543__G_ALTER_SHOP.sql @@ -0,0 +1 @@ +alter table wx_shop modify `rent` varchar(20) DEFAULT '' COMMENT '参与租金'; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index fcc439029..af7f1d16a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -126,16 +126,7 @@ public class WxShop extends BaseEntity { private Integer freeDay; @io.swagger.annotations.ApiModelProperty(value = "参考租金", name = "rent") - private Long rent; - - public String getRentStr() { - return rent != null ? new BigDecimal(rent).divide(new BigDecimal(100)).setScale(2).toPlainString() : "0"; - } - - @Transient - @io.swagger.annotations.ApiModelProperty(value = "参考租金", name = "rentStr") - private String rentStr; - + private String rent; @io.swagger.annotations.ApiModelProperty(value = "预置业态", name = "businessId") private Long businessId; 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 41f6a95ab..943d4d1e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -25,7 +25,6 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; import java.util.*; @Service @@ -72,10 +71,6 @@ public class WxShopServiceImpl implements WxShopService { @Override public ResultData saveOrUpdate(WxShop record) { - if (StringUtils.isNotEmpty(record.getRentStr())) { - long rent = new BigDecimal(record.getRentStr()).multiply(new BigDecimal(100)).longValue(); - record.setRent(rent); - } if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId());