chore: merge master

xinkeaboard-server/b2b2c-core/src/main/resources/i18n_en.properties

@@ -414,6 +414,7 @@ parametersIds格式错误,请重试=parametersIds format error, please try again
 groupIds格式错误,请重试=groupIds format error, please try again
 属性分组不能为空=Attribute can not be null packet
 关联模板不能为空,请重试!=Associated template can not be empty, please try again!
+关联模板发布渠道不能为空,请重试!=Associated template release channel can not be empty, please try again!
 关联模板名称不能为空,请重试!=Associated with the template name can not be empty, please try again!
 关联模板位置不能为空,请重试!=Associated template location can not be empty, please try again!
 关联模板内容不能为空,请重试!=Associated with the template can not be empty, please try again!

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsPublishFrontParamDTO.java

@@ -19,7 +19,7 @@ public class GoodsPublishFrontParamDTO implements Serializable {
     private Long goodsId;
 
     @ApiModelProperty(value = "发布渠道：1-海外站；2-国内站,默认1")
-    private Integer distributionChannel = 1;
+    private String distributionChannel;
 
     @ApiModelProperty(value = "是否是虚拟商品：1-实物商品；2-虚拟商品,默认1", required = true)
     private Integer isVirtualGoods = 1;
@@ -279,6 +279,8 @@ public class GoodsPublishFrontParamDTO implements Serializable {
         private BigDecimal height;
         @ApiModelProperty(value = "商品编码")
         private String productCode;
+        @ApiModelProperty(value ="发布渠道 1-海外站；2-国内站")
+        private String distributionChannel;
         @ApiModelProperty(value = "条形码")
         private String barCode;
         @ApiModelProperty(value = "是否启用，1-启用；2-不启用")

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsPublishInsertDTO.java

@@ -27,7 +27,7 @@ public class GoodsPublishInsertDTO extends GoodsPublishFrontParamDTO {
     @ApiModelProperty(value ="主规格id")
     private Integer mainSpecId = 0;
     @ApiModelProperty(value ="发布渠道 1-海外站；2-国内站")
-    private Integer distributionChannel = 1;
+    private String distributionChannel;
 
     public GoodsPublishInsertDTO(GoodsPublishFrontParamDTO paramDTO) {
         //复制属性

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsRelatedTemplateAddDTO.java

@@ -12,6 +12,9 @@ public class GoodsRelatedTemplateAddDTO implements Serializable {
     @ApiModelProperty("模版名称")
     private String templateName;
 
+    @ApiModelProperty("模版渠道")
+    private String channel ;
+
     @ApiModelProperty("模版位置(1-顶部，2-底部）")
     private Integer templatePosition;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/dto/GoodsRelatedTemplateUpdateDTO.java

@@ -12,6 +12,9 @@ public class GoodsRelatedTemplateUpdateDTO implements Serializable {
     @ApiModelProperty("模版id")
     private Integer templateId;
 
+    @ApiModelProperty("模版渠道")
+    private String channel;
+
     @ApiModelProperty("模版名称")
     private String templateName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/example/GoodsExample.java

@@ -42,7 +42,7 @@ public class GoodsExample implements Serializable {
     /**
      * 发布渠道  1-海外站；2-国内站
      */
-    private Integer distributionChannel;
+    private String distributionChannel;
 
     /**
      * 商品名称为3到50个字符(商品副标题)

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/example/GoodsRelatedTemplateExample.java

@@ -27,6 +27,11 @@ public class GoodsRelatedTemplateExample implements Serializable {
     /**
      * 模版名称
      */
+    private String channel;
+
+    /**
+     * 模版名称
+     */
     private String templateName;
 
     /**

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/example/ProductExample.java

@@ -33,6 +33,11 @@ public class ProductExample implements Serializable {
     private Long productId;
 
     /**
+     * 发布渠道
+     */
+    private String distributionChannel;
+
+    /**
      * 商品ID
      */
     private Long goodsId;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/pojo/Goods.java

@@ -20,7 +20,7 @@ public class Goods implements Serializable {
     private Long goodsId;
 
     @ApiModelProperty("发布渠道 1-海外站；2-国内站")
-    private Integer distributionChannel;
+    private String distributionChannel;
 
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/pojo/GoodsRelatedTemplate.java

@@ -15,6 +15,9 @@ public class GoodsRelatedTemplate implements Serializable {
     @ApiModelProperty("模板id")
     private Integer templateId;
 
+    @ApiModelProperty("模版渠道")
+    private String channel;
+
     @ApiModelProperty("模版名称")
     private String templateName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/goods/pojo/Product.java

@@ -18,6 +18,9 @@ public class Product implements Serializable {
     @ApiModelProperty("货品id")
     private Long productId;
 
+    @ApiModelProperty("货品渠道")
+    private String distributionChannel;
+
     @ApiModelProperty("商品ID")
     private Long goodsId;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/example/MemberEnquiryExample.java

@@ -67,7 +67,7 @@ public class MemberEnquiryExample implements Serializable {
     /**
      * 渠道  1-海外站；2-国内站
      */
-    private Integer channel;
+    private String channel;
 
     /**
      * 店铺Id查询

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/seller/GoodsRelatedTemplateController.java

@@ -54,6 +54,7 @@ public class GoodsRelatedTemplateController extends BaseController {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         //验证参数
         AssertUtil.isTrue(goodsRelatedTemplateAddDTO == null, "关联模板不能为空,请重试!");
+        AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getChannel(), "关联模板发布渠道不能为空,请重试!");
         AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getTemplateName(), "关联模板名称不能为空,请重试!");
         AssertUtil.notNullOrZero(goodsRelatedTemplateAddDTO.getTemplatePosition(), "关联模板位置不能为空,请重试!");
         AssertUtil.notEmpty(goodsRelatedTemplateAddDTO.getTemplateContent(), "关联模板内容不能为空,请重试!");
@@ -116,11 +117,13 @@ public class GoodsRelatedTemplateController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "templateName", value = "版式名称", paramType = "query"),
             @ApiImplicitParam(name = "templatePosition", value = "版式位置", paramType = "query"),
+            @ApiImplicitParam(name = "channel", value = "发布渠道", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
     public JsonResult<PageVO<GoodsRelatedTemplateVO>> getList(HttpServletRequest request,
+                                                              @RequestParam(value = "channel", required = false, defaultValue = "1") String channel,
                                                               @RequestParam(value = "templateName", required = false) String templateName,
                                                               @RequestParam(value = "templatePosition", required = false) Integer templatePosition) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
@@ -130,6 +133,7 @@ public class GoodsRelatedTemplateController extends BaseController {
         //根据条件查询集合
         GoodsRelatedTemplateExample example = new GoodsRelatedTemplateExample();
         example.setStoreId(vendor.getStoreId());
+        example.setChannel(channel);
         example.setTemplateNameLike(templateName);
         if (templatePosition != null && (templatePosition == TEMPLATE_CONTENT_1 || templatePosition == TEMPLATE_CONTENT_2)) {
             example.setTemplatePosition(templatePosition);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/seller/GoodsSellerController.java

@@ -107,7 +107,7 @@ public class GoodsSellerController extends BaseController {
     @GetMapping("list")
     public JsonResult<PageVO<GoodsVO>> getList(HttpServletRequest request, String goodsName, Integer StoreCategoryId,
                                                Date startTime, Date endTime, Integer state, Integer auditState,
-                                               Integer isVirtualGoods, String goodsCode, String barCode,@RequestParam(value = "distributionChannel", required = false, defaultValue = "1") Integer distributionChannel) {
+                                               Integer isVirtualGoods, String goodsCode, String barCode,@RequestParam(value = "distributionChannel", required = false, defaultValue = "1") String distributionChannel) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         GoodsExample example = new GoodsExample();
@@ -531,7 +531,7 @@ public class GoodsSellerController extends BaseController {
 
     @ApiOperation("判断入驻店铺发布商品数是否超过等级限制的发布数")
     @GetMapping("enablePublish")
-    public JsonResult<Integer> enablePublish(HttpServletRequest request) {
+    public JsonResult<Integer> enablePublish(HttpServletRequest request,String distributionChannel) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
         if ("1".equals(stringRedisTemplate.opsForValue().get("zjpay_is_enable"))) {
@@ -551,7 +551,7 @@ public class GoodsSellerController extends BaseController {
                 }
             }
         }
-        if (checkIsCanPublish(vendor.getStoreId(),1)) {
+        if (checkIsCanPublish(vendor.getStoreId(),distributionChannel)) {
             return SldResponse.success();
         } else {
             return SldResponse.fail("发布商品数量不允许超过店铺等级限制的数量");
@@ -564,7 +564,7 @@ public class GoodsSellerController extends BaseController {
      * @param storeId 店铺id
      * @return 是否可发布商品
      */
-    public boolean checkIsCanPublish(Long storeId,Integer distributionChannel) {
+    public boolean checkIsCanPublish(Long storeId,String distributionChannel) {
         boolean isCanPublish = true;
         //获取店铺信息
         Store storeDb = storeModel.getStoreByStoreId(storeId);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/seller/SellerOverviewController.java

@@ -170,7 +170,7 @@ public class SellerOverviewController extends BaseController {
             @ApiImplicitParam(name = "source", value = "站点来源 1:海外站 2:国内站")
     })
     @GetMapping("source/presentData")
-    public JsonResult<SellerSourcePresentIndexVO> indexSourcePresentData(HttpServletRequest request, @RequestParam(required = false, defaultValue = "1") Integer source) {
+    public JsonResult<SellerSourcePresentIndexVO> indexSourcePresentData(HttpServletRequest request, @RequestParam(required = false, defaultValue = "1") String source) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         SellerSourcePresentIndexVO result = new SellerSourcePresentIndexVO();
         //违规商品数

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/goods/GoodsRelatedTemplateModel.java

@@ -121,6 +121,7 @@ public class GoodsRelatedTemplateModel {
         GoodsRelatedTemplateExample example = new GoodsRelatedTemplateExample();
         example.setStoreId(storeId);
         example.setTemplateName(goodsRelatedTemplateUpdateDTO.getTemplateName());
+        example.setChannel(goodsRelatedTemplateUpdateDTO.getChannel());
         example.setTemplateIdNotEquals(goodsRelatedTemplateUpdateDTO.getTemplateId());
         List<GoodsRelatedTemplate> list = goodsRelatedTemplateReadMapper.listByExample(example);
         if (!CollectionUtils.isEmpty(list)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/goods/GoodsSellerModel.java

@@ -28,6 +28,7 @@ import com.slodon.b2b2c.model.seller.StoreModel;
 import com.slodon.b2b2c.seller.example.StoreLabelBindGoodsExample;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.system.pojo.SysSeo;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -125,7 +126,7 @@ public class GoodsSellerModel {
     public void saveGoods(Vendor vendor, GoodsPublishInsertDTO insertDTO) {
         List<GoodsPublishFrontParamDTO.ProductInfo> productList = insertDTO.getProductList();//货品列表
         //-校验sku是否重复
-        this.checkSku(productList);
+        this.checkSku(productList,insertDTO.getDistributionChannel());
 
         //-保存商品信息
         Goods goods = this.insertGoods(vendor, insertDTO);
@@ -163,7 +164,7 @@ public class GoodsSellerModel {
      *
      * @param productList
      */
-    private void checkSku(List<GoodsPublishFrontParamDTO.ProductInfo> productList) {
+    private void checkSku(List<GoodsPublishFrontParamDTO.ProductInfo> productList,String distributionChannel) {
         Set<String> set = new HashSet<>();//用于校验自身sku是否重复
         productList.forEach(productInfo -> {
             if (!StringUtils.isEmpty(productInfo.getProductCode())) {
@@ -171,6 +172,7 @@ public class GoodsSellerModel {
                 ProductExample example = new ProductExample();
                 example.setProductCode(productInfo.getProductCode());
                 example.setProductIdNotEquals(((GoodsPublishInsertDTO.ProductInsertInfo) productInfo).getProductId());
+                example.setDistributionChannel(distributionChannel);
                 int count = productModel.countByExample(example);
                 AssertUtil.isTrue(count > 0, "商品货号[" + productInfo.getProductCode() + "]已存在，请重新输入");
             }
@@ -346,6 +348,7 @@ public class GoodsSellerModel {
             product.setProductId(GoodsIdGenerator.productIdGenerator());
         }
         product.setGoodsId(goods.getGoodsId());
+        product.setDistributionChannel(goods.getDistributionChannel());
         product.setGoodsName(goods.getGoodsName());
         product.setSpecValues(productInsertInfo.getSpecValues());
         product.setSpecValueIds(productInsertInfo.getSpecValueIds());
@@ -588,7 +591,7 @@ public class GoodsSellerModel {
         this.compareSpecWithDb(goodsDb.getGoodsId(), productList, addProductList, updateProductList, deleteProductList);
 
         //-校验sku是否重复
-        this.checkSku(productList);
+        this.checkSku(productList, goodsDb.getDistributionChannel());
 
         //-更新商品信息
         Goods updateGoods = this.updateGoods(insertDTO, vendor);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/goods/GoodsRelatedTemplateVO.java

@@ -11,6 +11,9 @@ public class GoodsRelatedTemplateVO {
     @ApiModelProperty("模板id")
     private Integer templateId;
 
+    @ApiModelProperty("模版渠道")
+    private String channel;
+
     @ApiModelProperty("模版名称")
     private String templateName;
 
@@ -22,6 +25,7 @@ public class GoodsRelatedTemplateVO {
 
     public GoodsRelatedTemplateVO(GoodsRelatedTemplate goodsRelatedTemplate) {
         this.templateId = goodsRelatedTemplate.getTemplateId();
+        this.channel = goodsRelatedTemplate.getChannel();
         this.templateName =goodsRelatedTemplate.getTemplateName();
         this.templatePosition = goodsRelatedTemplate.getTemplatePosition();
         this.templateContent = goodsRelatedTemplate.getTemplateContent();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/goods/GoodsVO.java

@@ -26,7 +26,7 @@ public class GoodsVO {
     private Long goodsId;
 
     @ApiModelProperty("发布渠道 1-海外站；2-国内站")
-    private Integer distributionChannel;
+    private String distributionChannel;
 
     @ApiModelProperty("商品名称")
     private String goodsName;

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/goods/SellerGoodsDetailVO.java

@@ -31,6 +31,8 @@ public class SellerGoodsDetailVO implements Serializable {
     private Long goodsId;
 
     //基本信息
+    @ApiModelProperty(value = "发布渠道")
+    private String distributionChannel;
     @ApiModelProperty("商品名称为3到50个字符(商品副标题)")
     private String goodsName;
     @ApiModelProperty("商品副标题，长度建议140个字符内")
@@ -174,6 +176,7 @@ public class SellerGoodsDetailVO implements Serializable {
         this.goodsId = goods.getGoodsId();
 
         //基本信息
+        this.distributionChannel = goods.getDistributionChannel();
         this.goodsName = goods.getGoodsName();
         this.goodsBrief = goods.getGoodsBrief();
         this.brandId = goods.getBrandId();

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/goods/GoodsRelatedTemplateReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.GoodsRelatedTemplateReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsRelatedTemplate">
     <id column="template_id" property="templateId" />
+    <result column="channel" property="channel" />
     <result column="template_name" property="templateName" />
     <result column="template_position" property="templatePosition" />
     <result column="store_id" property="storeId" />
@@ -23,6 +24,9 @@
         <if test="example.templateIdIn != null">
           AND `template_id` in (${example.templateIdIn})
         </if>
+        <if test="example.channel != null">
+          AND `channel` = #{example.channel}
+        </if>
         <if test="example.templateName != null">
           AND `template_name` = #{example.templateName}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/goods/ProductReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.ProductReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.Product">
     <id column="product_id" property="productId" />
+    <result column="distribution_channel" property="distributionChannel" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="spec_values" property="specValues" />
@@ -40,6 +41,9 @@
   <sql id="whereCondition">
     <if test="example != null">
       <trim prefix="WHERE" prefixOverrides="AND|OR">
+        <if test="example.distributionChannel != null">
+          AND `distributionChannel` = #{example.distributionChannel}
+        </if>
         <if test="example.productIdNotEquals != null">
           AND `product_id` != #{example.productIdNotEquals}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/member/MemberReadMapper.xml

@@ -44,6 +44,9 @@
         <result column="gp_token" property="gpToken" />
         <result column="member_company" property="memberCompany" />
         <result column="member_main_product" property="memberMainProduct" />
+        <result column="country" property="country" />
+        <result column="city" property="city" />
+        <result column="member_type" property="memberType" />
     </resultMap>
     <!--按照主键值进行操作-->
     <sql id="pkWhere">
@@ -203,6 +206,9 @@
                 <if test="example.gpToken != null">
                     AND `gp_token` = #{example.gpToken}
                 </if>
+                <if test="example.memberType != null">
+                    AND `member_type` = #{example.memberType}
+                </if>
             </trim>
         </if>
     </sql>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/goods/GoodsRelatedTemplateWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.GoodsRelatedTemplateWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.GoodsRelatedTemplate">
     <id column="template_id" property="templateId" />
+    <result column="channel" property="channel" />
     <result column="template_name" property="templateName" />
     <result column="template_position" property="templatePosition" />
     <result column="store_id" property="storeId" />
@@ -12,6 +13,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="channel != null">
+        `channel`,
+      </if>
       <if test="templateName != null">
         `template_name`,
       </if>
@@ -43,6 +47,9 @@
         <if test="example.templateIdIn != null">
           AND `template_id` in (${example.templateIdIn})
         </if>
+        <if test="example.channel != null">
+          AND `channel` = #{example.channel}
+        </if>
         <if test="example.templateName != null">
           AND `template_name` = #{example.templateName}
         </if>
@@ -189,6 +196,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="channel != null">
+        #{channel},
+      </if>
       <if test="templateName != null">
         #{templateName},
       </if>
@@ -211,6 +221,9 @@
   <update id="updateByExampleSelective">
     UPDATE `goods_related_template`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.channel != null">
+        `channel` = #{record.channel},
+      </if>
       <if test="record.templateName != null">
         `template_name` = #{record.templateName},
       </if>
@@ -233,6 +246,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `goods_related_template`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="channel != null">
+        `channel` = #{channel},
+      </if>
       <if test="templateName != null">
         `template_name` = #{templateName},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/goods/ProductWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.goods.ProductWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.Product">
     <id column="product_id" property="productId" />
+    <result column="distribution_channel" property="distributionChannel" />
     <result column="goods_id" property="goodsId" />
     <result column="goods_name" property="goodsName" />
     <result column="spec_values" property="specValues" />
@@ -35,6 +36,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="distributionChannel != null">
+        `distribution_channel`,
+      </if>
       <if test="productId != null">
         `product_id`,
       </if>
@@ -138,6 +142,9 @@
         <if test="example.productIdIn != null">
           AND `product_id` in (${example.productIdIn})
         </if>
+        <if test="example.distributionChannel != null">
+          AND `distribution_channel` = #{example.distributionChannel}
+        </if>
         <if test="example.goodsId != null">
           AND `goods_id` = #{example.goodsId}
         </if>
@@ -377,6 +384,9 @@
       <if test="productId != null">
         #{productId},
       </if>
+      <if test="distributionChannel != null">
+        #{distributionChannel},
+      </if>
       <if test="goodsId != null">
         #{goodsId},
       </if>
@@ -471,6 +481,9 @@
       <if test="record.goodsId != null">
         `goods_id` = #{record.goodsId},
       </if>
+      <if test="record.distributionChannel != null">
+        `distribution_channel` = #{record.distributionChannel},
+      </if>
       <if test="record.goodsName != null">
         `goods_name` = #{record.goodsName},
       </if>
@@ -562,6 +575,9 @@
       <if test="goodsId != null">
         `goods_id` = #{goodsId},
       </if>
+      <if test="distributionChannel != null">
+        `distribution_channel` = #{distributionChannel},
+      </if>
       <if test="goodsName != null">
         `goods_name` = #{goodsName},
       </if>

xinkeaboard-server/doc/DDL/update.sql

@@ -1,11 +1,17 @@
 ALTER TABLE member
 ADD COLUMN country VARCHAR(100) NULL COMMENT '国家',
 ADD COLUMN city VARCHAR(100) NULL COMMENT '城市',
-ADD COLUMN member_type TINYINT NOT NULL DEFAULT 1 COMMENT '会员类型 1:海外门户 2:国内分销门户';
+ADD COLUMN member_type CHAR(2) NOT NULL DEFAULT 1 COMMENT '会员类型 1:海外门户 2:国内分销门户';
 
 
 ALTER TABLE goods
-ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER goods_id;
+ADD COLUMN distribution_channel CHAR(2) NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER goods_id;
 
+ALTER TABLE product
+    ADD COLUMN distribution_channel CHAR(2) NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER product_id;
 
-ALTER TABLE enquiry ADD COLUMN channel TINYINT NOT NULL DEFAULT 1 COMMENT '询盘渠道 1:海外门户 2:国内分销门户';
+
+ALTER TABLE enquiry ADD COLUMN channel CHAR(2) NOT NULL DEFAULT 1 COMMENT '询盘渠道 1:海外门户 2:国内分销门户';
+
+
+ALTER TABLE goods_related_template ADD COLUMN channel CHAR(2) NOT NULL DEFAULT 1 COMMENT '渠道 1:海外门户 2:国内分销门户';