修复修改字段名称产生的错误!

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginController.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.controller;
 
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 import com.hwrj.cloud.admin.listener.ImportExcelEventListener;
 import com.hwrj.cloud.admin.service.UmsMemberOriginService;
@@ -96,6 +97,13 @@ public class UmsMemberOriginController {
         return CommonResult.success(CommonPage.restPage(list));
     }
 
+    @ApiOperation(value = "生产地下拉列表",notes = "查询列表")
+    @PostMapping("/list/select")
+    public CommonResult listSelect(){
+        List<SelectVo> list = umsMemberOriginService.listSelect(CurrUserUtil.getCompId());
+        return CommonResult.success(list);
+    }
+
     @ApiOperation(value = "新增生产地信息",notes = "新增生产地信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "origin",value = "生产地信息",required = true,paramType = "UmsMemberOriginProductParam")

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsMemberOriginDao.java

@@ -1,7 +1,9 @@
 package com.hwrj.cloud.admin.dao;
 
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.model.UmsMemberOrigin;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -26,4 +28,6 @@ public interface UmsMemberOriginDao {
     UmsMemberOriginParam findById(long id);
 
     long deleteOneDataCheck(long id);
+
+    List<SelectVo> listSelect(@Param("compId") long compId);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsMemberOriginService.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.service;
 
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 
 import java.util.List;
@@ -23,4 +24,6 @@ public interface UmsMemberOriginService {
     UmsMemberOriginParam findById(long id);
 
     int delete(long id);
+
+    List<SelectVo> listSelect(long compId);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -425,13 +425,18 @@ public class PmsProductServiceImpl implements PmsProductService {
 
     @Override
     public int verify(Long id) {
-        PmsProduct product = new PmsProduct();
-        product.setVerifyStatus(1);
-        PmsProductExample example = new PmsProductExample();
-        example.createCriteria().andIdEqualTo(id);
-        List<PmsProductVertifyRecord> list = new ArrayList<>();
-        int count = productMapper.updateByExampleSelective(product, example);
-        return count;
+        int count = 0 ;
+        PmsProduct pmsProduct = productMapper.selectByPrimaryKey(id);
+        if(!StringUtils.isEmpty(pmsProduct)){
+            PmsProduct product = new PmsProduct();
+            product.setVerifyStatus(1);
+            PmsProductExample example = new PmsProductExample();
+            example.createCriteria().andIdEqualTo(id);
+            List<PmsProductVertifyRecord> list = new ArrayList<>();
+            return count = productMapper.updateByExampleSelective(product, example);
+        }else{
+            throw new GlobalException("商品不存在无法审核！");
+        }
     }
 
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsAdminServiceImpl.java

@@ -13,6 +13,7 @@ import com.hwrj.cloud.admin.mapper.UmsAdminMapper;
 import com.hwrj.cloud.admin.mapper.UmsAdminPermissionRelationMapper;
 import com.hwrj.cloud.admin.mapper.UmsAdminRoleRelationMapper;
 import com.hwrj.cloud.admin.model.*;
+import com.hwrj.cloud.common.exception.GlobalException;
 import com.hwrj.cloud.security.util.JwtTokenUtil;
 import com.hwrj.cloud.admin.service.UmsAdminCacheService;
 import com.hwrj.cloud.admin.service.UmsAdminService;
@@ -121,6 +122,7 @@ public class UmsAdminServiceImpl implements UmsAdminService {
             insertLoginLog(username);
         } catch (AuthenticationException e) {
             LOGGER.warn("登录异常:{}", e.getMessage());
+            throw new GlobalException(1,e.getMessage());
         }
         return token;
     }
@@ -311,10 +313,15 @@ public class UmsAdminServiceImpl implements UmsAdminService {
     public UserDetails loadUserByUsername(String username){
         //获取用户信息
         UmsAdmin admin = getAdminByUsername(username);
+        Integer status = admin.getStatus();
+        if(status.intValue() ==0 ){
+            throw new UsernameNotFoundException("用户被禁用！");
+        }
         if (admin != null) {
             List<UmsResource> resourceList = getResourceList(admin.getId());
             return new AdminUserDetails(admin,resourceList);
+        }else {
+            throw new UsernameNotFoundException("用户名或密码错误！");
         }
-        throw new UsernameNotFoundException("用户名或密码错误");
     }
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginServiceImpl.java

@@ -3,6 +3,7 @@ package com.hwrj.cloud.admin.service.impl;
 import com.hwrj.cloud.admin.dao.UmsMemberOriginDao;
 import com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao;
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 import com.hwrj.cloud.admin.mapper.UmsCompanyInfoMapper;
 import com.hwrj.cloud.admin.mapper.UmsMemberOriginMapper;
@@ -207,4 +208,9 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
         return umsMemberOriginMapper.updateByPrimaryKeySelective(origin);
     }
 
+    @Override
+    public List<SelectVo> listSelect(long compId) {
+        return umsMemberOriginDao.listSelect(compId);
+    }
+
 }

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginDao.xml

@@ -96,4 +96,16 @@
             a.delete_status = 0
         AND a.place_of_production_id = #{id}
     </select>
+    <select id="listSelect" resultType="com.hwrj.cloud.admin.dto.param.SelectVo">
+        SELECT
+        a.id as lable,
+        a.origin_name as text
+        FROM
+        ums_member_origin a
+        WHERE
+        a.state = 0
+        <if test="compId != null">
+            AND a.comp_id = #{compId}
+        </if>
+    </select>
 </mapper>

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

@@ -15,7 +15,7 @@ public class OmsPreItem implements Serializable {
     private Long memberId;
 
     @ApiModelProperty(value = "产品供应商id")
-    private Long companyId;
+    private Long compId;
 
     @ApiModelProperty(value = "产品发布人id")
     private Long pushId;
@@ -27,7 +27,7 @@ public class OmsPreItem implements Serializable {
     private String originName;
 
     @ApiModelProperty(value = "产品供应商名称")
-    private String companyName;
+    private String compName;
 
     @ApiModelProperty(value = "添加意向购买人的价格")
     private BigDecimal price;
@@ -53,7 +53,7 @@ public class OmsPreItem implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date modifyDate;
 
-    @ApiModelProperty(value = "是否删除")
+    @ApiModelProperty(value = "是否删除 0 未删除 1已删除")
     private Integer deleteStatus;
 
     @ApiModelProperty(value = "商品分类")
@@ -92,12 +92,12 @@ public class OmsPreItem implements Serializable {
         this.memberId = memberId;
     }
 
-    public Long getCompanyId() {
-        return companyId;
+    public Long getCompId() {
+        return compId;
     }
 
-    public void setCompanyId(Long companyId) {
-        this.companyId = companyId;
+    public void setCompId(Long compId) {
+        this.compId = compId;
     }
 
     public Long getPushId() {
@@ -124,12 +124,12 @@ public class OmsPreItem implements Serializable {
         this.originName = originName;
     }
 
-    public String getCompanyName() {
-        return companyName;
+    public String getCompName() {
+        return compName;
     }
 
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
+    public void setCompName(String compName) {
+        this.compName = compName;
     }
 
     public BigDecimal getPrice() {
@@ -245,11 +245,11 @@ public class OmsPreItem implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", productId=").append(productId);
         sb.append(", memberId=").append(memberId);
-        sb.append(", companyId=").append(companyId);
+        sb.append(", compId=").append(compId);
         sb.append(", pushId=").append(pushId);
         sb.append(", originId=").append(originId);
         sb.append(", originName=").append(originName);
-        sb.append(", companyName=").append(companyName);
+        sb.append(", compName=").append(compName);
         sb.append(", price=").append(price);
         sb.append(", productPic=").append(productPic);
         sb.append(", productName=").append(productName);

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/OmsPreItemExample.java

@@ -286,63 +286,63 @@ public class OmsPreItemExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNull() {
-            addCriterion("company_id is null");
+        public Criteria andCompIdIsNull() {
+            addCriterion("comp_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIsNotNull() {
-            addCriterion("company_id is not null");
+        public Criteria andCompIdIsNotNull() {
+            addCriterion("comp_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdEqualTo(Long value) {
-            addCriterion("company_id =", value, "companyId");
+        public Criteria andCompIdEqualTo(Long value) {
+            addCriterion("comp_id =", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotEqualTo(Long value) {
-            addCriterion("company_id <>", value, "companyId");
+        public Criteria andCompIdNotEqualTo(Long value) {
+            addCriterion("comp_id <>", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThan(Long value) {
-            addCriterion("company_id >", value, "companyId");
+        public Criteria andCompIdGreaterThan(Long value) {
+            addCriterion("comp_id >", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("company_id >=", value, "companyId");
+        public Criteria andCompIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("comp_id >=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThan(Long value) {
-            addCriterion("company_id <", value, "companyId");
+        public Criteria andCompIdLessThan(Long value) {
+            addCriterion("comp_id <", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
-            addCriterion("company_id <=", value, "companyId");
+        public Criteria andCompIdLessThanOrEqualTo(Long value) {
+            addCriterion("comp_id <=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdIn(List<Long> values) {
-            addCriterion("company_id in", values, "companyId");
+        public Criteria andCompIdIn(List<Long> values) {
+            addCriterion("comp_id in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotIn(List<Long> values) {
-            addCriterion("company_id not in", values, "companyId");
+        public Criteria andCompIdNotIn(List<Long> values) {
+            addCriterion("comp_id not in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdBetween(Long value1, Long value2) {
-            addCriterion("company_id between", value1, value2, "companyId");
+        public Criteria andCompIdBetween(Long value1, Long value2) {
+            addCriterion("comp_id between", value1, value2, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
-            addCriterion("company_id not between", value1, value2, "companyId");
+        public Criteria andCompIdNotBetween(Long value1, Long value2) {
+            addCriterion("comp_id not between", value1, value2, "compId");
             return (Criteria) this;
         }
 
@@ -536,73 +536,73 @@ public class OmsPreItemExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameIsNull() {
-            addCriterion("company_name is null");
+        public Criteria andCompNameIsNull() {
+            addCriterion("comp_name is null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameIsNotNull() {
-            addCriterion("company_name is not null");
+        public Criteria andCompNameIsNotNull() {
+            addCriterion("comp_name is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameEqualTo(String value) {
-            addCriterion("company_name =", value, "companyName");
+        public Criteria andCompNameEqualTo(String value) {
+            addCriterion("comp_name =", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameNotEqualTo(String value) {
-            addCriterion("company_name <>", value, "companyName");
+        public Criteria andCompNameNotEqualTo(String value) {
+            addCriterion("comp_name <>", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameGreaterThan(String value) {
-            addCriterion("company_name >", value, "companyName");
+        public Criteria andCompNameGreaterThan(String value) {
+            addCriterion("comp_name >", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
-            addCriterion("company_name >=", value, "companyName");
+        public Criteria andCompNameGreaterThanOrEqualTo(String value) {
+            addCriterion("comp_name >=", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameLessThan(String value) {
-            addCriterion("company_name <", value, "companyName");
+        public Criteria andCompNameLessThan(String value) {
+            addCriterion("comp_name <", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
-            addCriterion("company_name <=", value, "companyName");
+        public Criteria andCompNameLessThanOrEqualTo(String value) {
+            addCriterion("comp_name <=", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameLike(String value) {
-            addCriterion("company_name like", value, "companyName");
+        public Criteria andCompNameLike(String value) {
+            addCriterion("comp_name like", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameNotLike(String value) {
-            addCriterion("company_name not like", value, "companyName");
+        public Criteria andCompNameNotLike(String value) {
+            addCriterion("comp_name not like", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameIn(List<String> values) {
-            addCriterion("company_name in", values, "companyName");
+        public Criteria andCompNameIn(List<String> values) {
+            addCriterion("comp_name in", values, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameNotIn(List<String> values) {
-            addCriterion("company_name not in", values, "companyName");
+        public Criteria andCompNameNotIn(List<String> values) {
+            addCriterion("comp_name not in", values, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameBetween(String value1, String value2) {
-            addCriterion("company_name between", value1, value2, "companyName");
+        public Criteria andCompNameBetween(String value1, String value2) {
+            addCriterion("comp_name between", value1, value2, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyNameNotBetween(String value1, String value2) {
-            addCriterion("company_name not between", value1, value2, "companyName");
+        public Criteria andCompNameNotBetween(String value1, String value2) {
+            addCriterion("comp_name not between", value1, value2, "compName");
             return (Criteria) this;
         }
 

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/PmsProduct.java

@@ -11,19 +11,36 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "品牌id")
     private Long brandId;
 
+    @ApiModelProperty(value = "品牌名称")
+    private String brandName;
+
+    @ApiModelProperty(value = "产品大类标识")
+    private Long productBigCategoryId;
+
+    @ApiModelProperty(value = "产品大类类别名称")
+    private String productBigCategoryName;
+
     @ApiModelProperty(value = "产品类别标识")
     private Long productCategoryId;
 
+    @ApiModelProperty(value = "商品分类名称")
+    private String productCategoryName;
+
     @ApiModelProperty(value = "运费模版id")
     private Long feightTemplateId;
 
     @ApiModelProperty(value = "产品属性类别标识")
     private Long productAttributeCategoryId;
 
+    @ApiModelProperty(value = "商品名称")
     private String name;
 
+    @ApiModelProperty(value = "商品首图")
     private String pic;
 
+    @ApiModelProperty(value = "规格")
+    private String spec;
+
     @ApiModelProperty(value = "货号")
     private String productSn;
 
@@ -62,9 +79,6 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "限制使用的积分数")
     private Integer usePointLimit;
 
-    @ApiModelProperty(value = "副标题")
-    private String subTitle;
-
     @ApiModelProperty(value = "市场价")
     private BigDecimal originalPrice;
 
@@ -90,9 +104,6 @@ public class PmsProduct implements Serializable {
 
     private String note;
 
-    @ApiModelProperty(value = "画册图片，连产品图片限制为5张，以逗号分割")
-    private String albumPics;
-
     private String detailTitle;
 
     @ApiModelProperty(value = "促销开始时间")
@@ -107,24 +118,15 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "促销类型：0->没有促销使用原价;1->使用促销价；2->使用会员价；3->使用阶梯价格；4->使用满减价格；5->限时购")
     private Integer promotionType;
 
-    @ApiModelProperty(value = "品牌名称")
-    private String brandName;
-
-    @ApiModelProperty(value = "商品分类名称")
-    private String productCategoryName;
-
     @ApiModelProperty(value = "供应商id")
-    private Long umsCompanyInfoId;
+    private Long compId;
 
     @ApiModelProperty(value = "供应商")
-    private String umsCompanyInfo;
+    private String compName;
 
     @ApiModelProperty(value = "批发价")
     private BigDecimal tradePrice;
 
-    @ApiModelProperty(value = "规格")
-    private String spec;
-
     @ApiModelProperty(value = "生产日期")
     private String dateOfManufacture;
 
@@ -134,9 +136,6 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "生产地")
     private String placeOfProduction;
 
-    @ApiModelProperty(value = "使用说明")
-    private String instructions;
-
     @ApiModelProperty(value = "保质期")
     private String qualityGuaranteePeriod;
 
@@ -144,13 +143,13 @@ public class PmsProduct implements Serializable {
     private String pointsForAttention;
 
     @ApiModelProperty(value = "创建人")
-    private Long createUser;
+    private Long createId;
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     @ApiModelProperty(value = "更新人")
-    private Long updateUser;
+    private Long updateId;
 
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
@@ -158,9 +157,15 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "0:后台发布1：移动端发布")
     private Integer createType;
 
+    @ApiModelProperty(value = "副标题")
+    private String subTitle;
+
     @ApiModelProperty(value = "商品描述")
     private String description;
 
+    @ApiModelProperty(value = "画册图片，连产品图片限制为5张，以逗号分割")
+    private String albumPics;
+
     private String detailDesc;
 
     @ApiModelProperty(value = "产品详情网页内容")
@@ -169,6 +174,9 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "移动端网页详情")
     private String detailMobileHtml;
 
+    @ApiModelProperty(value = "使用说明")
+    private String instructions;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -187,6 +195,30 @@ public class PmsProduct implements Serializable {
         this.brandId = brandId;
     }
 
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+
+    public Long getProductBigCategoryId() {
+        return productBigCategoryId;
+    }
+
+    public void setProductBigCategoryId(Long productBigCategoryId) {
+        this.productBigCategoryId = productBigCategoryId;
+    }
+
+    public String getProductBigCategoryName() {
+        return productBigCategoryName;
+    }
+
+    public void setProductBigCategoryName(String productBigCategoryName) {
+        this.productBigCategoryName = productBigCategoryName;
+    }
+
     public Long getProductCategoryId() {
         return productCategoryId;
     }
@@ -195,6 +227,14 @@ public class PmsProduct implements Serializable {
         this.productCategoryId = productCategoryId;
     }
 
+    public String getProductCategoryName() {
+        return productCategoryName;
+    }
+
+    public void setProductCategoryName(String productCategoryName) {
+        this.productCategoryName = productCategoryName;
+    }
+
     public Long getFeightTemplateId() {
         return feightTemplateId;
     }
@@ -227,6 +267,14 @@ public class PmsProduct implements Serializable {
         this.pic = pic;
     }
 
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
     public String getProductSn() {
         return productSn;
     }
@@ -331,14 +379,6 @@ public class PmsProduct implements Serializable {
         this.usePointLimit = usePointLimit;
     }
 
-    public String getSubTitle() {
-        return subTitle;
-    }
-
-    public void setSubTitle(String subTitle) {
-        this.subTitle = subTitle;
-    }
-
     public BigDecimal getOriginalPrice() {
         return originalPrice;
     }
@@ -411,14 +451,6 @@ public class PmsProduct implements Serializable {
         this.note = note;
     }
 
-    public String getAlbumPics() {
-        return albumPics;
-    }
-
-    public void setAlbumPics(String albumPics) {
-        this.albumPics = albumPics;
-    }
-
     public String getDetailTitle() {
         return detailTitle;
     }
@@ -459,36 +491,20 @@ public class PmsProduct implements Serializable {
         this.promotionType = promotionType;
     }
 
-    public String getBrandName() {
-        return brandName;
-    }
-
-    public void setBrandName(String brandName) {
-        this.brandName = brandName;
+    public Long getCompId() {
+        return compId;
     }
 
-    public String getProductCategoryName() {
-        return productCategoryName;
+    public void setCompId(Long compId) {
+        this.compId = compId;
     }
 
-    public void setProductCategoryName(String productCategoryName) {
-        this.productCategoryName = productCategoryName;
+    public String getCompName() {
+        return compName;
     }
 
-    public Long getUmsCompanyInfoId() {
-        return umsCompanyInfoId;
-    }
-
-    public void setUmsCompanyInfoId(Long umsCompanyInfoId) {
-        this.umsCompanyInfoId = umsCompanyInfoId;
-    }
-
-    public String getUmsCompanyInfo() {
-        return umsCompanyInfo;
-    }
-
-    public void setUmsCompanyInfo(String umsCompanyInfo) {
-        this.umsCompanyInfo = umsCompanyInfo;
+    public void setCompName(String compName) {
+        this.compName = compName;
     }
 
     public BigDecimal getTradePrice() {
@@ -499,14 +515,6 @@ public class PmsProduct implements Serializable {
         this.tradePrice = tradePrice;
     }
 
-    public String getSpec() {
-        return spec;
-    }
-
-    public void setSpec(String spec) {
-        this.spec = spec;
-    }
-
     public String getDateOfManufacture() {
         return dateOfManufacture;
     }
@@ -531,14 +539,6 @@ public class PmsProduct implements Serializable {
         this.placeOfProduction = placeOfProduction;
     }
 
-    public String getInstructions() {
-        return instructions;
-    }
-
-    public void setInstructions(String instructions) {
-        this.instructions = instructions;
-    }
-
     public String getQualityGuaranteePeriod() {
         return qualityGuaranteePeriod;
     }
@@ -555,12 +555,12 @@ public class PmsProduct implements Serializable {
         this.pointsForAttention = pointsForAttention;
     }
 
-    public Long getCreateUser() {
-        return createUser;
+    public Long getCreateId() {
+        return createId;
     }
 
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
+    public void setCreateId(Long createId) {
+        this.createId = createId;
     }
 
     public Date getCreateTime() {
@@ -571,12 +571,12 @@ public class PmsProduct implements Serializable {
         this.createTime = createTime;
     }
 
-    public Long getUpdateUser() {
-        return updateUser;
+    public Long getUpdateId() {
+        return updateId;
     }
 
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
+    public void setUpdateId(Long updateId) {
+        this.updateId = updateId;
     }
 
     public Date getUpdateTime() {
@@ -595,6 +595,14 @@ public class PmsProduct implements Serializable {
         this.createType = createType;
     }
 
+    public String getSubTitle() {
+        return subTitle;
+    }
+
+    public void setSubTitle(String subTitle) {
+        this.subTitle = subTitle;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -603,6 +611,14 @@ public class PmsProduct implements Serializable {
         this.description = description;
     }
 
+    public String getAlbumPics() {
+        return albumPics;
+    }
+
+    public void setAlbumPics(String albumPics) {
+        this.albumPics = albumPics;
+    }
+
     public String getDetailDesc() {
         return detailDesc;
     }
@@ -627,6 +643,14 @@ public class PmsProduct implements Serializable {
         this.detailMobileHtml = detailMobileHtml;
     }
 
+    public String getInstructions() {
+        return instructions;
+    }
+
+    public void setInstructions(String instructions) {
+        this.instructions = instructions;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -635,11 +659,16 @@ public class PmsProduct implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", brandId=").append(brandId);
+        sb.append(", brandName=").append(brandName);
+        sb.append(", productBigCategoryId=").append(productBigCategoryId);
+        sb.append(", productBigCategoryName=").append(productBigCategoryName);
         sb.append(", productCategoryId=").append(productCategoryId);
+        sb.append(", productCategoryName=").append(productCategoryName);
         sb.append(", feightTemplateId=").append(feightTemplateId);
         sb.append(", productAttributeCategoryId=").append(productAttributeCategoryId);
         sb.append(", name=").append(name);
         sb.append(", pic=").append(pic);
+        sb.append(", spec=").append(spec);
         sb.append(", productSn=").append(productSn);
         sb.append(", deleteStatus=").append(deleteStatus);
         sb.append(", publishStatus=").append(publishStatus);
@@ -653,7 +682,6 @@ public class PmsProduct implements Serializable {
         sb.append(", giftGrowth=").append(giftGrowth);
         sb.append(", giftPoint=").append(giftPoint);
         sb.append(", usePointLimit=").append(usePointLimit);
-        sb.append(", subTitle=").append(subTitle);
         sb.append(", originalPrice=").append(originalPrice);
         sb.append(", stock=").append(stock);
         sb.append(", lowStock=").append(lowStock);
@@ -663,33 +691,31 @@ public class PmsProduct implements Serializable {
         sb.append(", serviceIds=").append(serviceIds);
         sb.append(", keywords=").append(keywords);
         sb.append(", note=").append(note);
-        sb.append(", albumPics=").append(albumPics);
         sb.append(", detailTitle=").append(detailTitle);
         sb.append(", promotionStartTime=").append(promotionStartTime);
         sb.append(", promotionEndTime=").append(promotionEndTime);
         sb.append(", promotionPerLimit=").append(promotionPerLimit);
         sb.append(", promotionType=").append(promotionType);
-        sb.append(", brandName=").append(brandName);
-        sb.append(", productCategoryName=").append(productCategoryName);
-        sb.append(", umsCompanyInfoId=").append(umsCompanyInfoId);
-        sb.append(", umsCompanyInfo=").append(umsCompanyInfo);
+        sb.append(", compId=").append(compId);
+        sb.append(", compName=").append(compName);
         sb.append(", tradePrice=").append(tradePrice);
-        sb.append(", spec=").append(spec);
         sb.append(", dateOfManufacture=").append(dateOfManufacture);
         sb.append(", placeOfProductionId=").append(placeOfProductionId);
         sb.append(", placeOfProduction=").append(placeOfProduction);
-        sb.append(", instructions=").append(instructions);
         sb.append(", qualityGuaranteePeriod=").append(qualityGuaranteePeriod);
         sb.append(", pointsForAttention=").append(pointsForAttention);
-        sb.append(", createUser=").append(createUser);
+        sb.append(", createId=").append(createId);
         sb.append(", createTime=").append(createTime);
-        sb.append(", updateUser=").append(updateUser);
+        sb.append(", updateId=").append(updateId);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", createType=").append(createType);
+        sb.append(", subTitle=").append(subTitle);
         sb.append(", description=").append(description);
+        sb.append(", albumPics=").append(albumPics);
         sb.append(", detailDesc=").append(detailDesc);
         sb.append(", detailHtml=").append(detailHtml);
         sb.append(", detailMobileHtml=").append(detailMobileHtml);
+        sb.append(", instructions=").append(instructions);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -9,7 +9,7 @@ public class UmsMemberOrigin implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
-    private Long fkCompanyInfoId;
+    private Long compId;
 
     @ApiModelProperty(value = "供应商名称")
     private String compName;
@@ -96,12 +96,12 @@ public class UmsMemberOrigin implements Serializable {
         this.id = id;
     }
 
-    public Long getFkCompanyInfoId() {
-        return fkCompanyInfoId;
+    public Long getCompId() {
+        return compId;
     }
 
-    public void setFkCompanyInfoId(Long fkCompanyInfoId) {
-        this.fkCompanyInfoId = fkCompanyInfoId;
+    public void setCompId(Long compId) {
+        this.compId = compId;
     }
 
     public String getCompName() {
@@ -311,7 +311,7 @@ public class UmsMemberOrigin implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
-        sb.append(", fkCompanyInfoId=").append(fkCompanyInfoId);
+        sb.append(", compId=").append(compId);
         sb.append(", compName=").append(compName);
         sb.append(", originName=").append(originName);
         sb.append(", originArea=").append(originArea);

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginExample.java

@@ -165,63 +165,63 @@ public class UmsMemberOriginExample {
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdIsNull() {
-            addCriterion("fk_company_info_id is null");
+        public Criteria andCompIdIsNull() {
+            addCriterion("comp_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdIsNotNull() {
-            addCriterion("fk_company_info_id is not null");
+        public Criteria andCompIdIsNotNull() {
+            addCriterion("comp_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdEqualTo(Long value) {
-            addCriterion("fk_company_info_id =", value, "fkCompanyInfoId");
+        public Criteria andCompIdEqualTo(Long value) {
+            addCriterion("comp_id =", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdNotEqualTo(Long value) {
-            addCriterion("fk_company_info_id <>", value, "fkCompanyInfoId");
+        public Criteria andCompIdNotEqualTo(Long value) {
+            addCriterion("comp_id <>", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdGreaterThan(Long value) {
-            addCriterion("fk_company_info_id >", value, "fkCompanyInfoId");
+        public Criteria andCompIdGreaterThan(Long value) {
+            addCriterion("comp_id >", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("fk_company_info_id >=", value, "fkCompanyInfoId");
+        public Criteria andCompIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("comp_id >=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdLessThan(Long value) {
-            addCriterion("fk_company_info_id <", value, "fkCompanyInfoId");
+        public Criteria andCompIdLessThan(Long value) {
+            addCriterion("comp_id <", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdLessThanOrEqualTo(Long value) {
-            addCriterion("fk_company_info_id <=", value, "fkCompanyInfoId");
+        public Criteria andCompIdLessThanOrEqualTo(Long value) {
+            addCriterion("comp_id <=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdIn(List<Long> values) {
-            addCriterion("fk_company_info_id in", values, "fkCompanyInfoId");
+        public Criteria andCompIdIn(List<Long> values) {
+            addCriterion("comp_id in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdNotIn(List<Long> values) {
-            addCriterion("fk_company_info_id not in", values, "fkCompanyInfoId");
+        public Criteria andCompIdNotIn(List<Long> values) {
+            addCriterion("comp_id not in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdBetween(Long value1, Long value2) {
-            addCriterion("fk_company_info_id between", value1, value2, "fkCompanyInfoId");
+        public Criteria andCompIdBetween(Long value1, Long value2) {
+            addCriterion("comp_id between", value1, value2, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andFkCompanyInfoIdNotBetween(Long value1, Long value2) {
-            addCriterion("fk_company_info_id not between", value1, value2, "fkCompanyInfoId");
+        public Criteria andCompIdNotBetween(Long value1, Long value2) {
+            addCriterion("comp_id not between", value1, value2, "compId");
             return (Criteria) this;
         }
 

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

@@ -5,11 +5,11 @@
     <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="comp_id" jdbcType="BIGINT" property="compId" />
     <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="comp_name" jdbcType="VARCHAR" property="compName" />
     <result column="price" jdbcType="DECIMAL" property="price" />
     <result column="product_pic" jdbcType="VARCHAR" property="productPic" />
     <result column="product_name" jdbcType="VARCHAR" property="productName" />
@@ -83,8 +83,8 @@
     </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, 
+    id, product_id, member_id, comp_id, push_id, origin_id, origin_name, comp_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>
@@ -122,16 +122,16 @@
     <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, 
+    insert into oms_pre_item (product_id, member_id, comp_id, 
       push_id, origin_id, origin_name, 
-      company_name, price, product_pic, 
+      comp_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}, 
+    values (#{productId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{compId,jdbcType=BIGINT}, 
       #{pushId,jdbcType=BIGINT}, #{originId,jdbcType=BIGINT}, #{originName,jdbcType=VARCHAR}, 
-      #{companyName,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{productPic,jdbcType=VARCHAR}, 
+      #{compName,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}, 
@@ -149,8 +149,8 @@
       <if test="memberId != null">
         member_id,
       </if>
-      <if test="companyId != null">
-        company_id,
+      <if test="compId != null">
+        comp_id,
       </if>
       <if test="pushId != null">
         push_id,
@@ -161,8 +161,8 @@
       <if test="originName != null">
         origin_name,
       </if>
-      <if test="companyName != null">
-        company_name,
+      <if test="compName != null">
+        comp_name,
       </if>
       <if test="price != null">
         price,
@@ -211,8 +211,8 @@
       <if test="memberId != null">
         #{memberId,jdbcType=BIGINT},
       </if>
-      <if test="companyId != null">
-        #{companyId,jdbcType=BIGINT},
+      <if test="compId != null">
+        #{compId,jdbcType=BIGINT},
       </if>
       <if test="pushId != null">
         #{pushId,jdbcType=BIGINT},
@@ -223,8 +223,8 @@
       <if test="originName != null">
         #{originName,jdbcType=VARCHAR},
       </if>
-      <if test="companyName != null">
-        #{companyName,jdbcType=VARCHAR},
+      <if test="compName != null">
+        #{compName,jdbcType=VARCHAR},
       </if>
       <if test="price != null">
         #{price,jdbcType=DECIMAL},
@@ -285,8 +285,8 @@
       <if test="record.memberId != null">
         member_id = #{record.memberId,jdbcType=BIGINT},
       </if>
-      <if test="record.companyId != null">
-        company_id = #{record.companyId,jdbcType=BIGINT},
+      <if test="record.compId != null">
+        comp_id = #{record.compId,jdbcType=BIGINT},
       </if>
       <if test="record.pushId != null">
         push_id = #{record.pushId,jdbcType=BIGINT},
@@ -297,8 +297,8 @@
       <if test="record.originName != null">
         origin_name = #{record.originName,jdbcType=VARCHAR},
       </if>
-      <if test="record.companyName != null">
-        company_name = #{record.companyName,jdbcType=VARCHAR},
+      <if test="record.compName != null">
+        comp_name = #{record.compName,jdbcType=VARCHAR},
       </if>
       <if test="record.price != null">
         price = #{record.price,jdbcType=DECIMAL},
@@ -349,11 +349,11 @@
     set id = #{record.id,jdbcType=BIGINT},
       product_id = #{record.productId,jdbcType=BIGINT},
       member_id = #{record.memberId,jdbcType=BIGINT},
-      company_id = #{record.companyId,jdbcType=BIGINT},
+      comp_id = #{record.compId,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},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
       price = #{record.price,jdbcType=DECIMAL},
       product_pic = #{record.productPic,jdbcType=VARCHAR},
       product_name = #{record.productName,jdbcType=VARCHAR},
@@ -380,8 +380,8 @@
       <if test="memberId != null">
         member_id = #{memberId,jdbcType=BIGINT},
       </if>
-      <if test="companyId != null">
-        company_id = #{companyId,jdbcType=BIGINT},
+      <if test="compId != null">
+        comp_id = #{compId,jdbcType=BIGINT},
       </if>
       <if test="pushId != null">
         push_id = #{pushId,jdbcType=BIGINT},
@@ -392,8 +392,8 @@
       <if test="originName != null">
         origin_name = #{originName,jdbcType=VARCHAR},
       </if>
-      <if test="companyName != null">
-        company_name = #{companyName,jdbcType=VARCHAR},
+      <if test="compName != null">
+        comp_name = #{compName,jdbcType=VARCHAR},
       </if>
       <if test="price != null">
         price = #{price,jdbcType=DECIMAL},
@@ -441,11 +441,11 @@
     update oms_pre_item
     set product_id = #{productId,jdbcType=BIGINT},
       member_id = #{memberId,jdbcType=BIGINT},
-      company_id = #{companyId,jdbcType=BIGINT},
+      comp_id = #{compId,jdbcType=BIGINT},
       push_id = #{pushId,jdbcType=BIGINT},
       origin_id = #{originId,jdbcType=BIGINT},
       origin_name = #{originName,jdbcType=VARCHAR},
-      company_name = #{companyName,jdbcType=VARCHAR},
+      comp_name = #{compName,jdbcType=VARCHAR},
       price = #{price,jdbcType=DECIMAL},
       product_pic = #{productPic,jdbcType=VARCHAR},
       product_name = #{productName,jdbcType=VARCHAR},

forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/PmsProductMapper.xml

@@ -4,11 +4,16 @@
   <resultMap id="BaseResultMap" type="com.hwrj.cloud.portal.model.PmsProduct">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="brand_id" jdbcType="BIGINT" property="brandId" />
+    <result column="brand_name" jdbcType="VARCHAR" property="brandName" />
+    <result column="product_big_category_id" jdbcType="BIGINT" property="productBigCategoryId" />
+    <result column="product_big_category_name" jdbcType="VARCHAR" property="productBigCategoryName" />
     <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
+    <result column="product_category_name" jdbcType="VARCHAR" property="productCategoryName" />
     <result column="feight_template_id" jdbcType="BIGINT" property="feightTemplateId" />
     <result column="product_attribute_category_id" jdbcType="BIGINT" property="productAttributeCategoryId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="pic" jdbcType="VARCHAR" property="pic" />
+    <result column="spec" jdbcType="VARCHAR" property="spec" />
     <result column="product_sn" jdbcType="VARCHAR" property="productSn" />
     <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
     <result column="publish_status" jdbcType="INTEGER" property="publishStatus" />
@@ -22,7 +27,6 @@
     <result column="gift_growth" jdbcType="INTEGER" property="giftGrowth" />
     <result column="gift_point" jdbcType="INTEGER" property="giftPoint" />
     <result column="use_point_limit" jdbcType="INTEGER" property="usePointLimit" />
-    <result column="sub_title" jdbcType="VARCHAR" property="subTitle" />
     <result column="original_price" jdbcType="DECIMAL" property="originalPrice" />
     <result column="stock" jdbcType="INTEGER" property="stock" />
     <result column="low_stock" jdbcType="INTEGER" property="lowStock" />
@@ -32,35 +36,33 @@
     <result column="service_ids" jdbcType="VARCHAR" property="serviceIds" />
     <result column="keywords" jdbcType="VARCHAR" property="keywords" />
     <result column="note" jdbcType="VARCHAR" property="note" />
-    <result column="album_pics" jdbcType="VARCHAR" property="albumPics" />
     <result column="detail_title" jdbcType="VARCHAR" property="detailTitle" />
     <result column="promotion_start_time" jdbcType="TIMESTAMP" property="promotionStartTime" />
     <result column="promotion_end_time" jdbcType="TIMESTAMP" property="promotionEndTime" />
     <result column="promotion_per_limit" jdbcType="INTEGER" property="promotionPerLimit" />
     <result column="promotion_type" jdbcType="INTEGER" property="promotionType" />
-    <result column="brand_name" jdbcType="VARCHAR" property="brandName" />
-    <result column="product_category_name" jdbcType="VARCHAR" property="productCategoryName" />
-    <result column="ums_company_info_id" jdbcType="BIGINT" property="umsCompanyInfoId" />
-    <result column="ums_company_info" jdbcType="VARCHAR" property="umsCompanyInfo" />
+    <result column="comp_id" jdbcType="BIGINT" property="compId" />
+    <result column="comp_name" jdbcType="VARCHAR" property="compName" />
     <result column="trade_price" jdbcType="DECIMAL" property="tradePrice" />
-    <result column="spec" jdbcType="VARCHAR" property="spec" />
     <result column="date_of_manufacture" jdbcType="VARCHAR" property="dateOfManufacture" />
     <result column="place_of_production_id" jdbcType="BIGINT" property="placeOfProductionId" />
     <result column="place_of_production" jdbcType="VARCHAR" property="placeOfProduction" />
-    <result column="instructions" jdbcType="VARCHAR" property="instructions" />
     <result column="quality_guarantee_period" jdbcType="VARCHAR" property="qualityGuaranteePeriod" />
     <result column="points_for_attention" jdbcType="VARCHAR" property="pointsForAttention" />
-    <result column="create_user" jdbcType="BIGINT" property="createUser" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_user" jdbcType="BIGINT" property="updateUser" />
+    <result column="update_id" jdbcType="BIGINT" property="updateId" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="create_type" jdbcType="INTEGER" property="createType" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.portal.model.PmsProduct">
+    <result column="sub_title" jdbcType="LONGVARCHAR" property="subTitle" />
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
+    <result column="album_pics" jdbcType="LONGVARCHAR" property="albumPics" />
     <result column="detail_desc" jdbcType="LONGVARCHAR" property="detailDesc" />
     <result column="detail_html" jdbcType="LONGVARCHAR" property="detailHtml" />
     <result column="detail_mobile_html" jdbcType="LONGVARCHAR" property="detailMobileHtml" />
+    <result column="instructions" jdbcType="LONGVARCHAR" property="instructions" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -121,18 +123,19 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, 
-    name, pic, product_sn, delete_status, publish_status, new_status, recommand_status, 
-    verify_status, sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, 
-    sub_title, original_price, stock, low_stock, unit, weight, preview_status, service_ids, 
-    keywords, note, album_pics, detail_title, promotion_start_time, promotion_end_time, 
-    promotion_per_limit, promotion_type, brand_name, product_category_name, ums_company_info_id, 
-    ums_company_info, trade_price, spec, date_of_manufacture, place_of_production_id, 
-    place_of_production, instructions, quality_guarantee_period, points_for_attention, 
-    create_user, create_time, update_user, update_time, create_type
+    id, brand_id, brand_name, product_big_category_id, product_big_category_name, product_category_id, 
+    product_category_name, feight_template_id, product_attribute_category_id, name, pic, 
+    spec, product_sn, delete_status, publish_status, new_status, recommand_status, verify_status, 
+    sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, original_price, 
+    stock, low_stock, unit, weight, preview_status, service_ids, keywords, note, detail_title, 
+    promotion_start_time, promotion_end_time, promotion_per_limit, promotion_type, comp_id, 
+    comp_name, trade_price, date_of_manufacture, place_of_production_id, place_of_production, 
+    quality_guarantee_period, points_for_attention, create_id, create_time, update_id, 
+    update_time, create_type
   </sql>
   <sql id="Blob_Column_List">
-    description, detail_desc, detail_html, detail_mobile_html
+    sub_title, description, album_pics, detail_desc, detail_html, detail_mobile_html, 
+    instructions
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.portal.model.PmsProductExample" resultMap="ResultMapWithBLOBs">
     select
@@ -186,45 +189,47 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into pms_product (brand_id, product_category_id, feight_template_id, 
-      product_attribute_category_id, name, pic, 
-      product_sn, delete_status, publish_status, 
-      new_status, recommand_status, verify_status, 
-      sort, sale, price, 
-      promotion_price, gift_growth, gift_point, 
-      use_point_limit, sub_title, original_price, 
-      stock, low_stock, unit, 
-      weight, preview_status, service_ids, 
-      keywords, note, album_pics, 
+    insert into pms_product (brand_id, brand_name, product_big_category_id, 
+      product_big_category_name, product_category_id, 
+      product_category_name, feight_template_id, product_attribute_category_id, 
+      name, pic, spec, product_sn, 
+      delete_status, publish_status, new_status, 
+      recommand_status, verify_status, sort, 
+      sale, price, promotion_price, 
+      gift_growth, gift_point, use_point_limit, 
+      original_price, stock, low_stock, 
+      unit, weight, preview_status, 
+      service_ids, keywords, note, 
       detail_title, promotion_start_time, promotion_end_time, 
-      promotion_per_limit, promotion_type, brand_name, 
-      product_category_name, ums_company_info_id, ums_company_info, 
-      trade_price, spec, date_of_manufacture, 
+      promotion_per_limit, promotion_type, comp_id, 
+      comp_name, trade_price, date_of_manufacture, 
       place_of_production_id, place_of_production, 
-      instructions, quality_guarantee_period, points_for_attention, 
-      create_user, create_time, update_user, 
-      update_time, create_type, description, 
-      detail_desc, detail_html, detail_mobile_html
+      quality_guarantee_period, points_for_attention, 
+      create_id, create_time, update_id, 
+      update_time, create_type, sub_title, 
+      description, album_pics, detail_desc, 
+      detail_html, detail_mobile_html, instructions
       )
-    values (#{brandId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT}, 
-      #{productAttributeCategoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, 
-      #{productSn,jdbcType=VARCHAR}, #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, 
-      #{newStatus,jdbcType=INTEGER}, #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, 
-      #{sort,jdbcType=INTEGER}, #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, 
-      #{promotionPrice,jdbcType=DECIMAL}, #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, 
-      #{usePointLimit,jdbcType=INTEGER}, #{subTitle,jdbcType=VARCHAR}, #{originalPrice,jdbcType=DECIMAL}, 
-      #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, #{unit,jdbcType=VARCHAR}, 
-      #{weight,jdbcType=DECIMAL}, #{previewStatus,jdbcType=INTEGER}, #{serviceIds,jdbcType=VARCHAR}, 
-      #{keywords,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{albumPics,jdbcType=VARCHAR}, 
+    values (#{brandId,jdbcType=BIGINT}, #{brandName,jdbcType=VARCHAR}, #{productBigCategoryId,jdbcType=BIGINT}, 
+      #{productBigCategoryName,jdbcType=VARCHAR}, #{productCategoryId,jdbcType=BIGINT}, 
+      #{productCategoryName,jdbcType=VARCHAR}, #{feightTemplateId,jdbcType=BIGINT}, #{productAttributeCategoryId,jdbcType=BIGINT}, 
+      #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, #{spec,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, 
+      #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, #{newStatus,jdbcType=INTEGER}, 
+      #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
+      #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{promotionPrice,jdbcType=DECIMAL}, 
+      #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, #{usePointLimit,jdbcType=INTEGER}, 
+      #{originalPrice,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, 
+      #{unit,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{previewStatus,jdbcType=INTEGER}, 
+      #{serviceIds,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
       #{detailTitle,jdbcType=VARCHAR}, #{promotionStartTime,jdbcType=TIMESTAMP}, #{promotionEndTime,jdbcType=TIMESTAMP}, 
-      #{promotionPerLimit,jdbcType=INTEGER}, #{promotionType,jdbcType=INTEGER}, #{brandName,jdbcType=VARCHAR}, 
-      #{productCategoryName,jdbcType=VARCHAR}, #{umsCompanyInfoId,jdbcType=BIGINT}, #{umsCompanyInfo,jdbcType=VARCHAR}, 
-      #{tradePrice,jdbcType=DECIMAL}, #{spec,jdbcType=VARCHAR}, #{dateOfManufacture,jdbcType=VARCHAR}, 
+      #{promotionPerLimit,jdbcType=INTEGER}, #{promotionType,jdbcType=INTEGER}, #{compId,jdbcType=BIGINT}, 
+      #{compName,jdbcType=VARCHAR}, #{tradePrice,jdbcType=DECIMAL}, #{dateOfManufacture,jdbcType=VARCHAR}, 
       #{placeOfProductionId,jdbcType=BIGINT}, #{placeOfProduction,jdbcType=VARCHAR}, 
-      #{instructions,jdbcType=VARCHAR}, #{qualityGuaranteePeriod,jdbcType=VARCHAR}, #{pointsForAttention,jdbcType=VARCHAR}, 
-      #{createUser,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{createType,jdbcType=INTEGER}, #{description,jdbcType=LONGVARCHAR}, 
-      #{detailDesc,jdbcType=LONGVARCHAR}, #{detailHtml,jdbcType=LONGVARCHAR}, #{detailMobileHtml,jdbcType=LONGVARCHAR}
+      #{qualityGuaranteePeriod,jdbcType=VARCHAR}, #{pointsForAttention,jdbcType=VARCHAR}, 
+      #{createId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{createType,jdbcType=INTEGER}, #{subTitle,jdbcType=LONGVARCHAR}, 
+      #{description,jdbcType=LONGVARCHAR}, #{albumPics,jdbcType=LONGVARCHAR}, #{detailDesc,jdbcType=LONGVARCHAR}, 
+      #{detailHtml,jdbcType=LONGVARCHAR}, #{detailMobileHtml,jdbcType=LONGVARCHAR}, #{instructions,jdbcType=LONGVARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.PmsProduct">
@@ -236,9 +241,21 @@
       <if test="brandId != null">
         brand_id,
       </if>
+      <if test="brandName != null">
+        brand_name,
+      </if>
+      <if test="productBigCategoryId != null">
+        product_big_category_id,
+      </if>
+      <if test="productBigCategoryName != null">
+        product_big_category_name,
+      </if>
       <if test="productCategoryId != null">
         product_category_id,
       </if>
+      <if test="productCategoryName != null">
+        product_category_name,
+      </if>
       <if test="feightTemplateId != null">
         feight_template_id,
       </if>
@@ -251,6 +268,9 @@
       <if test="pic != null">
         pic,
       </if>
+      <if test="spec != null">
+        spec,
+      </if>
       <if test="productSn != null">
         product_sn,
       </if>
@@ -290,9 +310,6 @@
       <if test="usePointLimit != null">
         use_point_limit,
       </if>
-      <if test="subTitle != null">
-        sub_title,
-      </if>
       <if test="originalPrice != null">
         original_price,
       </if>
@@ -320,9 +337,6 @@
       <if test="note != null">
         note,
       </if>
-      <if test="albumPics != null">
-        album_pics,
-      </if>
       <if test="detailTitle != null">
         detail_title,
       </if>
@@ -338,24 +352,15 @@
       <if test="promotionType != null">
         promotion_type,
       </if>
-      <if test="brandName != null">
-        brand_name,
-      </if>
-      <if test="productCategoryName != null">
-        product_category_name,
-      </if>
-      <if test="umsCompanyInfoId != null">
-        ums_company_info_id,
+      <if test="compId != null">
+        comp_id,
       </if>
-      <if test="umsCompanyInfo != null">
-        ums_company_info,
+      <if test="compName != null">
+        comp_name,
       </if>
       <if test="tradePrice != null">
         trade_price,
       </if>
-      <if test="spec != null">
-        spec,
-      </if>
       <if test="dateOfManufacture != null">
         date_of_manufacture,
       </if>
@@ -365,23 +370,20 @@
       <if test="placeOfProduction != null">
         place_of_production,
       </if>
-      <if test="instructions != null">
-        instructions,
-      </if>
       <if test="qualityGuaranteePeriod != null">
         quality_guarantee_period,
       </if>
       <if test="pointsForAttention != null">
         points_for_attention,
       </if>
-      <if test="createUser != null">
-        create_user,
+      <if test="createId != null">
+        create_id,
       </if>
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="updateUser != null">
-        update_user,
+      <if test="updateId != null">
+        update_id,
       </if>
       <if test="updateTime != null">
         update_time,
@@ -389,9 +391,15 @@
       <if test="createType != null">
         create_type,
       </if>
+      <if test="subTitle != null">
+        sub_title,
+      </if>
       <if test="description != null">
         description,
       </if>
+      <if test="albumPics != null">
+        album_pics,
+      </if>
       <if test="detailDesc != null">
         detail_desc,
       </if>
@@ -401,14 +409,29 @@
       <if test="detailMobileHtml != null">
         detail_mobile_html,
       </if>
+      <if test="instructions != null">
+        instructions,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="brandId != null">
         #{brandId,jdbcType=BIGINT},
       </if>
+      <if test="brandName != null">
+        #{brandName,jdbcType=VARCHAR},
+      </if>
+      <if test="productBigCategoryId != null">
+        #{productBigCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBigCategoryName != null">
+        #{productBigCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="productCategoryId != null">
         #{productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="productCategoryName != null">
+        #{productCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="feightTemplateId != null">
         #{feightTemplateId,jdbcType=BIGINT},
       </if>
@@ -421,6 +444,9 @@
       <if test="pic != null">
         #{pic,jdbcType=VARCHAR},
       </if>
+      <if test="spec != null">
+        #{spec,jdbcType=VARCHAR},
+      </if>
       <if test="productSn != null">
         #{productSn,jdbcType=VARCHAR},
       </if>
@@ -460,9 +486,6 @@
       <if test="usePointLimit != null">
         #{usePointLimit,jdbcType=INTEGER},
       </if>
-      <if test="subTitle != null">
-        #{subTitle,jdbcType=VARCHAR},
-      </if>
       <if test="originalPrice != null">
         #{originalPrice,jdbcType=DECIMAL},
       </if>
@@ -490,9 +513,6 @@
       <if test="note != null">
         #{note,jdbcType=VARCHAR},
       </if>
-      <if test="albumPics != null">
-        #{albumPics,jdbcType=VARCHAR},
-      </if>
       <if test="detailTitle != null">
         #{detailTitle,jdbcType=VARCHAR},
       </if>
@@ -508,24 +528,15 @@
       <if test="promotionType != null">
         #{promotionType,jdbcType=INTEGER},
       </if>
-      <if test="brandName != null">
-        #{brandName,jdbcType=VARCHAR},
+      <if test="compId != null">
+        #{compId,jdbcType=BIGINT},
       </if>
-      <if test="productCategoryName != null">
-        #{productCategoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="umsCompanyInfoId != null">
-        #{umsCompanyInfoId,jdbcType=BIGINT},
-      </if>
-      <if test="umsCompanyInfo != null">
-        #{umsCompanyInfo,jdbcType=VARCHAR},
+      <if test="compName != null">
+        #{compName,jdbcType=VARCHAR},
       </if>
       <if test="tradePrice != null">
         #{tradePrice,jdbcType=DECIMAL},
       </if>
-      <if test="spec != null">
-        #{spec,jdbcType=VARCHAR},
-      </if>
       <if test="dateOfManufacture != null">
         #{dateOfManufacture,jdbcType=VARCHAR},
       </if>
@@ -535,23 +546,20 @@
       <if test="placeOfProduction != null">
         #{placeOfProduction,jdbcType=VARCHAR},
       </if>
-      <if test="instructions != null">
-        #{instructions,jdbcType=VARCHAR},
-      </if>
       <if test="qualityGuaranteePeriod != null">
         #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       </if>
       <if test="pointsForAttention != null">
         #{pointsForAttention,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null">
-        #{createUser,jdbcType=BIGINT},
+      <if test="createId != null">
+        #{createId,jdbcType=BIGINT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updateUser != null">
-        #{updateUser,jdbcType=BIGINT},
+      <if test="updateId != null">
+        #{updateId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
@@ -559,9 +567,15 @@
       <if test="createType != null">
         #{createType,jdbcType=INTEGER},
       </if>
+      <if test="subTitle != null">
+        #{subTitle,jdbcType=LONGVARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
+      <if test="albumPics != null">
+        #{albumPics,jdbcType=LONGVARCHAR},
+      </if>
       <if test="detailDesc != null">
         #{detailDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -571,6 +585,9 @@
       <if test="detailMobileHtml != null">
         #{detailMobileHtml,jdbcType=LONGVARCHAR},
       </if>
+      <if test="instructions != null">
+        #{instructions,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hwrj.cloud.portal.model.PmsProductExample" resultType="java.lang.Long">
@@ -588,9 +605,21 @@
       <if test="record.brandId != null">
         brand_id = #{record.brandId,jdbcType=BIGINT},
       </if>
+      <if test="record.brandName != null">
+        brand_name = #{record.brandName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productBigCategoryId != null">
+        product_big_category_id = #{record.productBigCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productBigCategoryName != null">
+        product_big_category_name = #{record.productBigCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="record.productCategoryId != null">
         product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="record.productCategoryName != null">
+        product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="record.feightTemplateId != null">
         feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       </if>
@@ -603,6 +632,9 @@
       <if test="record.pic != null">
         pic = #{record.pic,jdbcType=VARCHAR},
       </if>
+      <if test="record.spec != null">
+        spec = #{record.spec,jdbcType=VARCHAR},
+      </if>
       <if test="record.productSn != null">
         product_sn = #{record.productSn,jdbcType=VARCHAR},
       </if>
@@ -642,9 +674,6 @@
       <if test="record.usePointLimit != null">
         use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
       </if>
-      <if test="record.subTitle != null">
-        sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      </if>
       <if test="record.originalPrice != null">
         original_price = #{record.originalPrice,jdbcType=DECIMAL},
       </if>
@@ -672,9 +701,6 @@
       <if test="record.note != null">
         note = #{record.note,jdbcType=VARCHAR},
       </if>
-      <if test="record.albumPics != null">
-        album_pics = #{record.albumPics,jdbcType=VARCHAR},
-      </if>
       <if test="record.detailTitle != null">
         detail_title = #{record.detailTitle,jdbcType=VARCHAR},
       </if>
@@ -690,24 +716,15 @@
       <if test="record.promotionType != null">
         promotion_type = #{record.promotionType,jdbcType=INTEGER},
       </if>
-      <if test="record.brandName != null">
-        brand_name = #{record.brandName,jdbcType=VARCHAR},
+      <if test="record.compId != null">
+        comp_id = #{record.compId,jdbcType=BIGINT},
       </if>
-      <if test="record.productCategoryName != null">
-        product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.umsCompanyInfoId != null">
-        ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
-      </if>
-      <if test="record.umsCompanyInfo != null">
-        ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      <if test="record.compName != null">
+        comp_name = #{record.compName,jdbcType=VARCHAR},
       </if>
       <if test="record.tradePrice != null">
         trade_price = #{record.tradePrice,jdbcType=DECIMAL},
       </if>
-      <if test="record.spec != null">
-        spec = #{record.spec,jdbcType=VARCHAR},
-      </if>
       <if test="record.dateOfManufacture != null">
         date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
       </if>
@@ -717,23 +734,20 @@
       <if test="record.placeOfProduction != null">
         place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
       </if>
-      <if test="record.instructions != null">
-        instructions = #{record.instructions,jdbcType=VARCHAR},
-      </if>
       <if test="record.qualityGuaranteePeriod != null">
         quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
       </if>
       <if test="record.pointsForAttention != null">
         points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
       </if>
-      <if test="record.createUser != null">
-        create_user = #{record.createUser,jdbcType=BIGINT},
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=BIGINT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.updateUser != null">
-        update_user = #{record.updateUser,jdbcType=BIGINT},
+      <if test="record.updateId != null">
+        update_id = #{record.updateId,jdbcType=BIGINT},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -741,9 +755,15 @@
       <if test="record.createType != null">
         create_type = #{record.createType,jdbcType=INTEGER},
       </if>
+      <if test="record.subTitle != null">
+        sub_title = #{record.subTitle,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.albumPics != null">
+        album_pics = #{record.albumPics,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.detailDesc != null">
         detail_desc = #{record.detailDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -753,6 +773,9 @@
       <if test="record.detailMobileHtml != null">
         detail_mobile_html = #{record.detailMobileHtml,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.instructions != null">
+        instructions = #{record.instructions,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -762,11 +785,16 @@
     update pms_product
     set id = #{record.id,jdbcType=BIGINT},
       brand_id = #{record.brandId,jdbcType=BIGINT},
+      brand_name = #{record.brandName,jdbcType=VARCHAR},
+      product_big_category_id = #{record.productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{record.productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{record.productAttributeCategoryId,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
       pic = #{record.pic,jdbcType=VARCHAR},
+      spec = #{record.spec,jdbcType=VARCHAR},
       product_sn = #{record.productSn,jdbcType=VARCHAR},
       delete_status = #{record.deleteStatus,jdbcType=INTEGER},
       publish_status = #{record.publishStatus,jdbcType=INTEGER},
@@ -780,7 +808,6 @@
       gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
       gift_point = #{record.giftPoint,jdbcType=INTEGER},
       use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
       original_price = #{record.originalPrice,jdbcType=DECIMAL},
       stock = #{record.stock,jdbcType=INTEGER},
       low_stock = #{record.lowStock,jdbcType=INTEGER},
@@ -790,33 +817,31 @@
       service_ids = #{record.serviceIds,jdbcType=VARCHAR},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       note = #{record.note,jdbcType=VARCHAR},
-      album_pics = #{record.albumPics,jdbcType=VARCHAR},
       detail_title = #{record.detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{record.promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{record.promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{record.promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{record.promotionType,jdbcType=INTEGER},
-      brand_name = #{record.brandName,jdbcType=VARCHAR},
-      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{record.compId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
       trade_price = #{record.tradePrice,jdbcType=DECIMAL},
-      spec = #{record.spec,jdbcType=VARCHAR},
       date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{record.placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{record.instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{record.createUser,jdbcType=BIGINT},
+      create_id = #{record.createId,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_user = #{record.updateUser,jdbcType=BIGINT},
+      update_id = #{record.updateId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       create_type = #{record.createType,jdbcType=INTEGER},
+      sub_title = #{record.subTitle,jdbcType=LONGVARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR},
+      album_pics = #{record.albumPics,jdbcType=LONGVARCHAR},
       detail_desc = #{record.detailDesc,jdbcType=LONGVARCHAR},
       detail_html = #{record.detailHtml,jdbcType=LONGVARCHAR},
-      detail_mobile_html = #{record.detailMobileHtml,jdbcType=LONGVARCHAR}
+      detail_mobile_html = #{record.detailMobileHtml,jdbcType=LONGVARCHAR},
+      instructions = #{record.instructions,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -825,11 +850,16 @@
     update pms_product
     set id = #{record.id,jdbcType=BIGINT},
       brand_id = #{record.brandId,jdbcType=BIGINT},
+      brand_name = #{record.brandName,jdbcType=VARCHAR},
+      product_big_category_id = #{record.productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{record.productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{record.productAttributeCategoryId,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
       pic = #{record.pic,jdbcType=VARCHAR},
+      spec = #{record.spec,jdbcType=VARCHAR},
       product_sn = #{record.productSn,jdbcType=VARCHAR},
       delete_status = #{record.deleteStatus,jdbcType=INTEGER},
       publish_status = #{record.publishStatus,jdbcType=INTEGER},
@@ -843,7 +873,6 @@
       gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
       gift_point = #{record.giftPoint,jdbcType=INTEGER},
       use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
       original_price = #{record.originalPrice,jdbcType=DECIMAL},
       stock = #{record.stock,jdbcType=INTEGER},
       low_stock = #{record.lowStock,jdbcType=INTEGER},
@@ -853,27 +882,22 @@
       service_ids = #{record.serviceIds,jdbcType=VARCHAR},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       note = #{record.note,jdbcType=VARCHAR},
-      album_pics = #{record.albumPics,jdbcType=VARCHAR},
       detail_title = #{record.detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{record.promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{record.promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{record.promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{record.promotionType,jdbcType=INTEGER},
-      brand_name = #{record.brandName,jdbcType=VARCHAR},
-      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{record.compId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
       trade_price = #{record.tradePrice,jdbcType=DECIMAL},
-      spec = #{record.spec,jdbcType=VARCHAR},
       date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{record.placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{record.instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{record.createUser,jdbcType=BIGINT},
+      create_id = #{record.createId,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_user = #{record.updateUser,jdbcType=BIGINT},
+      update_id = #{record.updateId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       create_type = #{record.createType,jdbcType=INTEGER}
     <if test="_parameter != null">
@@ -886,9 +910,21 @@
       <if test="brandId != null">
         brand_id = #{brandId,jdbcType=BIGINT},
       </if>
+      <if test="brandName != null">
+        brand_name = #{brandName,jdbcType=VARCHAR},
+      </if>
+      <if test="productBigCategoryId != null">
+        product_big_category_id = #{productBigCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBigCategoryName != null">
+        product_big_category_name = #{productBigCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="productCategoryId != null">
         product_category_id = #{productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="productCategoryName != null">
+        product_category_name = #{productCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="feightTemplateId != null">
         feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       </if>
@@ -901,6 +937,9 @@
       <if test="pic != null">
         pic = #{pic,jdbcType=VARCHAR},
       </if>
+      <if test="spec != null">
+        spec = #{spec,jdbcType=VARCHAR},
+      </if>
       <if test="productSn != null">
         product_sn = #{productSn,jdbcType=VARCHAR},
       </if>
@@ -940,9 +979,6 @@
       <if test="usePointLimit != null">
         use_point_limit = #{usePointLimit,jdbcType=INTEGER},
       </if>
-      <if test="subTitle != null">
-        sub_title = #{subTitle,jdbcType=VARCHAR},
-      </if>
       <if test="originalPrice != null">
         original_price = #{originalPrice,jdbcType=DECIMAL},
       </if>
@@ -970,9 +1006,6 @@
       <if test="note != null">
         note = #{note,jdbcType=VARCHAR},
       </if>
-      <if test="albumPics != null">
-        album_pics = #{albumPics,jdbcType=VARCHAR},
-      </if>
       <if test="detailTitle != null">
         detail_title = #{detailTitle,jdbcType=VARCHAR},
       </if>
@@ -988,24 +1021,15 @@
       <if test="promotionType != null">
         promotion_type = #{promotionType,jdbcType=INTEGER},
       </if>
-      <if test="brandName != null">
-        brand_name = #{brandName,jdbcType=VARCHAR},
-      </if>
-      <if test="productCategoryName != null">
-        product_category_name = #{productCategoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="umsCompanyInfoId != null">
-        ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
+      <if test="compId != null">
+        comp_id = #{compId,jdbcType=BIGINT},
       </if>
-      <if test="umsCompanyInfo != null">
-        ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      <if test="compName != null">
+        comp_name = #{compName,jdbcType=VARCHAR},
       </if>
       <if test="tradePrice != null">
         trade_price = #{tradePrice,jdbcType=DECIMAL},
       </if>
-      <if test="spec != null">
-        spec = #{spec,jdbcType=VARCHAR},
-      </if>
       <if test="dateOfManufacture != null">
         date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
       </if>
@@ -1015,23 +1039,20 @@
       <if test="placeOfProduction != null">
         place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
       </if>
-      <if test="instructions != null">
-        instructions = #{instructions,jdbcType=VARCHAR},
-      </if>
       <if test="qualityGuaranteePeriod != null">
         quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       </if>
       <if test="pointsForAttention != null">
         points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null">
-        create_user = #{createUser,jdbcType=BIGINT},
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=BIGINT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updateUser != null">
-        update_user = #{updateUser,jdbcType=BIGINT},
+      <if test="updateId != null">
+        update_id = #{updateId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
@@ -1039,9 +1060,15 @@
       <if test="createType != null">
         create_type = #{createType,jdbcType=INTEGER},
       </if>
+      <if test="subTitle != null">
+        sub_title = #{subTitle,jdbcType=LONGVARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
+      <if test="albumPics != null">
+        album_pics = #{albumPics,jdbcType=LONGVARCHAR},
+      </if>
       <if test="detailDesc != null">
         detail_desc = #{detailDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -1051,17 +1078,25 @@
       <if test="detailMobileHtml != null">
         detail_mobile_html = #{detailMobileHtml,jdbcType=LONGVARCHAR},
       </if>
+      <if test="instructions != null">
+        instructions = #{instructions,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.portal.model.PmsProduct">
     update pms_product
     set brand_id = #{brandId,jdbcType=BIGINT},
+      brand_name = #{brandName,jdbcType=VARCHAR},
+      product_big_category_id = #{productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{productAttributeCategoryId,jdbcType=BIGINT},
       name = #{name,jdbcType=VARCHAR},
       pic = #{pic,jdbcType=VARCHAR},
+      spec = #{spec,jdbcType=VARCHAR},
       product_sn = #{productSn,jdbcType=VARCHAR},
       delete_status = #{deleteStatus,jdbcType=INTEGER},
       publish_status = #{publishStatus,jdbcType=INTEGER},
@@ -1075,7 +1110,6 @@
       gift_growth = #{giftGrowth,jdbcType=INTEGER},
       gift_point = #{giftPoint,jdbcType=INTEGER},
       use_point_limit = #{usePointLimit,jdbcType=INTEGER},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
       original_price = #{originalPrice,jdbcType=DECIMAL},
       stock = #{stock,jdbcType=INTEGER},
       low_stock = #{lowStock,jdbcType=INTEGER},
@@ -1085,43 +1119,46 @@
       service_ids = #{serviceIds,jdbcType=VARCHAR},
       keywords = #{keywords,jdbcType=VARCHAR},
       note = #{note,jdbcType=VARCHAR},
-      album_pics = #{albumPics,jdbcType=VARCHAR},
       detail_title = #{detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{promotionType,jdbcType=INTEGER},
-      brand_name = #{brandName,jdbcType=VARCHAR},
-      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{compId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
       trade_price = #{tradePrice,jdbcType=DECIMAL},
-      spec = #{spec,jdbcType=VARCHAR},
       date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{createUser,jdbcType=BIGINT},
+      create_id = #{createId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_user = #{updateUser,jdbcType=BIGINT},
+      update_id = #{updateId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       create_type = #{createType,jdbcType=INTEGER},
+      sub_title = #{subTitle,jdbcType=LONGVARCHAR},
       description = #{description,jdbcType=LONGVARCHAR},
+      album_pics = #{albumPics,jdbcType=LONGVARCHAR},
       detail_desc = #{detailDesc,jdbcType=LONGVARCHAR},
       detail_html = #{detailHtml,jdbcType=LONGVARCHAR},
-      detail_mobile_html = #{detailMobileHtml,jdbcType=LONGVARCHAR}
+      detail_mobile_html = #{detailMobileHtml,jdbcType=LONGVARCHAR},
+      instructions = #{instructions,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.portal.model.PmsProduct">
     update pms_product
     set brand_id = #{brandId,jdbcType=BIGINT},
+      brand_name = #{brandName,jdbcType=VARCHAR},
+      product_big_category_id = #{productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{productAttributeCategoryId,jdbcType=BIGINT},
       name = #{name,jdbcType=VARCHAR},
       pic = #{pic,jdbcType=VARCHAR},
+      spec = #{spec,jdbcType=VARCHAR},
       product_sn = #{productSn,jdbcType=VARCHAR},
       delete_status = #{deleteStatus,jdbcType=INTEGER},
       publish_status = #{publishStatus,jdbcType=INTEGER},
@@ -1135,7 +1172,6 @@
       gift_growth = #{giftGrowth,jdbcType=INTEGER},
       gift_point = #{giftPoint,jdbcType=INTEGER},
       use_point_limit = #{usePointLimit,jdbcType=INTEGER},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
       original_price = #{originalPrice,jdbcType=DECIMAL},
       stock = #{stock,jdbcType=INTEGER},
       low_stock = #{lowStock,jdbcType=INTEGER},
@@ -1145,27 +1181,22 @@
       service_ids = #{serviceIds,jdbcType=VARCHAR},
       keywords = #{keywords,jdbcType=VARCHAR},
       note = #{note,jdbcType=VARCHAR},
-      album_pics = #{albumPics,jdbcType=VARCHAR},
       detail_title = #{detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{promotionType,jdbcType=INTEGER},
-      brand_name = #{brandName,jdbcType=VARCHAR},
-      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{compId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
       trade_price = #{tradePrice,jdbcType=DECIMAL},
-      spec = #{spec,jdbcType=VARCHAR},
       date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{createUser,jdbcType=BIGINT},
+      create_id = #{createId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_user = #{updateUser,jdbcType=BIGINT},
+      update_id = #{updateId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       create_type = #{createType,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}

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

@@ -3,7 +3,7 @@
 <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_id" jdbcType="BIGINT" property="compId" />
     <result column="comp_name" jdbcType="VARCHAR" property="compName" />
     <result column="origin_name" jdbcType="VARCHAR" property="originName" />
     <result column="origin_area" jdbcType="DOUBLE" property="originArea" />
@@ -91,9 +91,9 @@
     </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
+    id, comp_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
@@ -150,7 +150,7 @@
     <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, 
+    insert into ums_member_origin (comp_id, comp_name, origin_name, 
       origin_area, people_num, found_date, 
       link_user, link_phone, province_name, 
       city_name, county_name, detail_address, 
@@ -159,7 +159,7 @@
       update_id, update_time, img_url, 
       video_url, vr_url, camera_url, 
       summary, remark)
-    values (#{fkCompanyInfoId,jdbcType=BIGINT}, #{compName,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR}, 
+    values (#{compId,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}, 
@@ -175,8 +175,8 @@
     </selectKey>
     insert into ums_member_origin
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="fkCompanyInfoId != null">
-        fk_company_info_id,
+      <if test="compId != null">
+        comp_id,
       </if>
       <if test="compName != null">
         comp_name,
@@ -255,8 +255,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="fkCompanyInfoId != null">
-        #{fkCompanyInfoId,jdbcType=BIGINT},
+      <if test="compId != null">
+        #{compId,jdbcType=BIGINT},
       </if>
       <if test="compName != null">
         #{compName,jdbcType=VARCHAR},
@@ -347,8 +347,8 @@
       <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 test="record.compId != null">
+        comp_id = #{record.compId,jdbcType=BIGINT},
       </if>
       <if test="record.compName != null">
         comp_name = #{record.compName,jdbcType=VARCHAR},
@@ -433,7 +433,7 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update ums_member_origin
     set id = #{record.id,jdbcType=BIGINT},
-      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_id = #{record.compId,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
       origin_name = #{record.originName,jdbcType=VARCHAR},
       origin_area = #{record.originArea,jdbcType=DOUBLE},
@@ -466,7 +466,7 @@
   <update id="updateByExample" parameterType="map">
     update ums_member_origin
     set id = #{record.id,jdbcType=BIGINT},
-      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_id = #{record.compId,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
       origin_name = #{record.originName,jdbcType=VARCHAR},
       origin_area = #{record.originArea,jdbcType=DOUBLE},
@@ -493,8 +493,8 @@
   <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 test="compId != null">
+        comp_id = #{compId,jdbcType=BIGINT},
       </if>
       <if test="compName != null">
         comp_name = #{compName,jdbcType=VARCHAR},
@@ -576,7 +576,7 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.portal.model.UmsMemberOrigin">
     update ums_member_origin
-    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+    set comp_id = #{compId,jdbcType=BIGINT},
       comp_name = #{compName,jdbcType=VARCHAR},
       origin_name = #{originName,jdbcType=VARCHAR},
       origin_area = #{originArea,jdbcType=DOUBLE},
@@ -606,7 +606,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.portal.model.UmsMemberOrigin">
     update ums_member_origin
-    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+    set comp_id = #{compId,jdbcType=BIGINT},
       comp_name = #{compName,jdbcType=VARCHAR},
       origin_name = #{originName,jdbcType=VARCHAR},
       origin_area = #{originArea,jdbcType=DOUBLE},

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/controller/PmsPortalProductController.java

@@ -84,7 +84,7 @@ public class PmsPortalProductController {
             UmsMemberOriginDto originDto = umsMemberOriginService.detail(placeOfProductionId);
             productDetail.setOrigin(originDto);
         }
-        Long companyInfoId = productDetail.getProduct().getUmsCompanyInfoId();
+        Long companyInfoId = productDetail.getProduct().getCompId();
         if (companyInfoId != null){
             UmsCompanyInfoDto umsCompanyInfoDto = umsCompanyInfoService.detailInfo(companyInfoId);
             productDetail.setCompanyInfo(umsCompanyInfoDto);

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/controller/WechatH5Controller.java

@@ -68,6 +68,9 @@ public class WechatH5Controller {
     @ApiOperation(value = "微信认证")
     @GetMapping("/authorize")
     public void authorize(@RequestParam("returnUrl") String returnUrl, HttpServletResponse response) throws IOException {
+        if(!StringUtils.isEmpty(returnUrl)){
+            reUrl = returnUrl;
+        }
         // 用户授权完成后的重定向链接，441aca54.ngrok.io为使用ngrok代理后的公网域名，该域名需要替换为在微信公众号后台设置的域名，否则请求微信服务器不成功，一般都是采用将本地服务代理映射到一个可以访问的公网进行开发调试
         String redirectURL = wxMpService.oauth2buildAuthorizationUrl(url, WxConsts.OAuth2Scope.SNSAPI_USERINFO, URLEncoder.encode(returnUrl,"utf-8"));
         log.info("【微信网页授权】获取code,redirectURL={}", redirectURL);
@@ -122,9 +125,9 @@ public class WechatH5Controller {
         if (StringUtils.isEmpty(returnUrl)){
             trueUrl= reUrl+"?token="+token+"&tokenHead="+tokenHead;
         }else if (!returnUrl.contains("?")){
-            trueUrl=reUrl+returnUrl+"?token="+token+"&tokenHead="+tokenHead;
+            trueUrl=returnUrl+"?token="+token+"&tokenHead="+tokenHead;
         }else {
-            trueUrl=reUrl+returnUrl+"&token="+token+"&tokenHead="+tokenHead;
+            trueUrl=returnUrl+"&token="+token+"&tokenHead="+tokenHead;
         }
 //        MyWxMpUser myWxMpUser =new MyWxMpUser();
 //        BeanUtils.copyProperties(wxMpUser,myWxMpUser);

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsPreItemServiceImpl.java

@@ -62,10 +62,10 @@ public class OmsPreItemServiceImpl implements OmsPreItemService {
             throw  new RuntimeException("抢购商品已经下架");
         }
         omsPreItem.setProductName(product.getName());
-        omsPreItem.setPushId(product.getCreateUser());
+        omsPreItem.setPushId(product.getCreateId());
 
-            omsPreItem.setCompanyId(product.getUmsCompanyInfoId());
-            omsPreItem.setCompanyName(product.getUmsCompanyInfo());
+            omsPreItem.setCompId(product.getCompId());
+            omsPreItem.setCompName(product.getCompName());
 
         if (brand != null){
             omsPreItem.setProductBrand(brand.getName());

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/PmsPortalProductServiceImpl.java

@@ -263,7 +263,7 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
         }
         PmsProductExample example = new PmsProductExample();
         PmsProductExample.Criteria criteria = example.createCriteria();
-        criteria.andUmsCompanyInfoIdEqualTo(companyId);
+        criteria.andCompIdEqualTo(companyId);
         criteria.andDeleteStatusEqualTo(0);
         List<PmsProduct> pmsProducts = productMapper.selectByExample(example);
         return pmsProducts;

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/UmsMemberOriginServiceImpl.java

@@ -43,7 +43,7 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
         }
         UmsMemberOriginExample example = new UmsMemberOriginExample();
         UmsMemberOriginExample.Criteria criteria = example.createCriteria();
-        criteria.andFkCompanyInfoIdEqualTo(companyId);
+        criteria.andCompIdEqualTo(companyId);
         List<UmsMemberOrigin> umsMemberOrigins = umsMemberOriginMapper.selectByExample(example);
         List<UmsMemberOriginDto> dtos = new ArrayList<>();
         umsMemberOrigins.stream().forEach(item->{