Kaynağa Gözat

添加生产基地

qiubo 4 yıl önce
ebeveyn
işleme
b8ceb35e95
21 değiştirilmiş dosya ile 6899 ekleme ve 0 silme
  1. 30 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/OmsPreItemMapper.java
  2. 36 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/UmsMemberOriginMapper.java
  3. 36 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/UmsMemberOriginProductMapper.java
  4. 270 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/OmsPreItem.java
  5. 1562 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/OmsPreItemExample.java
  6. 344 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOrigin.java
  7. 1581 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginExample.java
  8. 164 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginProduct.java
  9. 901 0
      forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginProductExample.java
  10. 464 0
      forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/OmsPreItemMapper.xml
  11. 631 0
      forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/UmsMemberOriginMapper.xml
  12. 375 0
      forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/UmsMemberOriginProductMapper.xml
  13. 110 0
      forest-portal/portal-server/target/classes/ap.yml
  14. 18 0
      forest-portal/portal-server/target/classes/bootstrap.yml
  15. 65 0
      forest-portal/portal-server/target/classes/dao/HomeDao.xml
  16. 91 0
      forest-portal/portal-server/target/classes/dao/PortalOrderDao.xml
  17. 22 0
      forest-portal/portal-server/target/classes/dao/PortalOrderItemDao.xml
  18. 82 0
      forest-portal/portal-server/target/classes/dao/PortalProductDao.xml
  19. 86 0
      forest-portal/portal-server/target/classes/dao/SmsCouponHistoryDao.xml
  20. 16 0
      forest-portal/portal-server/target/classes/dao/SubjectDao.xml
  21. 15 0
      forest-portal/portal-server/target/classes/dao/UmsOwnDataDao.xml

+ 30 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/OmsPreItemMapper.java

