Compare commits

..

No commits in common. "2d50db41d097f2cbdaf66e4ba5343cdaae346e43" and "01dd0687de7fbeedf5c63326c84bd92831061790" have entirely different histories.

2 changed files with 0 additions and 7 deletions

View File

@ -126,9 +126,6 @@ public class ShopStoreInfo implements Serializable {
@ApiModelProperty(value = "店铺内部运费单位0-使用平台的内部运费;>0 使用店铺的内部运费") @ApiModelProperty(value = "店铺内部运费单位0-使用平台的内部运费;>0 使用店铺的内部运费")
private Integer shopping_fee_inner; private Integer shopping_fee_inner;
@ApiModelProperty(value = "是否自配送1-是2-否;")
private Integer is_delivery_self;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "新增时间") @ApiModelProperty(value = "新增时间")

View File

@ -2503,10 +2503,6 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
} }
} }
// 店铺内部配送费
info.setShopping_fee_inner(Convert.toInt(getParameter("shopping_fee_inner", 0)));
info.setIs_delivery_self(Convert.toInt(getParameter("is_delivery_self", 0)));
// 百度坐标系BD09经纬度 转出 火星坐标系GCJ02经纬度 因为数据库保存的经纬度统一是GCJ02经纬度所以需要转换 // 百度坐标系BD09经纬度 转出 火星坐标系GCJ02经纬度 因为数据库保存的经纬度统一是GCJ02经纬度所以需要转换
base = bd09ToGcj02Gps(base); base = bd09ToGcj02Gps(base);