Merge branch 'api' into hive2.0

jyy

2021-03-08 09236e832a65ab4f99e4ca6ecb3ab6022c86ea37

Merge branch 'api' into hive2.0

 zq-erp/src/main/java/com/matrix/system/common/service/impl/InitShopProductCateService.java

@@ -2,9 +2,6 @@

import com.matrix.core.constance.MatrixConstance;
import com.matrix.system.common.bean.SysCompany;
import com.matrix.system.common.bean.SysRole;
import com.matrix.system.common.dao.SysRoleDao;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.shopXcx.bean.ShopProductAttribute;
import com.matrix.system.shopXcx.dao.ShopProductAttributeDao;
import org.springframework.beans.BeanUtils;
@@ -40,7 +37,8 @@

        ShopProductAttribute service=new ShopProductAttribute();
        BeanUtils.copyProperties(cpfl,service);
        service.setAttrName("服务");
        service.setAttrName("属性");
        service.setAttrCode("service");
        shopProductAttributeDao.batchInsert(Arrays.asList(cpfl,service));



 zq-erp/src/main/resources/config/application.properties

@@ -4,13 +4,13 @@

#线上测试环境

spring.datasource.username=ct_test
spring.datasource.password=123456
spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#spring.datasource.username=ct_test
#spring.datasource.password=123456
#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8

#spring.datasource.username=chuhuan
#spring.datasource.password=chuhuan
#spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.username=chuhuan
spring.datasource.password=chuhuan
spring.datasource.url=jdbc:mysql://121.37.162.173:3306/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8


spring.datasource.type=com.alibaba.druid.pool.DruidDataSource

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductAttributeDao.xml

@@ -39,7 +39,7 @@
        <result property="attrMark" column="attr_mark" />
        <result property="sort"    column="sort"/>
        <result property="companyId" column="company_id" />
        <collection property="child" column="{attrId=attr_id, shopId=shop_id}" select="selectByParentIds"/>
        <collection property="child" column="{attrId=attr_id, companyId=company_id}" select="selectByParentIds"/>
    </resultMap>

    <!-- 根据id查询-->
@@ -47,7 +47,7 @@
        select
        <include refid="columns" ></include>
        from shop_product_attribute
        where  parent_id=#{attrId} and shop_id=#{shopId}
        where  parent_id=#{attrId} and company_id=#{companyId}
    </select>

    <!-- 根据编码查询-->

 zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html

@@ -797,15 +797,7 @@
                    flag = true;
                    return false;
                }
                var path = tds.eq(length - 6).find("img").attr("src");
                if(path == null){
                    layer.msg("请填写规格图片",{
                        icon : 2,
                        time : 2000
                    });
                    flag = true;
                    return false;
                }

                var stock = tds.eq(length - 5).find("input").val();
                if(stock == ""){
                    layer.msg("请填写库存",{
@@ -832,15 +824,7 @@
                    flag = true;
                    return false;
                }
                var erpNo = tds.eq(length - 2).find("input").val();
                if(erpNo == ""){
                    layer.msg("请填写erp产品编号，否则订单无法和erp同步",{
                        icon : 2,
                        time : 2000
                    });
                    flag = true;
                    return false;
                }



            }