@@ -0,0 +1,30 @@
+package com.hwrj.cloud.portal.mapper;
+
+import com.hwrj.cloud.portal.model.OmsPreItem;
+import com.hwrj.cloud.portal.model.OmsPreItemExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OmsPreItemMapper {
+    long countByExample(OmsPreItemExample example);
+
+    int deleteByExample(OmsPreItemExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(OmsPreItem record);
+
+    int insertSelective(OmsPreItem record);
+
+    List<OmsPreItem> selectByExample(OmsPreItemExample example);
+
+    OmsPreItem selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") OmsPreItem record, @Param("example") OmsPreItemExample example);
+
+    int updateByExample(@Param("record") OmsPreItem record, @Param("example") OmsPreItemExample example);
+
+    int updateByPrimaryKeySelective(OmsPreItem record);
+
+    int updateByPrimaryKey(OmsPreItem record);
+}

+ 36 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/UmsMemberOriginMapper.java

@@ -0,0 +1,36 @@
+package com.hwrj.cloud.portal.mapper;
+
+import com.hwrj.cloud.portal.model.UmsMemberOrigin;
+import com.hwrj.cloud.portal.model.UmsMemberOriginExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UmsMemberOriginMapper {
+    long countByExample(UmsMemberOriginExample example);
+
+    int deleteByExample(UmsMemberOriginExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(UmsMemberOrigin record);
+
+    int insertSelective(UmsMemberOrigin record);
+
+    List<UmsMemberOrigin> selectByExampleWithBLOBs(UmsMemberOriginExample example);
+
+    List<UmsMemberOrigin> selectByExample(UmsMemberOriginExample example);
+
+    UmsMemberOrigin selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByExample(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByPrimaryKeySelective(UmsMemberOrigin record);
+
+    int updateByPrimaryKeyWithBLOBs(UmsMemberOrigin record);
+
+    int updateByPrimaryKey(UmsMemberOrigin record);
+}

+ 36 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/UmsMemberOriginProductMapper.java

@@ -0,0 +1,36 @@
+package com.hwrj.cloud.portal.mapper;
+
+import com.hwrj.cloud.portal.model.UmsMemberOriginProduct;
+import com.hwrj.cloud.portal.model.UmsMemberOriginProductExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UmsMemberOriginProductMapper {
+    long countByExample(UmsMemberOriginProductExample example);
+
+    int deleteByExample(UmsMemberOriginProductExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(UmsMemberOriginProduct record);
+
+    int insertSelective(UmsMemberOriginProduct record);
+
+    List<UmsMemberOriginProduct> selectByExampleWithBLOBs(UmsMemberOriginProductExample example);
+
+    List<UmsMemberOriginProduct> selectByExample(UmsMemberOriginProductExample example);
+
+    UmsMemberOriginProduct selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByExample(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByPrimaryKeySelective(UmsMemberOriginProduct record);
+
+    int updateByPrimaryKeyWithBLOBs(UmsMemberOriginProduct record);
+
+    int updateByPrimaryKey(UmsMemberOriginProduct record);
+}

+ 270 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/OmsPreItem.java

@@ -0,0 +1,270 @@
+package com.hwrj.cloud.portal.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class OmsPreItem implements Serializable {
+    private Long id;
+
+    @ApiModelProperty(value = "产品id")
+    private Long productId;
+
+    @ApiModelProperty(value = "产品购买人id")
+    private Long memberId;
+
+    @ApiModelProperty(value = "产品供应商id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "产品发布人id")
+    private Long pushId;
+
+    @ApiModelProperty(value = "生产地id")
+    private Long originId;
+
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ApiModelProperty(value = "产品供应商名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "添加意向购买人的价格")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "商品主图")
+    private String productPic;
+
+    @ApiModelProperty(value = "商品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "商品副标题(卖点)")
+    private String productSubTitle;
+
+    @ApiModelProperty(value = "商品sku条码")
+    private String productSkuCode;
+
+    @ApiModelProperty(value = "会员昵称")
+    private String memberNickname;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifyDate;
+
+    @ApiModelProperty(value = "是否删除")
+    private Integer deleteStatus;
+
+    @ApiModelProperty(value = "商品分类")
+    private Long productCategoryId;
+
+    private String productBrand;
+
+    private String productSn;
+
+    @ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
+    private String productAttr;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Long getPushId() {
+        return pushId;
+    }
+
+    public void setPushId(Long pushId) {
+        this.pushId = pushId;
+    }
+
+    public Long getOriginId() {
+        return originId;
+    }
+
+    public void setOriginId(Long originId) {
+        this.originId = originId;
+    }
+
+    public String getOriginName() {
+        return originName;
+    }
+
+    public void setOriginName(String originName) {
+        this.originName = originName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getProductPic() {
+        return productPic;
+    }
+
+    public void setProductPic(String productPic) {
+        this.productPic = productPic;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductSubTitle() {
+        return productSubTitle;
+    }
+
+    public void setProductSubTitle(String productSubTitle) {
+        this.productSubTitle = productSubTitle;
+    }
+
+    public String getProductSkuCode() {
+        return productSkuCode;
+    }
+
+    public void setProductSkuCode(String productSkuCode) {
+        this.productSkuCode = productSkuCode;
+    }
+
+    public String getMemberNickname() {
+        return memberNickname;
+    }
+
+    public void setMemberNickname(String memberNickname) {
+        this.memberNickname = memberNickname;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getModifyDate() {
+        return modifyDate;
+    }
+
+    public void setModifyDate(Date modifyDate) {
+        this.modifyDate = modifyDate;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public Long getProductCategoryId() {
+        return productCategoryId;
+    }
+
+    public void setProductCategoryId(Long productCategoryId) {
+        this.productCategoryId = productCategoryId;
+    }
+
+    public String getProductBrand() {
+        return productBrand;
+    }
+
+    public void setProductBrand(String productBrand) {
+        this.productBrand = productBrand;
+    }
+
+    public String getProductSn() {
+        return productSn;
+    }
+
+    public void setProductSn(String productSn) {
+        this.productSn = productSn;
+    }
+
+    public String getProductAttr() {
+        return productAttr;
+    }
+
+    public void setProductAttr(String productAttr) {
+        this.productAttr = productAttr;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", productId=").append(productId);
+        sb.append(", memberId=").append(memberId);
+        sb.append(", companyId=").append(companyId);
+        sb.append(", pushId=").append(pushId);
+        sb.append(", originId=").append(originId);
+        sb.append(", originName=").append(originName);
+        sb.append(", companyName=").append(companyName);
+        sb.append(", price=").append(price);
+        sb.append(", productPic=").append(productPic);
+        sb.append(", productName=").append(productName);
+        sb.append(", productSubTitle=").append(productSubTitle);
+        sb.append(", productSkuCode=").append(productSkuCode);
+        sb.append(", memberNickname=").append(memberNickname);
+        sb.append(", createDate=").append(createDate);
+        sb.append(", modifyDate=").append(modifyDate);
+        sb.append(", deleteStatus=").append(deleteStatus);
+        sb.append(", productCategoryId=").append(productCategoryId);
+        sb.append(", productBrand=").append(productBrand);
+        sb.append(", productSn=").append(productSn);
+        sb.append(", productAttr=").append(productAttr);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1562 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/OmsPreItemExample.java


+ 344 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOrigin.java

@@ -0,0 +1,344 @@
+package com.hwrj.cloud.portal.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class UmsMemberOrigin implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
+    private Long fkCompanyInfoId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String compName;
+
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ApiModelProperty(value = "生产地面积(亩)")
+    private Double originArea;
+
+    @ApiModelProperty(value = "人数")
+    private Integer peopleNum;
+
+    @ApiModelProperty(value = "建立日期(年)")
+    private String foundDate;
+
+    @ApiModelProperty(value = "联系人")
+    private String linkUser;
+
+    @ApiModelProperty(value = "联系方式")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "省")
+    private String provinceName;
+
+    @ApiModelProperty(value = "市")
+    private String cityName;
+
+    @ApiModelProperty(value = "县")
+    private String countyName;
+
+    @ApiModelProperty(value = "详细地址")
+    private String detailAddress;
+
+    @ApiModelProperty(value = "海拔")
+    private String altitude;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "状态 0:可用,1:禁用,2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "生产地图片")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "生产地宣传视频地址")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "vr地址")
+    private String vrUrl;
+
+    @ApiModelProperty(value = "实时监控视频地址")
+    private String cameraUrl;
+
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFkCompanyInfoId() {
+        return fkCompanyInfoId;
+    }
+
+    public void setFkCompanyInfoId(Long fkCompanyInfoId) {
+        this.fkCompanyInfoId = fkCompanyInfoId;
+    }
+
+    public String getCompName() {
+        return compName;
+    }
+
+    public void setCompName(String compName) {
+        this.compName = compName;
+    }
+
+    public String getOriginName() {
+        return originName;
+    }
+
+    public void setOriginName(String originName) {
+        this.originName = originName;
+    }
+
+    public Double getOriginArea() {
+        return originArea;
+    }
+
+    public void setOriginArea(Double originArea) {
+        this.originArea = originArea;
+    }
+
+    public Integer getPeopleNum() {
+        return peopleNum;
+    }
+
+    public void setPeopleNum(Integer peopleNum) {
+        this.peopleNum = peopleNum;
+    }
+
+    public String getFoundDate() {
+        return foundDate;
+    }
+
+    public void setFoundDate(String foundDate) {
+        this.foundDate = foundDate;
+    }
+
+    public String getLinkUser() {
+        return linkUser;
+    }
+
+    public void setLinkUser(String linkUser) {
+        this.linkUser = linkUser;
+    }
+
+    public String getLinkPhone() {
+        return linkPhone;
+    }
+
+    public void setLinkPhone(String linkPhone) {
+        this.linkPhone = linkPhone;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getDetailAddress() {
+        return detailAddress;
+    }
+
+    public void setDetailAddress(String detailAddress) {
+        this.detailAddress = detailAddress;
+    }
+
+    public String getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(String altitude) {
+        this.altitude = altitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Integer createId) {
+        this.createId = createId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUpdateId() {
+        return updateId;
+    }
+
+    public void setUpdateId(Integer updateId) {
+        this.updateId = updateId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public String getVrUrl() {
+        return vrUrl;
+    }
+
+    public void setVrUrl(String vrUrl) {
+        this.vrUrl = vrUrl;
+    }
+
+    public String getCameraUrl() {
+        return cameraUrl;
+    }
+
+    public void setCameraUrl(String cameraUrl) {
+        this.cameraUrl = cameraUrl;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", fkCompanyInfoId=").append(fkCompanyInfoId);
+        sb.append(", compName=").append(compName);
+        sb.append(", originName=").append(originName);
+        sb.append(", originArea=").append(originArea);
+        sb.append(", peopleNum=").append(peopleNum);
+        sb.append(", foundDate=").append(foundDate);
+        sb.append(", linkUser=").append(linkUser);
+        sb.append(", linkPhone=").append(linkPhone);
+        sb.append(", provinceName=").append(provinceName);
+        sb.append(", cityName=").append(cityName);
+        sb.append(", countyName=").append(countyName);
+        sb.append(", detailAddress=").append(detailAddress);
+        sb.append(", altitude=").append(altitude);
+        sb.append(", longitude=").append(longitude);
+        sb.append(", latitude=").append(latitude);
+        sb.append(", state=").append(state);
+        sb.append(", createId=").append(createId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateId=").append(updateId);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", imgUrl=").append(imgUrl);
+        sb.append(", videoUrl=").append(videoUrl);
+        sb.append(", vrUrl=").append(vrUrl);
+        sb.append(", cameraUrl=").append(cameraUrl);
+        sb.append(", summary=").append(summary);
+        sb.append(", remark=").append(remark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1581 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginExample.java


+ 164 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginProduct.java

@@ -0,0 +1,164 @@
+package com.hwrj.cloud.portal.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class UmsMemberOriginProduct implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "生产地id (生产地信息表 ums_member_origin -> id)")
+    private Long fkOriginId;
+
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "产出物种植面积(亩)")
+    private String plantArea;
+
+    @ApiModelProperty(value = "产出物总产量(吨)")
+    private String outputNum;
+
+    @ApiModelProperty(value = "产出物亩产值(万元)")
+    private String outputValue;
+
+    @ApiModelProperty(value = "状态 0:可用,1:禁用,2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFkOriginId() {
+        return fkOriginId;
+    }
+
+    public void setFkOriginId(Long fkOriginId) {
+        this.fkOriginId = fkOriginId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getPlantArea() {
+        return plantArea;
+    }
+
+    public void setPlantArea(String plantArea) {
+        this.plantArea = plantArea;
+    }
+
+    public String getOutputNum() {
+        return outputNum;
+    }
+
+    public void setOutputNum(String outputNum) {
+        this.outputNum = outputNum;
+    }
+
+    public String getOutputValue() {
+        return outputValue;
+    }
+
+    public void setOutputValue(String outputValue) {
+        this.outputValue = outputValue;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Integer createId) {
+        this.createId = createId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUpdateId() {
+        return updateId;
+    }
+
+    public void setUpdateId(Integer updateId) {
+        this.updateId = updateId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", fkOriginId=").append(fkOriginId);
+        sb.append(", productName=").append(productName);
+        sb.append(", plantArea=").append(plantArea);
+        sb.append(", outputNum=").append(outputNum);
+        sb.append(", outputValue=").append(outputValue);
+        sb.append(", state=").append(state);
+        sb.append(", createId=").append(createId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateId=").append(updateId);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", remark=").append(remark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 901 - 0
forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginProductExample.java

@@ -0,0 +1,901 @@
+package com.hwrj.cloud.portal.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class UmsMemberOriginProductExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public UmsMemberOriginProductExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIsNull() {
+            addCriterion("fk_origin_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIsNotNull() {
+            addCriterion("fk_origin_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdEqualTo(Long value) {
+            addCriterion("fk_origin_id =", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotEqualTo(Long value) {
+            addCriterion("fk_origin_id <>", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdGreaterThan(Long value) {
+            addCriterion("fk_origin_id >", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("fk_origin_id >=", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdLessThan(Long value) {
+            addCriterion("fk_origin_id <", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdLessThanOrEqualTo(Long value) {
+            addCriterion("fk_origin_id <=", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIn(List<Long> values) {
+            addCriterion("fk_origin_id in", values, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotIn(List<Long> values) {
+            addCriterion("fk_origin_id not in", values, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdBetween(Long value1, Long value2) {
+            addCriterion("fk_origin_id between", value1, value2, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotBetween(Long value1, Long value2) {
+            addCriterion("fk_origin_id not between", value1, value2, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIsNull() {
+            addCriterion("product_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIsNotNull() {
+            addCriterion("product_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameEqualTo(String value) {
+            addCriterion("product_name =", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotEqualTo(String value) {
+            addCriterion("product_name <>", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThan(String value) {
+            addCriterion("product_name >", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThanOrEqualTo(String value) {
+            addCriterion("product_name >=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThan(String value) {
+            addCriterion("product_name <", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThanOrEqualTo(String value) {
+            addCriterion("product_name <=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLike(String value) {
+            addCriterion("product_name like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotLike(String value) {
+            addCriterion("product_name not like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIn(List<String> values) {
+            addCriterion("product_name in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotIn(List<String> values) {
+            addCriterion("product_name not in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameBetween(String value1, String value2) {
+            addCriterion("product_name between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotBetween(String value1, String value2) {
+            addCriterion("product_name not between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIsNull() {
+            addCriterion("plant_area is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIsNotNull() {
+            addCriterion("plant_area is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaEqualTo(String value) {
+            addCriterion("plant_area =", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotEqualTo(String value) {
+            addCriterion("plant_area <>", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaGreaterThan(String value) {
+            addCriterion("plant_area >", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaGreaterThanOrEqualTo(String value) {
+            addCriterion("plant_area >=", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLessThan(String value) {
+            addCriterion("plant_area <", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLessThanOrEqualTo(String value) {
+            addCriterion("plant_area <=", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLike(String value) {
+            addCriterion("plant_area like", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotLike(String value) {
+            addCriterion("plant_area not like", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIn(List<String> values) {
+            addCriterion("plant_area in", values, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotIn(List<String> values) {
+            addCriterion("plant_area not in", values, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaBetween(String value1, String value2) {
+            addCriterion("plant_area between", value1, value2, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotBetween(String value1, String value2) {
+            addCriterion("plant_area not between", value1, value2, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIsNull() {
+            addCriterion("output_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIsNotNull() {
+            addCriterion("output_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumEqualTo(String value) {
+            addCriterion("output_num =", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotEqualTo(String value) {
+            addCriterion("output_num <>", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumGreaterThan(String value) {
+            addCriterion("output_num >", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumGreaterThanOrEqualTo(String value) {
+            addCriterion("output_num >=", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLessThan(String value) {
+            addCriterion("output_num <", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLessThanOrEqualTo(String value) {
+            addCriterion("output_num <=", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLike(String value) {
+            addCriterion("output_num like", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotLike(String value) {
+            addCriterion("output_num not like", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIn(List<String> values) {
+            addCriterion("output_num in", values, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotIn(List<String> values) {
+            addCriterion("output_num not in", values, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumBetween(String value1, String value2) {
+            addCriterion("output_num between", value1, value2, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotBetween(String value1, String value2) {
+            addCriterion("output_num not between", value1, value2, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIsNull() {
+            addCriterion("output_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIsNotNull() {
+            addCriterion("output_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueEqualTo(String value) {
+            addCriterion("output_value =", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotEqualTo(String value) {
+            addCriterion("output_value <>", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueGreaterThan(String value) {
+            addCriterion("output_value >", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueGreaterThanOrEqualTo(String value) {
+            addCriterion("output_value >=", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLessThan(String value) {
+            addCriterion("output_value <", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLessThanOrEqualTo(String value) {
+            addCriterion("output_value <=", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLike(String value) {
+            addCriterion("output_value like", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotLike(String value) {
+            addCriterion("output_value not like", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIn(List<String> values) {
+            addCriterion("output_value in", values, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotIn(List<String> values) {
+            addCriterion("output_value not in", values, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueBetween(String value1, String value2) {
+            addCriterion("output_value between", value1, value2, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotBetween(String value1, String value2) {
+            addCriterion("output_value not between", value1, value2, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(Integer value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(Integer value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(Integer value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(Integer value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(Integer value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(Integer value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<Integer> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<Integer> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(Integer value1, Integer value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(Integer value1, Integer value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNull() {
+            addCriterion("create_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdEqualTo(Integer value) {
+            addCriterion("create_id =", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotEqualTo(Integer value) {
+            addCriterion("create_id <>", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThan(Integer value) {
+            addCriterion("create_id >", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("create_id >=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThan(Integer value) {
+            addCriterion("create_id <", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+            addCriterion("create_id <=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIn(List<Integer> values) {
+            addCriterion("create_id in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotIn(List<Integer> values) {
+            addCriterion("create_id not in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+            addCriterion("create_id between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIsNull() {
+            addCriterion("update_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIsNotNull() {
+            addCriterion("update_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdEqualTo(Integer value) {
+            addCriterion("update_id =", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotEqualTo(Integer value) {
+            addCriterion("update_id <>", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdGreaterThan(Integer value) {
+            addCriterion("update_id >", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("update_id >=", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdLessThan(Integer value) {
+            addCriterion("update_id <", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdLessThanOrEqualTo(Integer value) {
+            addCriterion("update_id <=", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIn(List<Integer> values) {
+            addCriterion("update_id in", values, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotIn(List<Integer> values) {
+            addCriterion("update_id not in", values, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdBetween(Integer value1, Integer value2) {
+            addCriterion("update_id between", value1, value2, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("update_id not between", value1, value2, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 464 - 0
forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/OmsPreItemMapper.xml

@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.mapper.OmsPreItemMapper">
+  <resultMap id="BaseResultMap" type="com.hwrj.cloud.portal.model.OmsPreItem">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="product_id" jdbcType="BIGINT" property="productId" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="push_id" jdbcType="BIGINT" property="pushId" />
+    <result column="origin_id" jdbcType="BIGINT" property="originId" />
+    <result column="origin_name" jdbcType="VARCHAR" property="originName" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
+    <result column="product_pic" jdbcType="VARCHAR" property="productPic" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="product_sub_title" jdbcType="VARCHAR" property="productSubTitle" />
+    <result column="product_sku_code" jdbcType="VARCHAR" property="productSkuCode" />
+    <result column="member_nickname" jdbcType="VARCHAR" property="memberNickname" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="modify_date" jdbcType="TIMESTAMP" property="modifyDate" />
+    <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
+    <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
+    <result column="product_brand" jdbcType="VARCHAR" property="productBrand" />
+    <result column="product_sn" jdbcType="VARCHAR" property="productSn" />
+    <result column="product_attr" jdbcType="VARCHAR" property="productAttr" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, product_id, member_id, company_id, push_id, origin_id, origin_name, company_name, 
+    price, product_pic, product_name, product_sub_title, product_sku_code, member_nickname, 
+    create_date, modify_date, delete_status, product_category_id, product_brand, product_sn, 
+    product_attr
+  </sql>
+  <select id="selectByExample" parameterType="com.hwrj.cloud.portal.model.OmsPreItemExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from oms_pre_item
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from oms_pre_item
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from oms_pre_item
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hwrj.cloud.portal.model.OmsPreItemExample">
+    delete from oms_pre_item
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into oms_pre_item (product_id, member_id, company_id, 
+      push_id, origin_id, origin_name, 
+      company_name, price, product_pic, 
+      product_name, product_sub_title, product_sku_code, 
+      member_nickname, create_date, modify_date, 
+      delete_status, product_category_id, product_brand, 
+      product_sn, product_attr)
+    values (#{productId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{companyId,jdbcType=BIGINT}, 
+      #{pushId,jdbcType=BIGINT}, #{originId,jdbcType=BIGINT}, #{originName,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{productPic,jdbcType=VARCHAR}, 
+      #{productName,jdbcType=VARCHAR}, #{productSubTitle,jdbcType=VARCHAR}, #{productSkuCode,jdbcType=VARCHAR}, 
+      #{memberNickname,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{modifyDate,jdbcType=TIMESTAMP}, 
+      #{deleteStatus,jdbcType=INTEGER}, #{productCategoryId,jdbcType=BIGINT}, #{productBrand,jdbcType=VARCHAR}, 
+      #{productSn,jdbcType=VARCHAR}, #{productAttr,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into oms_pre_item
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="productId != null">
+        product_id,
+      </if>
+      <if test="memberId != null">
+        member_id,
+      </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
+      <if test="pushId != null">
+        push_id,
+      </if>
+      <if test="originId != null">
+        origin_id,
+      </if>
+      <if test="originName != null">
+        origin_name,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="price != null">
+        price,
+      </if>
+      <if test="productPic != null">
+        product_pic,
+      </if>
+      <if test="productName != null">
+        product_name,
+      </if>
+      <if test="productSubTitle != null">
+        product_sub_title,
+      </if>
+      <if test="productSkuCode != null">
+        product_sku_code,
+      </if>
+      <if test="memberNickname != null">
+        member_nickname,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+      <if test="modifyDate != null">
+        modify_date,
+      </if>
+      <if test="deleteStatus != null">
+        delete_status,
+      </if>
+      <if test="productCategoryId != null">
+        product_category_id,
+      </if>
+      <if test="productBrand != null">
+        product_brand,
+      </if>
+      <if test="productSn != null">
+        product_sn,
+      </if>
+      <if test="productAttr != null">
+        product_attr,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="productId != null">
+        #{productId,jdbcType=BIGINT},
+      </if>
+      <if test="memberId != null">
+        #{memberId,jdbcType=BIGINT},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="pushId != null">
+        #{pushId,jdbcType=BIGINT},
+      </if>
+      <if test="originId != null">
+        #{originId,jdbcType=BIGINT},
+      </if>
+      <if test="originName != null">
+        #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="productPic != null">
+        #{productPic,jdbcType=VARCHAR},
+      </if>
+      <if test="productName != null">
+        #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productSubTitle != null">
+        #{productSubTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="productSkuCode != null">
+        #{productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memberNickname != null">
+        #{memberNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyDate != null">
+        #{modifyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteStatus != null">
+        #{deleteStatus,jdbcType=INTEGER},
+      </if>
+      <if test="productCategoryId != null">
+        #{productCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBrand != null">
+        #{productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="productSn != null">
+        #{productSn,jdbcType=VARCHAR},
+      </if>
+      <if test="productAttr != null">
+        #{productAttr,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hwrj.cloud.portal.model.OmsPreItemExample" resultType="java.lang.Long">
+    select count(*) from oms_pre_item
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update oms_pre_item
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.productId != null">
+        product_id = #{record.productId,jdbcType=BIGINT},
+      </if>
+      <if test="record.memberId != null">
+        member_id = #{record.memberId,jdbcType=BIGINT},
+      </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=BIGINT},
+      </if>
+      <if test="record.pushId != null">
+        push_id = #{record.pushId,jdbcType=BIGINT},
+      </if>
+      <if test="record.originId != null">
+        origin_id = #{record.originId,jdbcType=BIGINT},
+      </if>
+      <if test="record.originName != null">
+        origin_name = #{record.originName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.price != null">
+        price = #{record.price,jdbcType=DECIMAL},
+      </if>
+      <if test="record.productPic != null">
+        product_pic = #{record.productPic,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productName != null">
+        product_name = #{record.productName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productSubTitle != null">
+        product_sub_title = #{record.productSubTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productSkuCode != null">
+        product_sku_code = #{record.productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.memberNickname != null">
+        member_nickname = #{record.memberNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null">
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifyDate != null">
+        modify_date = #{record.modifyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deleteStatus != null">
+        delete_status = #{record.deleteStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.productCategoryId != null">
+        product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productBrand != null">
+        product_brand = #{record.productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productSn != null">
+        product_sn = #{record.productSn,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productAttr != null">
+        product_attr = #{record.productAttr,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update oms_pre_item
+    set id = #{record.id,jdbcType=BIGINT},
+      product_id = #{record.productId,jdbcType=BIGINT},
+      member_id = #{record.memberId,jdbcType=BIGINT},
+      company_id = #{record.companyId,jdbcType=BIGINT},
+      push_id = #{record.pushId,jdbcType=BIGINT},
+      origin_id = #{record.originId,jdbcType=BIGINT},
+      origin_name = #{record.originName,jdbcType=VARCHAR},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      price = #{record.price,jdbcType=DECIMAL},
+      product_pic = #{record.productPic,jdbcType=VARCHAR},
+      product_name = #{record.productName,jdbcType=VARCHAR},
+      product_sub_title = #{record.productSubTitle,jdbcType=VARCHAR},
+      product_sku_code = #{record.productSkuCode,jdbcType=VARCHAR},
+      member_nickname = #{record.memberNickname,jdbcType=VARCHAR},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      modify_date = #{record.modifyDate,jdbcType=TIMESTAMP},
+      delete_status = #{record.deleteStatus,jdbcType=INTEGER},
+      product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      product_brand = #{record.productBrand,jdbcType=VARCHAR},
+      product_sn = #{record.productSn,jdbcType=VARCHAR},
+      product_attr = #{record.productAttr,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    update oms_pre_item
+    <set>
+      <if test="productId != null">
+        product_id = #{productId,jdbcType=BIGINT},
+      </if>
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=BIGINT},
+      </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="pushId != null">
+        push_id = #{pushId,jdbcType=BIGINT},
+      </if>
+      <if test="originId != null">
+        origin_id = #{originId,jdbcType=BIGINT},
+      </if>
+      <if test="originName != null">
+        origin_name = #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        price = #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="productPic != null">
+        product_pic = #{productPic,jdbcType=VARCHAR},
+      </if>
+      <if test="productName != null">
+        product_name = #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productSubTitle != null">
+        product_sub_title = #{productSubTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="productSkuCode != null">
+        product_sku_code = #{productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memberNickname != null">
+        member_nickname = #{memberNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyDate != null">
+        modify_date = #{modifyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteStatus != null">
+        delete_status = #{deleteStatus,jdbcType=INTEGER},
+      </if>
+      <if test="productCategoryId != null">
+        product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBrand != null">
+        product_brand = #{productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="productSn != null">
+        product_sn = #{productSn,jdbcType=VARCHAR},
+      </if>
+      <if test="productAttr != null">
+        product_attr = #{productAttr,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    update oms_pre_item
+    set product_id = #{productId,jdbcType=BIGINT},
+      member_id = #{memberId,jdbcType=BIGINT},
+      company_id = #{companyId,jdbcType=BIGINT},
+      push_id = #{pushId,jdbcType=BIGINT},
+      origin_id = #{originId,jdbcType=BIGINT},
+      origin_name = #{originName,jdbcType=VARCHAR},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      price = #{price,jdbcType=DECIMAL},
+      product_pic = #{productPic,jdbcType=VARCHAR},
+      product_name = #{productName,jdbcType=VARCHAR},
+      product_sub_title = #{productSubTitle,jdbcType=VARCHAR},
+      product_sku_code = #{productSkuCode,jdbcType=VARCHAR},
+      member_nickname = #{memberNickname,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      modify_date = #{modifyDate,jdbcType=TIMESTAMP},
+      delete_status = #{deleteStatus,jdbcType=INTEGER},
+      product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      product_brand = #{productBrand,jdbcType=VARCHAR},
+      product_sn = #{productSn,jdbcType=VARCHAR},
+      product_attr = #{productAttr,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 631 - 0
forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/UmsMemberOriginMapper.xml

@@ -0,0 +1,631 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.mapper.UmsMemberOriginMapper">
+  <resultMap id="BaseResultMap" type="com.hwrj.cloud.portal.model.UmsMemberOrigin">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="fk_company_info_id" jdbcType="BIGINT" property="fkCompanyInfoId" />
+    <result column="comp_name" jdbcType="VARCHAR" property="compName" />
+    <result column="origin_name" jdbcType="VARCHAR" property="originName" />
+    <result column="origin_area" jdbcType="DOUBLE" property="originArea" />
+    <result column="people_num" jdbcType="INTEGER" property="peopleNum" />
+    <result column="found_date" jdbcType="VARCHAR" property="foundDate" />
+    <result column="link_user" jdbcType="VARCHAR" property="linkUser" />
+    <result column="link_phone" jdbcType="VARCHAR" property="linkPhone" />
+    <result column="province_name" jdbcType="VARCHAR" property="provinceName" />
+    <result column="city_name" jdbcType="VARCHAR" property="cityName" />
+    <result column="county_name" jdbcType="VARCHAR" property="countyName" />
+    <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
+    <result column="altitude" jdbcType="VARCHAR" property="altitude" />
+    <result column="longitude" jdbcType="VARCHAR" property="longitude" />
+    <result column="latitude" jdbcType="VARCHAR" property="latitude" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.portal.model.UmsMemberOrigin">
+    <result column="img_url" jdbcType="LONGVARCHAR" property="imgUrl" />
+    <result column="video_url" jdbcType="LONGVARCHAR" property="videoUrl" />
+    <result column="vr_url" jdbcType="LONGVARCHAR" property="vrUrl" />
+    <result column="camera_url" jdbcType="LONGVARCHAR" property="cameraUrl" />
+    <result column="summary" jdbcType="LONGVARCHAR" property="summary" />
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, fk_company_info_id, comp_name, origin_name, origin_area, people_num, found_date, 
+    link_user, link_phone, province_name, city_name, county_name, detail_address, altitude, 
+    longitude, latitude, state, create_id, create_time, update_id, update_time
+  </sql>
+  <sql id="Blob_Column_List">
+    img_url, video_url, vr_url, camera_url, summary, remark
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ums_member_origin
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginExample">
+    delete from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hwrj.cloud.portal.model.UmsMemberOrigin">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin (fk_company_info_id, comp_name, origin_name, 
+      origin_area, people_num, found_date, 
+      link_user, link_phone, province_name, 
+      city_name, county_name, detail_address, 
+      altitude, longitude, latitude, 
+      state, create_id, create_time, 
+      update_id, update_time, img_url, 
+      video_url, vr_url, camera_url, 
+      summary, remark)
+    values (#{fkCompanyInfoId,jdbcType=BIGINT}, #{compName,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR}, 
+      #{originArea,jdbcType=DOUBLE}, #{peopleNum,jdbcType=INTEGER}, #{foundDate,jdbcType=VARCHAR}, 
+      #{linkUser,jdbcType=VARCHAR}, #{linkPhone,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, 
+      #{cityName,jdbcType=VARCHAR}, #{countyName,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, 
+      #{altitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
+      #{state,jdbcType=INTEGER}, #{createId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{imgUrl,jdbcType=LONGVARCHAR}, 
+      #{videoUrl,jdbcType=LONGVARCHAR}, #{vrUrl,jdbcType=LONGVARCHAR}, #{cameraUrl,jdbcType=LONGVARCHAR}, 
+      #{summary,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.UmsMemberOrigin">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fkCompanyInfoId != null">
+        fk_company_info_id,
+      </if>
+      <if test="compName != null">
+        comp_name,
+      </if>
+      <if test="originName != null">
+        origin_name,
+      </if>
+      <if test="originArea != null">
+        origin_area,
+      </if>
+      <if test="peopleNum != null">
+        people_num,
+      </if>
+      <if test="foundDate != null">
+        found_date,
+      </if>
+      <if test="linkUser != null">
+        link_user,
+      </if>
+      <if test="linkPhone != null">
+        link_phone,
+      </if>
+      <if test="provinceName != null">
+        province_name,
+      </if>
+      <if test="cityName != null">
+        city_name,
+      </if>
+      <if test="countyName != null">
+        county_name,
+      </if>
+      <if test="detailAddress != null">
+        detail_address,
+      </if>
+      <if test="altitude != null">
+        altitude,
+      </if>
+      <if test="longitude != null">
+        longitude,
+      </if>
+      <if test="latitude != null">
+        latitude,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateId != null">
+        update_id,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="imgUrl != null">
+        img_url,
+      </if>
+      <if test="videoUrl != null">
+        video_url,
+      </if>
+      <if test="vrUrl != null">
+        vr_url,
+      </if>
+      <if test="cameraUrl != null">
+        camera_url,
+      </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fkCompanyInfoId != null">
+        #{fkCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="compName != null">
+        #{compName,jdbcType=VARCHAR},
+      </if>
+      <if test="originName != null">
+        #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="originArea != null">
+        #{originArea,jdbcType=DOUBLE},
+      </if>
+      <if test="peopleNum != null">
+        #{peopleNum,jdbcType=INTEGER},
+      </if>
+      <if test="foundDate != null">
+        #{foundDate,jdbcType=VARCHAR},
+      </if>
+      <if test="linkUser != null">
+        #{linkUser,jdbcType=VARCHAR},
+      </if>
+      <if test="linkPhone != null">
+        #{linkPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceName != null">
+        #{provinceName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityName != null">
+        #{cityName,jdbcType=VARCHAR},
+      </if>
+      <if test="countyName != null">
+        #{countyName,jdbcType=VARCHAR},
+      </if>
+      <if test="detailAddress != null">
+        #{detailAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="altitude != null">
+        #{altitude,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null">
+        #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null">
+        #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateId != null">
+        #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="imgUrl != null">
+        #{imgUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="videoUrl != null">
+        #{videoUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="vrUrl != null">
+        #{vrUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="cameraUrl != null">
+        #{cameraUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="summary != null">
+        #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginExample" resultType="java.lang.Long">
+    select count(*) from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update ums_member_origin
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.fkCompanyInfoId != null">
+        fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="record.compName != null">
+        comp_name = #{record.compName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.originName != null">
+        origin_name = #{record.originName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.originArea != null">
+        origin_area = #{record.originArea,jdbcType=DOUBLE},
+      </if>
+      <if test="record.peopleNum != null">
+        people_num = #{record.peopleNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.foundDate != null">
+        found_date = #{record.foundDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkUser != null">
+        link_user = #{record.linkUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkPhone != null">
+        link_phone = #{record.linkPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.provinceName != null">
+        province_name = #{record.provinceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cityName != null">
+        city_name = #{record.cityName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.countyName != null">
+        county_name = #{record.countyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.detailAddress != null">
+        detail_address = #{record.detailAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.altitude != null">
+        altitude = #{record.altitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.longitude != null">
+        longitude = #{record.longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.latitude != null">
+        latitude = #{record.latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateId != null">
+        update_id = #{record.updateId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.imgUrl != null">
+        img_url = #{record.imgUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.videoUrl != null">
+        video_url = #{record.videoUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.vrUrl != null">
+        vr_url = #{record.vrUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.cameraUrl != null">
+        camera_url = #{record.cameraUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.summary != null">
+        summary = #{record.summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update ums_member_origin
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
+      origin_name = #{record.originName,jdbcType=VARCHAR},
+      origin_area = #{record.originArea,jdbcType=DOUBLE},
+      people_num = #{record.peopleNum,jdbcType=INTEGER},
+      found_date = #{record.foundDate,jdbcType=VARCHAR},
+      link_user = #{record.linkUser,jdbcType=VARCHAR},
+      link_phone = #{record.linkPhone,jdbcType=VARCHAR},
+      province_name = #{record.provinceName,jdbcType=VARCHAR},
+      city_name = #{record.cityName,jdbcType=VARCHAR},
+      county_name = #{record.countyName,jdbcType=VARCHAR},
+      detail_address = #{record.detailAddress,jdbcType=VARCHAR},
+      altitude = #{record.altitude,jdbcType=VARCHAR},
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      latitude = #{record.latitude,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      img_url = #{record.imgUrl,jdbcType=LONGVARCHAR},
+      video_url = #{record.videoUrl,jdbcType=LONGVARCHAR},
+      vr_url = #{record.vrUrl,jdbcType=LONGVARCHAR},
+      camera_url = #{record.cameraUrl,jdbcType=LONGVARCHAR},
+      summary = #{record.summary,jdbcType=LONGVARCHAR},
+      remark = #{record.remark,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update ums_member_origin
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
+      origin_name = #{record.originName,jdbcType=VARCHAR},
+      origin_area = #{record.originArea,jdbcType=DOUBLE},
+      people_num = #{record.peopleNum,jdbcType=INTEGER},
+      found_date = #{record.foundDate,jdbcType=VARCHAR},
+      link_user = #{record.linkUser,jdbcType=VARCHAR},
+      link_phone = #{record.linkPhone,jdbcType=VARCHAR},
+      province_name = #{record.provinceName,jdbcType=VARCHAR},
+      city_name = #{record.cityName,jdbcType=VARCHAR},
+      county_name = #{record.countyName,jdbcType=VARCHAR},
+      detail_address = #{record.detailAddress,jdbcType=VARCHAR},
+      altitude = #{record.altitude,jdbcType=VARCHAR},
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      latitude = #{record.latitude,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.portal.model.UmsMemberOrigin">
+    update ums_member_origin
+    <set>
+      <if test="fkCompanyInfoId != null">
+        fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="compName != null">
+        comp_name = #{compName,jdbcType=VARCHAR},
+      </if>
+      <if test="originName != null">
+        origin_name = #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="originArea != null">
+        origin_area = #{originArea,jdbcType=DOUBLE},
+      </if>
+      <if test="peopleNum != null">
+        people_num = #{peopleNum,jdbcType=INTEGER},
+      </if>
+      <if test="foundDate != null">
+        found_date = #{foundDate,jdbcType=VARCHAR},
+      </if>
+      <if test="linkUser != null">
+        link_user = #{linkUser,jdbcType=VARCHAR},
+      </if>
+      <if test="linkPhone != null">
+        link_phone = #{linkPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceName != null">
+        province_name = #{provinceName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityName != null">
+        city_name = #{cityName,jdbcType=VARCHAR},
+      </if>
+      <if test="countyName != null">
+        county_name = #{countyName,jdbcType=VARCHAR},
+      </if>
+      <if test="detailAddress != null">
+        detail_address = #{detailAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="altitude != null">
+        altitude = #{altitude,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null">
+        longitude = #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null">
+        latitude = #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateId != null">
+        update_id = #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="imgUrl != null">
+        img_url = #{imgUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="videoUrl != null">
+        video_url = #{videoUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="vrUrl != null">
+        vr_url = #{vrUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="cameraUrl != null">
+        camera_url = #{cameraUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.portal.model.UmsMemberOrigin">
+    update ums_member_origin
+    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
+      origin_name = #{originName,jdbcType=VARCHAR},
+      origin_area = #{originArea,jdbcType=DOUBLE},
+      people_num = #{peopleNum,jdbcType=INTEGER},
+      found_date = #{foundDate,jdbcType=VARCHAR},
+      link_user = #{linkUser,jdbcType=VARCHAR},
+      link_phone = #{linkPhone,jdbcType=VARCHAR},
+      province_name = #{provinceName,jdbcType=VARCHAR},
+      city_name = #{cityName,jdbcType=VARCHAR},
+      county_name = #{countyName,jdbcType=VARCHAR},
+      detail_address = #{detailAddress,jdbcType=VARCHAR},
+      altitude = #{altitude,jdbcType=VARCHAR},
+      longitude = #{longitude,jdbcType=VARCHAR},
+      latitude = #{latitude,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      img_url = #{imgUrl,jdbcType=LONGVARCHAR},
+      video_url = #{videoUrl,jdbcType=LONGVARCHAR},
+      vr_url = #{vrUrl,jdbcType=LONGVARCHAR},
+      camera_url = #{cameraUrl,jdbcType=LONGVARCHAR},
+      summary = #{summary,jdbcType=LONGVARCHAR},
+      remark = #{remark,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.portal.model.UmsMemberOrigin">
+    update ums_member_origin
+    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
+      origin_name = #{originName,jdbcType=VARCHAR},
+      origin_area = #{originArea,jdbcType=DOUBLE},
+      people_num = #{peopleNum,jdbcType=INTEGER},
+      found_date = #{foundDate,jdbcType=VARCHAR},
+      link_user = #{linkUser,jdbcType=VARCHAR},
+      link_phone = #{linkPhone,jdbcType=VARCHAR},
+      province_name = #{provinceName,jdbcType=VARCHAR},
+      city_name = #{cityName,jdbcType=VARCHAR},
+      county_name = #{countyName,jdbcType=VARCHAR},
+      detail_address = #{detailAddress,jdbcType=VARCHAR},
+      altitude = #{altitude,jdbcType=VARCHAR},
+      longitude = #{longitude,jdbcType=VARCHAR},
+      latitude = #{latitude,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 375 - 0
forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/UmsMemberOriginProductMapper.xml

@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.mapper.UmsMemberOriginProductMapper">
+  <resultMap id="BaseResultMap" type="com.hwrj.cloud.portal.model.UmsMemberOriginProduct">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="fk_origin_id" jdbcType="BIGINT" property="fkOriginId" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="plant_area" jdbcType="VARCHAR" property="plantArea" />
+    <result column="output_num" jdbcType="VARCHAR" property="outputNum" />
+    <result column="output_value" jdbcType="VARCHAR" property="outputValue" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.portal.model.UmsMemberOriginProduct">
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, fk_origin_id, product_name, plant_area, output_num, output_value, state, create_id, 
+    create_time, update_id, update_time
+  </sql>
+  <sql id="Blob_Column_List">
+    remark
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProductExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProductExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin_product
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ums_member_origin_product
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProductExample">
+    delete from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProduct">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin_product (fk_origin_id, product_name, plant_area, 
+      output_num, output_value, state, 
+      create_id, create_time, update_id, 
+      update_time, remark)
+    values (#{fkOriginId,jdbcType=BIGINT}, #{productName,jdbcType=VARCHAR}, #{plantArea,jdbcType=VARCHAR}, 
+      #{outputNum,jdbcType=VARCHAR}, #{outputValue,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, 
+      #{createId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=INTEGER}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProduct">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin_product
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fkOriginId != null">
+        fk_origin_id,
+      </if>
+      <if test="productName != null">
+        product_name,
+      </if>
+      <if test="plantArea != null">
+        plant_area,
+      </if>
+      <if test="outputNum != null">
+        output_num,
+      </if>
+      <if test="outputValue != null">
+        output_value,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateId != null">
+        update_id,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fkOriginId != null">
+        #{fkOriginId,jdbcType=BIGINT},
+      </if>
+      <if test="productName != null">
+        #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="plantArea != null">
+        #{plantArea,jdbcType=VARCHAR},
+      </if>
+      <if test="outputNum != null">
+        #{outputNum,jdbcType=VARCHAR},
+      </if>
+      <if test="outputValue != null">
+        #{outputValue,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createId != null">
+        #{createId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateId != null">
+        #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProductExample" resultType="java.lang.Long">
+    select count(*) from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update ums_member_origin_product
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.fkOriginId != null">
+        fk_origin_id = #{record.fkOriginId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productName != null">
+        product_name = #{record.productName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.plantArea != null">
+        plant_area = #{record.plantArea,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outputNum != null">
+        output_num = #{record.outputNum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outputValue != null">
+        output_value = #{record.outputValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateId != null">
+        update_id = #{record.updateId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update ums_member_origin_product
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_origin_id = #{record.fkOriginId,jdbcType=BIGINT},
+      product_name = #{record.productName,jdbcType=VARCHAR},
+      plant_area = #{record.plantArea,jdbcType=VARCHAR},
+      output_num = #{record.outputNum,jdbcType=VARCHAR},
+      output_value = #{record.outputValue,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      remark = #{record.remark,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update ums_member_origin_product
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_origin_id = #{record.fkOriginId,jdbcType=BIGINT},
+      product_name = #{record.productName,jdbcType=VARCHAR},
+      plant_area = #{record.plantArea,jdbcType=VARCHAR},
+      output_num = #{record.outputNum,jdbcType=VARCHAR},
+      output_value = #{record.outputValue,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProduct">
+    update ums_member_origin_product
+    <set>
+      <if test="fkOriginId != null">
+        fk_origin_id = #{fkOriginId,jdbcType=BIGINT},
+      </if>
+      <if test="productName != null">
+        product_name = #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="plantArea != null">
+        plant_area = #{plantArea,jdbcType=VARCHAR},
+      </if>
+      <if test="outputNum != null">
+        output_num = #{outputNum,jdbcType=VARCHAR},
+      </if>
+      <if test="outputValue != null">
+        output_value = #{outputValue,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateId != null">
+        update_id = #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProduct">
+    update ums_member_origin_product
+    set fk_origin_id = #{fkOriginId,jdbcType=BIGINT},
+      product_name = #{productName,jdbcType=VARCHAR},
+      plant_area = #{plantArea,jdbcType=VARCHAR},
+      output_num = #{outputNum,jdbcType=VARCHAR},
+      output_value = #{outputValue,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      remark = #{remark,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.portal.model.UmsMemberOriginProduct">
+    update ums_member_origin_product
+    set fk_origin_id = #{fkOriginId,jdbcType=BIGINT},
+      product_name = #{productName,jdbcType=VARCHAR},
+      plant_area = #{plantArea,jdbcType=VARCHAR},
+      output_num = #{outputNum,jdbcType=VARCHAR},
+      output_value = #{outputValue,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

+ 110 - 0
forest-portal/portal-server/target/classes/ap.yml

@@ -0,0 +1,110 @@
+spring:
+  datasource:
+    url: jdbc:mysql://129.28.174.150:7046/carbon-mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    druid:
+      initial-size: 5 #连接池初始化大小
+      min-idle: 10 #最小空闲连接数
+      max-active: 20 #最大连接数
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" #不统计这些请求数据
+      stat-view-servlet: #访问监控网页的登录用户名和密码
+        login-username: druid
+        login-password: druid
+  boot:
+    admin:
+      client:
+        # admin 服务端的地址
+        url: http://localhost:9091
+
+
+  redis:
+    host: 129.28.174.150 # Redis服务器地址
+    database: 0 # Redis数据库索引(默认为0)
+    port: 7047 # Redis服务器连接端口
+    password: # Redis服务器连接密码(默认为空)
+    timeout: 300ms # 连接超时时间(毫秒)
+  rabbitmq:
+    host: 129.28.174.150
+    port: 7048
+    virtual-host: /
+    username: guest
+    password: guest
+    publisher-confirms: true #如果对异步消息需要回调必须设置为true
+
+# 日志配置
+logging:
+  level:
+    org.springframework.data.mongodb.core: debug
+    com.hwrj.cloud.portal.mapper: debug
+    com.hwrj.cloud.portal.dao: debug
+
+mybatis:
+  mapper-locations:
+    - classpath:dao/*.xml
+    - classpath*:com/**/mapper/*.xml
+
+jwt:
+  tokenHeader: Authorization #JWT存储的请求头
+  secret: forest-portal-secret #JWT加解密使用的密钥
+  expiration: 604800 #JWT的超期限时间(60*60*24*7)
+  tokenHead: Bearer  #JWT负载中拿到开头
+
+
+
+secure:
+  ignored:
+    urls: #安全路径白名单
+      - /swagger-ui.html
+      - /swagger-resources/**
+      - /swagger/**
+      - /**/v2/api-docs
+      - /**/*.js
+      - /**/*.css
+      - /**/*.png
+      - /**/*.ico
+      - /webjars/springfox-swagger-ui/**
+      - /druid/**
+      - /actuator/**
+      - /sso/**
+      - /wechat/**
+      - /home/**
+      - /product/**
+      - /brand/**
+
+
+# 消息队列定义
+rabbitmq:
+  queue:
+    name:
+      cancelOrder: cancelOrderQueue
+# 自定义redis key
+redis:
+  database: forest
+  key:
+    authCode: 'ums:authCode'
+    telLoginCode: 'ums:authCode'
+    orderId: 'oms:orderId'
+    member: 'ums:member'
+  expire:
+    authCode: 90 # 验证码超期时间
+    authLoginCode: 240 # 验证码超期时间
+    common: 86400 # 24小时
+
+sms:
+  accessKeyId: LTAICB9TH0OAN3yJ
+  accessKeySecret: lCuyL3MUQRLfoVw39W0NqWdVGoLV60
+  signName: 慧云网安
+wx:
+  mp:
+    aesKey: 123
+    appId: wxbe90cc7c5233dd84
+    secret: ec4a18ce1a7bcf17cf592c3d57cec68a
+    token: 123
+    url: http://tanhui.hongweisoft.com/mall-portal-member/wechat/h5/userInfo
+
+
+
+
+

+ 18 - 0
forest-portal/portal-server/target/classes/bootstrap.yml

@@ -0,0 +1,18 @@
+server:
+  port: 9097
+spring:
+  profiles:
+    # dev 默认为开发环境 , prod 线上环境
+    active: prod
+  application:
+    name: forest-portal
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+      config:
+        server-addr: 127.0.0.1:8848
+        prefix: forest-portal
+        file-extension: yaml
+redis:
+  member: 'forest:ums:member:'

+ 65 - 0
forest-portal/portal-server/target/classes/dao/HomeDao.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.HomeDao">
+    <resultMap id="flashPromotionProduct" type="com.hwrj.cloud.portal.domain.FlashPromotionProduct"
+               extends="com.hwrj.cloud.portal.mapper.PmsProductMapper.BaseResultMap">
+        <result column="flash_promotion_price" property="flashPromotionPrice"/>
+        <result column="flash_promotion_count" property="flashPromotionCount"/>
+        <result column="flash_promotion_limit" property="flashPromotionLimit"/>
+    </resultMap>
+
+    <select id="getRecommendBrandList" resultMap="com.hwrj.cloud.portal.mapper.PmsBrandMapper.BaseResultMap">
+        SELECT b.*
+        FROM
+            sms_home_brand hb
+            LEFT JOIN pms_brand b ON hb.brand_id = b.id
+        WHERE
+            hb.recommend_status = 1
+            AND b.show_status = 1
+        ORDER BY
+            hb.sort DESC
+        LIMIT #{offset}, #{limit}
+    </select>
+
+    <select id="getFlashProductList" resultMap="flashPromotionProduct">
+        SELECT
+            pr.flash_promotion_price,
+            pr.flash_promotion_count,
+            pr.flash_promotion_limit,
+            p.*
+        FROM
+            sms_flash_promotion_product_relation pr
+            LEFT JOIN pms_product p ON pr.product_id = p.id
+        WHERE
+            pr.flash_promotion_id = #{flashPromotionId}
+            AND pr.flash_promotion_session_id = #{sessionId}
+    </select>
+
+    <select id="getNewProductList" resultMap="com.hwrj.cloud.portal.mapper.PmsProductMapper.BaseResultMap">
+        SELECT p.*
+        FROM
+            sms_home_new_product hp
+            LEFT JOIN pms_product p ON hp.product_id = p.id
+        WHERE
+            hp.recommend_status = 1
+            AND p.publish_status = 1
+        ORDER BY
+            hp.sort DESC
+        LIMIT #{offset}, #{limit};
+    </select>
+
+    <select id="getHotProductList" resultMap="com.hwrj.cloud.portal.mapper.PmsProductMapper.BaseResultMap">
+        SELECT p.*
+        FROM
+            sms_home_recommend_product hp
+            LEFT JOIN pms_product p ON hp.product_id = p.id
+        WHERE
+            hp.recommend_status = 1
+            AND p.publish_status = 1
+        ORDER BY
+            hp.sort DESC
+        LIMIT #{offset}, #{limit};
+    </select>
+
+
+</mapper>

+ 91 - 0
forest-portal/portal-server/target/classes/dao/PortalOrderDao.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.PortalOrderDao">
+    <resultMap id="orderDetailMap" type="com.hwrj.cloud.portal.domain.OmsOrderDetail"
+               extends="com.hwrj.cloud.portal.mapper.OmsOrderMapper.BaseResultMap">
+        <collection property="orderItemList" columnPrefix="ot_"
+                    resultMap="com.hwrj.cloud.portal.mapper.OmsOrderItemMapper.BaseResultMap">
+        </collection>
+    </resultMap>
+    <select id="getDetail" resultMap="orderDetailMap">
+        SELECT
+            o.id,
+            o.order_sn,
+            o.coupon_id,
+            o.integration,
+            o.member_id,
+            ot.id ot_id,
+            ot.product_name ot_product_name,
+            ot.product_sku_id ot_product_sku_id,
+            ot.product_sku_code ot_product_sku_code,
+            ot.product_quantity ot_product_quantity
+        FROM
+            oms_order o
+            LEFT JOIN oms_order_item ot ON o.id = ot.order_id
+        WHERE
+            o.id = #{orderId}
+    </select>
+
+    <select id="getTimeOutOrders" resultMap="orderDetailMap">
+        SELECT
+            o.id,
+            o.order_sn,
+            o.coupon_id,
+            o.integration,
+            o.member_id,
+            o.use_integration,
+            ot.id               ot_id,
+            ot.product_name     ot_product_name,
+            ot.product_sku_id   ot_product_sku_id,
+            ot.product_sku_code ot_product_sku_code,
+            ot.product_quantity ot_product_quantity
+        FROM
+            oms_order o
+            LEFT JOIN oms_order_item ot ON o.id = ot.order_id
+        WHERE
+            o.status = 0
+            AND o.create_time &lt; date_add(NOW(), INTERVAL -#{minute} MINUTE);
+    </select>
+
+    <update id="updateSkuStock">
+        UPDATE pms_sku_stock
+        SET
+            stock = CASE id
+            <foreach collection="itemList" item="item">
+              WHEN #{item.productSkuId} THEN stock - #{item.productQuantity}
+            </foreach>
+            END,
+            lock_stock = CASE id
+            <foreach collection="itemList" item="item">
+              WHEN #{item.productSkuId} THEN lock_stock - #{item.productQuantity}
+            </foreach>
+            END
+        WHERE
+            id IN
+        <foreach collection="itemList" item="item" separator="," open="(" close=")">
+            #{item.productSkuId}
+        </foreach>
+    </update>
+    <update id="updateOrderStatus">
+        update oms_order
+        set status=#{status}
+        where id in
+        <foreach collection="ids" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+    </update>
+    <update id="releaseSkuStockLock">
+        UPDATE pms_sku_stock
+        SET
+        lock_stock = CASE id
+        <foreach collection="itemList" item="item">
+            WHEN #{item.productSkuId} THEN lock_stock - #{item.productQuantity}
+        </foreach>
+        END
+        WHERE
+        id IN
+        <foreach collection="itemList" item="item" separator="," open="(" close=")">
+            #{item.productSkuId}
+        </foreach>
+    </update>
+</mapper>

+ 22 - 0
forest-portal/portal-server/target/classes/dao/PortalOrderItemDao.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.PortalOrderItemDao">
+    <insert id="insertList">
+        insert into oms_order_item (order_id, order_sn, product_id,
+        product_pic, product_name, product_brand,
+        product_sn, product_price, product_quantity,
+        product_sku_id, product_category_id, product_sku_code,promotion_name,
+        promotion_amount, coupon_amount, integration_amount,
+        real_amount,product_attr) values
+        <foreach collection="list" item="item" separator="," index="index">
+            (#{item.orderId,jdbcType=BIGINT}, #{item.orderSn,jdbcType=VARCHAR}, #{item.productId,jdbcType=BIGINT},
+            #{item.productPic,jdbcType=VARCHAR}, #{item.productName,jdbcType=VARCHAR}, #{item.productBrand,jdbcType=VARCHAR},
+            #{item.productSn,jdbcType=VARCHAR}, #{item.productPrice,jdbcType=DECIMAL}, #{item.productQuantity,jdbcType=INTEGER},
+            #{item.productSkuId,jdbcType=BIGINT}, #{item.productCategoryId,jdbcType=BIGINT}, #{item.productSkuCode,jdbcType=VARCHAR},
+            #{item.promotionName,jdbcType=VARCHAR},
+            #{item.promotionAmount,jdbcType=DECIMAL}, #{item.couponAmount,jdbcType=DECIMAL},
+            #{item.integrationAmount,jdbcType=DECIMAL},
+            #{item.realAmount,jdbcType=DECIMAL},#{item.productAttr,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
+</mapper>

+ 82 - 0
forest-portal/portal-server/target/classes/dao/PortalProductDao.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.PortalProductDao">
+    <resultMap id="cartProductMap" type="com.hwrj.cloud.portal.domain.CartProduct" autoMapping="true">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <collection property="productAttributeList" columnPrefix="attr_"
+                    resultMap="com.hwrj.cloud.portal.mapper.PmsProductAttributeMapper.BaseResultMap">
+        </collection>
+        <collection property="skuStockList" columnPrefix="sku_"
+                    resultMap="com.hwrj.cloud.portal.mapper.PmsSkuStockMapper.BaseResultMap">
+        </collection>
+    </resultMap>
+    <resultMap id="promotionProductMap" type="com.hwrj.cloud.portal.domain.PromotionProduct"
+               extends="com.hwrj.cloud.portal.mapper.PmsProductMapper.BaseResultMap">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <collection property="skuStockList" columnPrefix="sku_"
+                    resultMap="com.hwrj.cloud.portal.mapper.PmsSkuStockMapper.BaseResultMap">
+        </collection>
+        <collection property="productLadderList" columnPrefix="ladder_"
+                    resultMap="com.hwrj.cloud.portal.mapper.PmsProductLadderMapper.BaseResultMap">
+        </collection>
+        <collection property="productFullReductionList" columnPrefix="full_"
+                    resultMap="com.hwrj.cloud.portal.mapper.PmsProductFullReductionMapper.BaseResultMap">
+        </collection>
+    </resultMap>
+    <select id="getCartProduct" resultMap="cartProductMap">
+        SELECT
+            p.id id,
+            p.`name` name,
+            p.sub_title subTitle,
+            p.price price,
+            p.pic pic,
+            p.product_attribute_category_id productAttributeCategoryId,
+            p.stock stock,
+            pa.id attr_id,
+            pa.`name` attr_name,
+            ps.id sku_id,
+            ps.sku_code sku_code,
+            ps.price sku_price,
+            ps.stock sku_stock,
+            ps.pic sku_pic
+        FROM
+            pms_product p
+            LEFT JOIN pms_product_attribute pa ON p.product_attribute_category_id = pa.product_attribute_category_id
+            LEFT JOIN pms_sku_stock ps ON p.id=ps.product_id
+        WHERE
+            p.id = #{id}
+            AND pa.type = 0
+        ORDER BY pa.sort desc
+    </select>
+    <select id="getPromotionProductList" resultMap="promotionProductMap">
+        SELECT
+        p.id,
+        p.`name`,
+        p.promotion_type,
+        p.gift_growth,
+        p.gift_point,
+        sku.id sku_id,
+        sku.price sku_price,
+        sku.sku_code sku_sku_code,
+        sku.promotion_price sku_promotion_price,
+        sku.stock sku_stock,
+        sku.lock_stock sku_lock_stock,
+        ladder.id ladder_id,
+        ladder.count ladder_count,
+        ladder.discount ladder_discount,
+        full_re.id full_id,
+        full_re.full_price full_full_price,
+        full_re.reduce_price full_reduce_price
+        FROM
+        pms_product p
+        LEFT JOIN pms_sku_stock sku ON p.id = sku.product_id
+        LEFT JOIN pms_product_ladder ladder ON p.id = ladder.product_id
+        LEFT JOIN pms_product_full_reduction full_re ON p.id = full_re.product_id
+        WHERE
+        p.id IN
+        <foreach collection="ids" open="(" close=")" item="id" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
+</mapper>

+ 86 - 0
forest-portal/portal-server/target/classes/dao/SmsCouponHistoryDao.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.SmsCouponHistoryDao">
+    <resultMap id="couponHistoryDetailMap" type="com.hwrj.cloud.portal.domain.SmsCouponHistoryDetail"
+               extends="com.hwrj.cloud.portal.mapper.SmsCouponHistoryMapper.BaseResultMap">
+        <association property="coupon" resultMap="com.hwrj.cloud.portal.mapper.SmsCouponMapper.BaseResultMap"
+                     columnPrefix="c_">
+        </association>
+        <collection property="productRelationList" columnPrefix="cpr_"
+                    resultMap="com.hwrj.cloud.portal.mapper.SmsCouponProductRelationMapper.BaseResultMap">
+        </collection>
+        <collection property="categoryRelationList" columnPrefix="cpcr_"
+                    resultMap="com.hwrj.cloud.portal.mapper.SmsCouponProductCategoryRelationMapper.BaseResultMap">
+        </collection>
+    </resultMap>
+    <select id="getDetailList" resultMap="couponHistoryDetailMap">
+
+                SELECT
+                    ch.*,
+                    c.id c_id,
+                    c.name c_name,
+                    c.amount c_amount,
+                    c.min_point c_min_point,
+                    c.platform c_platform,
+                    c.start_time c_start_time,
+                    c.end_time c_end_time,
+                    c.note c_note,
+                    c.use_type c_use_type,
+                    c.type c_type,
+                    cpr.id cpr_id,cpr.product_id cpr_product_id,
+                    cpcr.id cpcr_id,cpcr.product_category_id cpcr_product_category_id
+                FROM
+                    sms_coupon_history ch
+                    LEFT JOIN sms_coupon c ON ch.coupon_id = c.id
+                    LEFT JOIN sms_coupon_product_relation cpr ON cpr.coupon_id = c.id
+                    LEFT JOIN sms_coupon_product_category_relation cpcr ON cpcr.coupon_id = c.id
+                WHERE ch.member_id = #{memberId}
+                AND ch.use_status = 0
+
+    </select>
+    <select id="getAvailableCouponList" resultMap="com.hwrj.cloud.portal.mapper.SmsCouponMapper.BaseResultMap">
+
+                SELECT *
+                FROM sms_coupon
+                WHERE use_type = 0
+                  AND start_time &lt; NOW()
+                  AND end_time &gt; NOW()
+                UNION
+                (
+                    SELECT c.*
+                    FROM sms_coupon_product_category_relation cpc
+                             LEFT JOIN sms_coupon c ON cpc.coupon_id = c.id
+                    WHERE c.use_type = 1
+                      AND c.start_time &lt; NOW()
+                      AND c.end_time &gt; NOW()
+                      AND cpc.product_category_id = #{productCategoryId}
+                )
+                UNION
+                (
+                    SELECT c.*
+                    FROM sms_coupon_product_relation cp
+                             LEFT JOIN sms_coupon c ON cp.coupon_id = c.id
+                    WHERE c.use_type = 2
+                      AND c.start_time &lt; NOW()
+                      AND c.end_time &gt; NOW()
+                      AND cp.product_id = #{productId}
+                )
+
+    </select>
+    <select id="getCouponList" resultMap="com.hwrj.cloud.portal.mapper.SmsCouponMapper.BaseResultMap">
+        SELECT
+        c.*
+        FROM
+        sms_coupon_history ch
+        LEFT JOIN sms_coupon c ON ch.coupon_id = c.id
+        WHERE ch.member_id = #{memberId}
+        <if test="useStatus!=null and useStatus!=2">
+            AND ch.use_status = #{useStatus}
+            AND NOW() > c.start_time
+            AND c.end_time > NOW()
+        </if>
+        <if test="useStatus!=null and useStatus==2">
+            AND NOW() > c.end_time
+        </if>
+    </select>
+</mapper>

+ 16 - 0
forest-portal/portal-server/target/classes/dao/SubjectDao.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.SubjectDao">
+    <select id="getRecommendSubjectList" resultMap="com.hwrj.cloud.portal.mapper.CmsSubjectMapper.BaseResultMap">
+        SELECT s.*
+        FROM
+            sms_home_recommend_subject hs
+            LEFT JOIN cms_subject s ON hs.subject_id = s.id
+        WHERE
+            hs.recommend_status = 1
+            AND s.show_status = 1
+        ORDER BY
+            hs.sort DESC
+        LIMIT #{offset}, #{limit};
+    </select>
+</mapper>

+ 15 - 0
forest-portal/portal-server/target/classes/dao/UmsOwnDataDao.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hwrj.cloud.portal.dao.UmsMemberDao">
+    <select id="getOwnData" parameterType="java.lang.Long" resultType="java.util.Map">
+        SELECT
+            count( 0 ) AS want,
+            ( SELECT count(0) FROM oms_pre_item WHERE push_id = #{memberId} )  as own
+        FROM
+            `oms_pre_item`
+        WHERE
+            member_id = #{memberId}
+    </select>
+
+
+</mapper>