diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreAdsMapper.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreAdsMapper.java new file mode 100644 index 0000000..da4d03d --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreAdsMapper.java @@ -0,0 +1,18 @@ +package com.ruoyi.app.common.persistence.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.app.common.persistence.model.StoreAds; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 首页轮播广告 Mapper 接口 + *

+ * + * @author hupeng + * @since 2019-09-05 + */ +@Mapper +public interface StoreAdsMapper extends BaseMapper { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreGoodsMapper.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreGoodsMapper.java new file mode 100644 index 0000000..c2c9d92 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreGoodsMapper.java @@ -0,0 +1,17 @@ +package com.ruoyi.app.common.persistence.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.app.common.persistence.model.StoreGoods; + + +/** + *

+ * 商品主表 Mapper 接口 + *

+ * + * @author hupeng + * @since 2019-09-05 + */ +public interface StoreGoodsMapper extends BaseMapper { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreMemberDao.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreMemberMapper.java similarity index 73% rename from ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreMemberDao.java rename to ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreMemberMapper.java index e39e84f..a0ed6d2 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreMemberDao.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/StoreMemberMapper.java @@ -6,6 +6,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper -public interface StoreMemberDao extends BaseMapper { +public interface StoreMemberMapper extends BaseMapper { } diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/WechatNewsArticleMapper.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/WechatNewsArticleMapper.java new file mode 100644 index 0000000..d093b50 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/WechatNewsArticleMapper.java @@ -0,0 +1,17 @@ +package com.ruoyi.app.common.persistence.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.app.common.persistence.model.WechatNewsArticle; + + +/** + *

+ * 微信素材表 Mapper 接口 + *

+ * + * @author hupeng + * @since 2019-09-05 + */ +public interface WechatNewsArticleMapper extends BaseMapper { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreAdsMapper.xml b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreAdsMapper.xml new file mode 100644 index 0000000..852d1ba --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreAdsMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreGoodsMapper.xml b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreGoodsMapper.xml new file mode 100644 index 0000000..e6c56f8 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreGoodsMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreMemberMapper.xml b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreMemberMapper.xml index 7b7ca54..51d0e93 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreMemberMapper.xml +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/StoreMemberMapper.xml @@ -5,18 +5,12 @@ - - - - - - @@ -25,21 +19,12 @@ - - - - - - - - - diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/WechatNewsArticleMapper.xml b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/WechatNewsArticleMapper.xml new file mode 100644 index 0000000..acea176 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/dao/mapping/WechatNewsArticleMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/StoreAds.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/StoreAds.java new file mode 100644 index 0000000..d368ea9 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/StoreAds.java @@ -0,0 +1,113 @@ +package com.ruoyi.app.common.persistence.model; + +import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * 首页轮播广告 + *

+ * + * @author hupeng + * @since 2019-09-05 + */ +@TableName("store_ads") +public class StoreAds extends Model { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + /** + * 视频url + */ + @TableField("video_url") + private String videoUrl; + /** + * 轮播图片地址 + */ + private String url; + /** + * 类型1-视频 2-图片 + */ + private Integer type; + /** + * 序号 + */ + private Integer sort; + /** + * 创建时间 + */ + @TableField("create_time") + private Long createTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getVideoUrl() { + return videoUrl; + } + + public void setVideoUrl(String videoUrl) { + this.videoUrl = videoUrl; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Long getCreateTime() { + return createTime; + } + + public void setCreateTime(Long createTime) { + this.createTime = createTime; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "StoreAds{" + + ", id=" + id + + ", videoUrl=" + videoUrl + + ", url=" + url + + ", type=" + type + + ", sort=" + sort + + ", createTime=" + createTime + + "}"; + } +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/StoreGoods.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/StoreGoods.java new file mode 100644 index 0000000..09f0bb6 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/StoreGoods.java @@ -0,0 +1,659 @@ +package com.ruoyi.app.common.persistence.model; + +import com.baomidou.mybatisplus.enums.IdType; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * 商品主表 + *

+ * + * @author hupeng + * @since 2019-09-05 + */ +@TableName("store_goods") +public class StoreGoods extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 商品id + */ + @TableId(value = "goods_id", type = IdType.AUTO) + private Integer goodsId; + /** + * 分类id + */ + @TableField("cate_id") + private Integer cateId; + /** + * 扩展分类id + */ + @TableField("extend_cat_id") + private Integer extendCatId; + /** + * 商品编号 + */ + @TableField("goods_sn") + private String goodsSn; + /** + * 商品名称 + */ + @TableField("goods_name") + private String goodsName; + /** + * 点击数 + */ + @TableField("click_count") + private Integer clickCount; + /** + * 品牌id + */ + @TableField("brand_id") + private Integer brandId; + /** + * 库存数量 + */ + @TableField("store_count") + private Integer storeCount; + /** + * 商品评论数 + */ + @TableField("comment_count") + private Integer commentCount; + /** + * 商品重量克为单位 + */ + private Integer weight; + /** + * 商品体积。单位立方米 + */ + private Double volume; + /** + * 市场价(零售价) + */ + @TableField("market_price") + private BigDecimal marketPrice; + /** + * 本店价(供货价) + */ + @TableField("shop_price") + private BigDecimal shopPrice; + /** + * 商品成本价 + */ + @TableField("cost_price") + private BigDecimal costPrice; + /** + * 价格阶梯 + */ + @TableField("price_ladder") + private String priceLadder; + /** + * 商品关键词 + */ + private String keywords; + /** + * 商品简单描述 + */ + @TableField("goods_remark") + private String goodsRemark; + /** + * 商品详细描述 + */ + @TableField("goods_content") + private String goodsContent; + /** + * 手机端商品详情 + */ + @TableField("mobile_content") + private String mobileContent; + /** + * 商品上传原始图(主图) + */ + @TableField("goods_logo") + private String goodsLogo; + /** + * 是否为虚拟商品 1是，0否 + */ + @TableField("is_virtual") + private Integer isVirtual; + /** + * 虚拟商品有效期 + */ + @TableField("virtual_indate") + private Integer virtualIndate; + /** + * 虚拟商品购买上限 + */ + @TableField("virtual_limit") + private Integer virtualLimit; + /** + * 是否允许过期退款， 1是，0否 + */ + @TableField("virtual_refund") + private Integer virtualRefund; + /** + * 是否上架 0-未上架 1-销售中 + */ + @TableField("is_on_sale") + private Integer isOnSale; + /** + * 是否包邮0否1是 + */ + @TableField("is_free_shipping") + private Integer isFreeShipping; + /** + * 商品上架时间 + */ + @TableField("on_time") + private Integer onTime; + /** + * 商品排序 + */ + private Integer sort; + /** + * 是否推荐0-未推荐 1-已推荐 + */ + @TableField("is_recommend") + private Integer isRecommend; + /** + * 是否新品0-不是 1-是 + */ + @TableField("is_new") + private Integer isNew; + /** + * 是否热卖 + */ + @TableField("is_hot") + private Integer isHot; + /** + * 最后更新时间 + */ + @TableField("last_update") + private Integer lastUpdate; + /** + * 商品所属类型id，取值表goods_type的id + */ + @TableField("goods_type") + private Integer goodsType; + /** + * 商品规格类型，取值表goods_type的id + */ + @TableField("spec_type") + private Integer specType; + /** + * 购买商品赠送积分 + */ + @TableField("give_integral") + private Integer giveIntegral; + /** + * 积分兑换：0不参与积分兑换，积分和现金的兑换比例见后台配置 + */ + @TableField("exchange_integral") + private Integer exchangeIntegral; + /** + * 供货商ID + */ + @TableField("suppliers_id") + private Integer suppliersId; + /** + * 商品销量 + */ + @TableField("sales_sum") + private Integer salesSum; + /** + * 0默认1抢购2团购3优惠促销4预售5虚拟(5其实没用)6拼团 + */ + @TableField("prom_type") + private Integer promType; + /** + * 优惠活动id + */ + @TableField("prom_id") + private Integer promId; + /** + * 佣金用于分销分成 + */ + private BigDecimal commission; + /** + * SPU + */ + private String spu; + /** + * SKU + */ + private String sku; + /** + * 运费模板ID + */ + @TableField("template_id") + private Integer templateId; + /** + * 视频 + */ + @TableField("goods_video") + private String goodsVideo; + + + public Integer getGoodsId() { + return goodsId; + } + + public void setGoodsId(Integer goodsId) { + this.goodsId = goodsId; + } + + public Integer getCateId() { + return cateId; + } + + public void setCateId(Integer cateId) { + this.cateId = cateId; + } + + public Integer getExtendCatId() { + return extendCatId; + } + + public void setExtendCatId(Integer extendCatId) { + this.extendCatId = extendCatId; + } + + public String getGoodsSn() { + return goodsSn; + } + + public void setGoodsSn(String goodsSn) { + this.goodsSn = goodsSn; + } + + public String getGoodsName() { + return goodsName; + } + + public void setGoodsName(String goodsName) { + this.goodsName = goodsName; + } + + public Integer getClickCount() { + return clickCount; + } + + public void setClickCount(Integer clickCount) { + this.clickCount = clickCount; + } + + public Integer getBrandId() { + return brandId; + } + + public void setBrandId(Integer brandId) { + this.brandId = brandId; + } + + public Integer getStoreCount() { + return storeCount; + } + + public void setStoreCount(Integer storeCount) { + this.storeCount = storeCount; + } + + public Integer getCommentCount() { + return commentCount; + } + + public void setCommentCount(Integer commentCount) { + this.commentCount = commentCount; + } + + public Integer getWeight() { + return weight; + } + + public void setWeight(Integer weight) { + this.weight = weight; + } + + public Double getVolume() { + return volume; + } + + public void setVolume(Double volume) { + this.volume = volume; + } + + public BigDecimal getMarketPrice() { + return marketPrice; + } + + public void setMarketPrice(BigDecimal marketPrice) { + this.marketPrice = marketPrice; + } + + public BigDecimal getShopPrice() { + return shopPrice; + } + + public void setShopPrice(BigDecimal shopPrice) { + this.shopPrice = shopPrice; + } + + public BigDecimal getCostPrice() { + return costPrice; + } + + public void setCostPrice(BigDecimal costPrice) { + this.costPrice = costPrice; + } + + public String getPriceLadder() { + return priceLadder; + } + + public void setPriceLadder(String priceLadder) { + this.priceLadder = priceLadder; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } + + public String getGoodsRemark() { + return goodsRemark; + } + + public void setGoodsRemark(String goodsRemark) { + this.goodsRemark = goodsRemark; + } + + public String getGoodsContent() { + return goodsContent; + } + + public void setGoodsContent(String goodsContent) { + this.goodsContent = goodsContent; + } + + public String getMobileContent() { + return mobileContent; + } + + public void setMobileContent(String mobileContent) { + this.mobileContent = mobileContent; + } + + public String getGoodsLogo() { + return goodsLogo; + } + + public void setGoodsLogo(String goodsLogo) { + this.goodsLogo = goodsLogo; + } + + public Integer getIsVirtual() { + return isVirtual; + } + + public void setIsVirtual(Integer isVirtual) { + this.isVirtual = isVirtual; + } + + public Integer getVirtualIndate() { + return virtualIndate; + } + + public void setVirtualIndate(Integer virtualIndate) { + this.virtualIndate = virtualIndate; + } + + public Integer getVirtualLimit() { + return virtualLimit; + } + + public void setVirtualLimit(Integer virtualLimit) { + this.virtualLimit = virtualLimit; + } + + public Integer getVirtualRefund() { + return virtualRefund; + } + + public void setVirtualRefund(Integer virtualRefund) { + this.virtualRefund = virtualRefund; + } + + public Integer getIsOnSale() { + return isOnSale; + } + + public void setIsOnSale(Integer isOnSale) { + this.isOnSale = isOnSale; + } + + public Integer getIsFreeShipping() { + return isFreeShipping; + } + + public void setIsFreeShipping(Integer isFreeShipping) { + this.isFreeShipping = isFreeShipping; + } + + public Integer getOnTime() { + return onTime; + } + + public void setOnTime(Integer onTime) { + this.onTime = onTime; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public Integer getIsRecommend() { + return isRecommend; + } + + public void setIsRecommend(Integer isRecommend) { + this.isRecommend = isRecommend; + } + + public Integer getIsNew() { + return isNew; + } + + public void setIsNew(Integer isNew) { + this.isNew = isNew; + } + + public Integer getIsHot() { + return isHot; + } + + public void setIsHot(Integer isHot) { + this.isHot = isHot; + } + + public Integer getLastUpdate() { + return lastUpdate; + } + + public void setLastUpdate(Integer lastUpdate) { + this.lastUpdate = lastUpdate; + } + + public Integer getGoodsType() { + return goodsType; + } + + public void setGoodsType(Integer goodsType) { + this.goodsType = goodsType; + } + + public Integer getSpecType() { + return specType; + } + + public void setSpecType(Integer specType) { + this.specType = specType; + } + + public Integer getGiveIntegral() { + return giveIntegral; + } + + public void setGiveIntegral(Integer giveIntegral) { + this.giveIntegral = giveIntegral; + } + + public Integer getExchangeIntegral() { + return exchangeIntegral; + } + + public void setExchangeIntegral(Integer exchangeIntegral) { + this.exchangeIntegral = exchangeIntegral; + } + + public Integer getSuppliersId() { + return suppliersId; + } + + public void setSuppliersId(Integer suppliersId) { + this.suppliersId = suppliersId; + } + + public Integer getSalesSum() { + return salesSum; + } + + public void setSalesSum(Integer salesSum) { + this.salesSum = salesSum; + } + + public Integer getPromType() { + return promType; + } + + public void setPromType(Integer promType) { + this.promType = promType; + } + + public Integer getPromId() { + return promId; + } + + public void setPromId(Integer promId) { + this.promId = promId; + } + + public BigDecimal getCommission() { + return commission; + } + + public void setCommission(BigDecimal commission) { + this.commission = commission; + } + + public String getSpu() { + return spu; + } + + public void setSpu(String spu) { + this.spu = spu; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } + + public Integer getTemplateId() { + return templateId; + } + + public void setTemplateId(Integer templateId) { + this.templateId = templateId; + } + + public String getGoodsVideo() { + return goodsVideo; + } + + public void setGoodsVideo(String goodsVideo) { + this.goodsVideo = goodsVideo; + } + + @Override + protected Serializable pkVal() { + return this.goodsId; + } + + @Override + public String toString() { + return "StoreGoods{" + + ", goodsId=" + goodsId + + ", cateId=" + cateId + + ", extendCatId=" + extendCatId + + ", goodsSn=" + goodsSn + + ", goodsName=" + goodsName + + ", clickCount=" + clickCount + + ", brandId=" + brandId + + ", storeCount=" + storeCount + + ", commentCount=" + commentCount + + ", weight=" + weight + + ", volume=" + volume + + ", marketPrice=" + marketPrice + + ", shopPrice=" + shopPrice + + ", costPrice=" + costPrice + + ", priceLadder=" + priceLadder + + ", keywords=" + keywords + + ", goodsRemark=" + goodsRemark + + ", goodsContent=" + goodsContent + + ", mobileContent=" + mobileContent + + ", goodsLogo=" + goodsLogo + + ", isVirtual=" + isVirtual + + ", virtualIndate=" + virtualIndate + + ", virtualLimit=" + virtualLimit + + ", virtualRefund=" + virtualRefund + + ", isOnSale=" + isOnSale + + ", isFreeShipping=" + isFreeShipping + + ", onTime=" + onTime + + ", sort=" + sort + + ", isRecommend=" + isRecommend + + ", isNew=" + isNew + + ", isHot=" + isHot + + ", lastUpdate=" + lastUpdate + + ", goodsType=" + goodsType + + ", specType=" + specType + + ", giveIntegral=" + giveIntegral + + ", exchangeIntegral=" + exchangeIntegral + + ", suppliersId=" + suppliersId + + ", salesSum=" + salesSum + + ", promType=" + promType + + ", promId=" + promId + + ", commission=" + commission + + ", spu=" + spu + + ", sku=" + sku + + ", templateId=" + templateId + + ", goodsVideo=" + goodsVideo + + "}"; + } +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/WechatNewsArticle.java b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/WechatNewsArticle.java new file mode 100644 index 0000000..4c22bb4 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/common/persistence/model/WechatNewsArticle.java @@ -0,0 +1,169 @@ +package com.ruoyi.app.common.persistence.model; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +/** + *

+ * 微信素材表 + *

+ * + * @author hupeng + * @since 2019-09-05 + */ +@TableName("wechat_news_article") +public class WechatNewsArticle extends Model { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 素材标题 + */ + private String title; + /** + * 永久素材显示URL + */ + @TableField("local_url") + private String localUrl; + /** + * 是否显示封面 0不显示，1 显示 + */ + @TableField("show_cover_pic") + private Integer showCoverPic; + /** + * 作者 + */ + private String author; + /** + * 摘要内容 + */ + private String digest; + /** + * 图文内容 + */ + private String content; + /** + * 图文消息原文地址 + */ + @TableField("content_source_url") + private String contentSourceUrl; + /** + * 创建时间 + */ + @TableField("create_at") + private Date createAt; + /** + * 创建人 + */ + @TableField("create_by") + private Long createBy; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getLocalUrl() { + return localUrl; + } + + public void setLocalUrl(String localUrl) { + this.localUrl = localUrl; + } + + public Integer getShowCoverPic() { + return showCoverPic; + } + + public void setShowCoverPic(Integer showCoverPic) { + this.showCoverPic = showCoverPic; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getDigest() { + return digest; + } + + public void setDigest(String digest) { + this.digest = digest; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getContentSourceUrl() { + return contentSourceUrl; + } + + public void setContentSourceUrl(String contentSourceUrl) { + this.contentSourceUrl = contentSourceUrl; + } + + public Date getCreateAt() { + return createAt; + } + + public void setCreateAt(Date createAt) { + this.createAt = createAt; + } + + public Long getCreateBy() { + return createBy; + } + + public void setCreateBy(Long createBy) { + this.createBy = createBy; + } + + @Override + protected Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "WechatNewsArticle{" + + ", id=" + id + + ", title=" + title + + ", localUrl=" + localUrl + + ", showCoverPic=" + showCoverPic + + ", author=" + author + + ", digest=" + digest + + ", content=" + content + + ", contentSourceUrl=" + contentSourceUrl + + ", createAt=" + createAt + + ", createBy=" + createBy + + "}"; + } +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/dto/MemberDTO.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/dto/MemberDTO.java index 4b3bf3e..505dca3 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/dto/MemberDTO.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/dto/MemberDTO.java @@ -14,22 +14,7 @@ public class MemberDTO implements Serializable { private Long id; private Integer storeId; - /** - * vip编号 - */ - private String vipNo; - /** - * 会员微信OPENID - */ - //private String openid; - /** - * 商家版小程序openid - */ - //private String sellerOpenid; - /** - * 公众号openid - */ - //private String wxOpenid; + /** * unionid唯一标识 */ @@ -39,9 +24,6 @@ public class MemberDTO implements Serializable { */ private String phone; - //private String password; - - // private String payPassword; /** * 会员昵称 */ @@ -50,10 +32,7 @@ public class MemberDTO implements Serializable { * 会员头像 */ private String headimg; - /** - * 用户类型 1-普通用户 2-商家用户 - */ - private Integer userType; + /** * 性别 */ @@ -70,26 +49,18 @@ public class MemberDTO implements Serializable { * 用户金额 */ private BigDecimal userMoney; - /** - * 累积分佣金额 - */ - private BigDecimal distributMoney; + /** * 冻结金额 */ private Double frozenMoney; - /** - * 用户下线总数 - */ - private Integer underlingNumber; + + /** * 消费积分(可用积分) */ private Integer payPoints; - /** - * 冻结积分 - */ - private Integer frozenPoints; + /** * 默认收货地址 */ @@ -102,44 +73,7 @@ public class MemberDTO implements Serializable { * 会员状态0待审核 1-已审核 2-已拒绝 */ private Integer status; - private Long createTime; - /** - * 创建时间 - */ - private Date createAt; - /** - * 审核时间 - */ - private Long statusTime; - private Date loginAt; - /** - * 登录次数 - */ - private Integer loginNum; - /** - * 是否为分销商 0 否 1 是 - */ - private Integer isDistribut; - /** - * 第一个上级 - */ - private Long firstLeader; - /** - * 第二个上级 - */ - private Long secondLeader; - /** - * 第三个上级 - */ - private Long thirdLeader; - /** - * 是否是超管 1-是 0不是 - */ - private Integer isSuper; - /** - * 分销推广二维码图片 - */ - private String spreadQrcode; + diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/impl/MemberServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/impl/MemberServiceImpl.java index 763c872..709afe3 100644 --- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/impl/MemberServiceImpl.java +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/member/service/impl/MemberServiceImpl.java @@ -3,7 +3,7 @@ package com.ruoyi.app.modular.member.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.app.common.persistence.dao.StoreMemberDao; +import com.ruoyi.app.common.persistence.dao.StoreMemberMapper; import com.ruoyi.app.common.persistence.model.StoreMember; import com.ruoyi.app.modular.member.service.IMemberService; import com.ruoyi.app.modular.member.service.dto.MemberDTO; @@ -15,10 +15,10 @@ import javax.annotation.Resource; import java.util.List; @Service -public class MemberServiceImpl extends ServiceImpl implements IMemberService { +public class MemberServiceImpl extends ServiceImpl implements IMemberService { @Autowired - private StoreMemberDao storeMemberMapper; + private StoreMemberMapper storeMemberMapper; @Autowired private MemberMapper memberMapper; diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IAdService.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IAdService.java new file mode 100644 index 0000000..bab33c7 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IAdService.java @@ -0,0 +1,12 @@ +package com.ruoyi.app.modular.shop.service; + + + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.app.common.persistence.model.StoreAds; + + +public interface IAdService extends IService { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IGoodsService.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IGoodsService.java new file mode 100644 index 0000000..f6f4c8c --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IGoodsService.java @@ -0,0 +1,12 @@ +package com.ruoyi.app.modular.shop.service; + + + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.app.common.persistence.model.StoreGoods; + + +public interface IGoodsService extends IService { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/INewsService.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/INewsService.java new file mode 100644 index 0000000..71008f4 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/INewsService.java @@ -0,0 +1,12 @@ +package com.ruoyi.app.modular.shop.service; + + + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.app.common.persistence.model.WechatNewsArticle; + + +public interface INewsService extends IService { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/AdServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/AdServiceImpl.java new file mode 100644 index 0000000..92e063d --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/AdServiceImpl.java @@ -0,0 +1,16 @@ +package com.ruoyi.app.modular.shop.service.impl; + + +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.app.common.persistence.dao.StoreAdsMapper; +import com.ruoyi.app.common.persistence.model.StoreAds; +import com.ruoyi.app.modular.shop.service.IAdService; + +import org.springframework.stereotype.Service; + + +@Service +public class AdServiceImpl extends ServiceImpl implements IAdService { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/GoodsServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/GoodsServiceImpl.java new file mode 100644 index 0000000..be8b0f5 --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/GoodsServiceImpl.java @@ -0,0 +1,16 @@ +package com.ruoyi.app.modular.shop.service.impl; + + +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.app.common.persistence.dao.StoreGoodsMapper; +import com.ruoyi.app.common.persistence.model.StoreGoods; +import com.ruoyi.app.modular.shop.service.IGoodsService; +import org.springframework.stereotype.Service; + + +@Service +public class GoodsServiceImpl extends ServiceImpl implements IGoodsService { + +} diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/NewsServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/NewsServiceImpl.java new file mode 100644 index 0000000..5e9561a --- /dev/null +++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/NewsServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.app.modular.shop.service.impl; + + +//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.app.common.persistence.dao.StoreAdsMapper; +import com.ruoyi.app.common.persistence.dao.WechatNewsArticleMapper; +import com.ruoyi.app.common.persistence.model.StoreAds; +import com.ruoyi.app.common.persistence.model.WechatNewsArticle; +import com.ruoyi.app.modular.shop.service.IAdService; +import com.ruoyi.app.modular.shop.service.INewsService; +import org.springframework.stereotype.Service; + + +@Service +public class NewsServiceImpl extends ServiceImpl implements INewsService { + +} diff --git a/ruoyi-api/src/test/java/com/ruoyi/generator/EntityGenerator.java b/ruoyi-api/src/test/java/com/ruoyi/generator/EntityGenerator.java index 770b24c..ea22064 100644 --- a/ruoyi-api/src/test/java/com/ruoyi/generator/EntityGenerator.java +++ b/ruoyi-api/src/test/java/com/ruoyi/generator/EntityGenerator.java @@ -28,7 +28,7 @@ public class EntityGenerator { // 全局配置 GlobalConfig gc = new GlobalConfig(); - gc.setOutputDir("E:\\java\\Supply\\src\\main\\java");//这里写你自己的java目录 + gc.setOutputDir("E:\\java\\Supply\\ruoyi-api\\src\\main\\java");//这里写你自己的java目录 gc.setFileOverride(true);//是否覆盖 gc.setActiveRecord(true); gc.setEnableCache(false);// XML 二级缓存 @@ -57,7 +57,7 @@ public class EntityGenerator { StrategyConfig strategy = new StrategyConfig(); //strategy.setTablePrefix(new String[]{"_"});// 此处可以修改为您的表前缀 strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略 - strategy.setInclude(new String[]{"store_ads"}); + strategy.setInclude(new String[]{"store_goods","wechat_news_article"}); mpg.setStrategy(strategy); // 包配置