- mall-parent 改为 onemall

- 删除 target 目录

admin-web/package.json

@@ -39,6 +39,7 @@
     "antd": "^3.13.0",
     "bizcharts": "^3.4.3",
     "bizcharts-plugin-slider": "^2.1.1-beta.1",
+    "braft-editor": "^2.2.10",
     "classnames": "^2.2.6",
     "crypto": "^1.0.1",
     "dva": "^2.4.1",

common/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

ops/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

order/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

pay/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

product/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

promotion/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/BannerConvertImpl.java

@@ -1,122 +0,0 @@
-package cn.iocoder.mall.promotion.application.convert;
-
-import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.promotion.api.bo.BannerBO;
-import cn.iocoder.mall.promotion.api.bo.BannerPageBO;
-import cn.iocoder.mall.promotion.application.vo.admins.AdminsBannerPageVO;
-import cn.iocoder.mall.promotion.application.vo.admins.AdminsBannerVO;
-import cn.iocoder.mall.promotion.application.vo.users.UsersBannerVO;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2019-04-06T01:40:13+0800",
-    comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
-)
-public class BannerConvertImpl implements BannerConvert {
-
-    @Override
-    public AdminsBannerVO convert(BannerBO bannerBO) {
-        if ( bannerBO == null ) {
-            return null;
-        }
-
-        AdminsBannerVO adminsBannerVO = new AdminsBannerVO();
-
-        adminsBannerVO.setId( bannerBO.getId() );
-        adminsBannerVO.setTitle( bannerBO.getTitle() );
-        adminsBannerVO.setUrl( bannerBO.getUrl() );
-        adminsBannerVO.setPicUrl( bannerBO.getPicUrl() );
-        adminsBannerVO.setSort( bannerBO.getSort() );
-        adminsBannerVO.setStatus( bannerBO.getStatus() );
-        adminsBannerVO.setMemo( bannerBO.getMemo() );
-        adminsBannerVO.setCreateTime( bannerBO.getCreateTime() );
-
-        return adminsBannerVO;
-    }
-
-    @Override
-    public CommonResult<AdminsBannerVO> convert2(CommonResult<BannerBO> result) {
-        if ( result == null ) {
-            return null;
-        }
-
-        CommonResult<AdminsBannerVO> commonResult = new CommonResult<AdminsBannerVO>();
-
-        commonResult.setCode( result.getCode() );
-        commonResult.setMessage( result.getMessage() );
-        commonResult.setData( convert( result.getData() ) );
-
-        return commonResult;
-    }
-
-    @Override
-    public CommonResult<AdminsBannerPageVO> convert(CommonResult<BannerPageBO> result) {
-        if ( result == null ) {
-            return null;
-        }
-
-        CommonResult<AdminsBannerPageVO> commonResult = new CommonResult<AdminsBannerPageVO>();
-
-        commonResult.setCode( result.getCode() );
-        commonResult.setMessage( result.getMessage() );
-        commonResult.setData( bannerPageBOToAdminsBannerPageVO( result.getData() ) );
-
-        return commonResult;
-    }
-
-    @Override
-    public List<UsersBannerVO> convertList(List<BannerBO> banners) {
-        if ( banners == null ) {
-            return null;
-        }
-
-        List<UsersBannerVO> list = new ArrayList<UsersBannerVO>( banners.size() );
-        for ( BannerBO bannerBO : banners ) {
-            list.add( bannerBOToUsersBannerVO( bannerBO ) );
-        }
-
-        return list;
-    }
-
-    protected List<AdminsBannerVO> bannerBOListToAdminsBannerVOList(List<BannerBO> list) {
-        if ( list == null ) {
-            return null;
-        }
-
-        List<AdminsBannerVO> list1 = new ArrayList<AdminsBannerVO>( list.size() );
-        for ( BannerBO bannerBO : list ) {
-            list1.add( convert( bannerBO ) );
-        }
-
-        return list1;
-    }
-
-    protected AdminsBannerPageVO bannerPageBOToAdminsBannerPageVO(BannerPageBO bannerPageBO) {
-        if ( bannerPageBO == null ) {
-            return null;
-        }
-
-        AdminsBannerPageVO adminsBannerPageVO = new AdminsBannerPageVO();
-
-        adminsBannerPageVO.setList( bannerBOListToAdminsBannerVOList( bannerPageBO.getList() ) );
-        adminsBannerPageVO.setTotal( bannerPageBO.getTotal() );
-
-        return adminsBannerPageVO;
-    }
-
-    protected UsersBannerVO bannerBOToUsersBannerVO(BannerBO bannerBO) {
-        if ( bannerBO == null ) {
-            return null;
-        }
-
-        UsersBannerVO usersBannerVO = new UsersBannerVO();
-
-        usersBannerVO.setUrl( bannerBO.getUrl() );
-        usersBannerVO.setPicUrl( bannerBO.getPicUrl() );
-
-        return usersBannerVO;
-    }
-}

promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/CouponTemplateConvertImpl.java

@@ -1,109 +0,0 @@
-package cn.iocoder.mall.promotion.application.convert;
-
-import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.promotion.api.bo.CouponTemplateBO;
-import cn.iocoder.mall.promotion.api.bo.CouponTemplatePageBO;
-import cn.iocoder.mall.promotion.application.vo.admins.AdminsCouponTemplatePageVO;
-import cn.iocoder.mall.promotion.application.vo.admins.AdminsCouponTemplateVO;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2019-04-06T01:40:13+0800",
-    comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
-)
-public class CouponTemplateConvertImpl implements CouponTemplateConvert {
-
-    @Override
-    public AdminsCouponTemplateVO convert(CouponTemplateBO template) {
-        if ( template == null ) {
-            return null;
-        }
-
-        AdminsCouponTemplateVO adminsCouponTemplateVO = new AdminsCouponTemplateVO();
-
-        adminsCouponTemplateVO.setId( template.getId() );
-        adminsCouponTemplateVO.setTitle( template.getTitle() );
-        adminsCouponTemplateVO.setDescription( template.getDescription() );
-        adminsCouponTemplateVO.setType( template.getType() );
-        adminsCouponTemplateVO.setCodeType( template.getCodeType() );
-        adminsCouponTemplateVO.setStatus( template.getStatus() );
-        adminsCouponTemplateVO.setQuota( template.getQuota() );
-        adminsCouponTemplateVO.setPriceAvailable( template.getPriceAvailable() );
-        adminsCouponTemplateVO.setRangeType( template.getRangeType() );
-        adminsCouponTemplateVO.setRangeValues( template.getRangeValues() );
-        adminsCouponTemplateVO.setDateType( template.getDateType() );
-        adminsCouponTemplateVO.setValidStartTime( template.getValidStartTime() );
-        adminsCouponTemplateVO.setValidEndTime( template.getValidEndTime() );
-        adminsCouponTemplateVO.setFixedStartTerm( template.getFixedStartTerm() );
-        adminsCouponTemplateVO.setFixedEndTerm( template.getFixedEndTerm() );
-        adminsCouponTemplateVO.setPreferentialType( template.getPreferentialType() );
-        adminsCouponTemplateVO.setPercentOff( template.getPercentOff() );
-        adminsCouponTemplateVO.setPriceOff( template.getPriceOff() );
-        adminsCouponTemplateVO.setDiscountPriceLimit( template.getDiscountPriceLimit() );
-        adminsCouponTemplateVO.setStatFetchNum( template.getStatFetchNum() );
-        adminsCouponTemplateVO.setCreateTime( template.getCreateTime() );
-        adminsCouponTemplateVO.setTotal( template.getTotal() );
-
-        return adminsCouponTemplateVO;
-    }
-
-    @Override
-    public CommonResult<AdminsCouponTemplateVO> convert2(CommonResult<CouponTemplateBO> result) {
-        if ( result == null ) {
-            return null;
-        }
-
-        CommonResult<AdminsCouponTemplateVO> commonResult = new CommonResult<AdminsCouponTemplateVO>();
-
-        commonResult.setCode( result.getCode() );
-        commonResult.setMessage( result.getMessage() );
-        commonResult.setData( convert( result.getData() ) );
-
-        return commonResult;
-    }
-
-    @Override
-    public CommonResult<AdminsCouponTemplatePageVO> convert(CommonResult<CouponTemplatePageBO> result) {
-        if ( result == null ) {
-            return null;
-        }
-
-        CommonResult<AdminsCouponTemplatePageVO> commonResult = new CommonResult<AdminsCouponTemplatePageVO>();
-
-        commonResult.setCode( result.getCode() );
-        commonResult.setMessage( result.getMessage() );
-        commonResult.setData( couponTemplatePageBOToAdminsCouponTemplatePageVO( result.getData() ) );
-
-        return commonResult;
-    }
-
-    @Override
-    public List<AdminsCouponTemplateVO> convertList(List<CouponTemplateBO> templates) {
-        if ( templates == null ) {
-            return null;
-        }
-
-        List<AdminsCouponTemplateVO> list = new ArrayList<AdminsCouponTemplateVO>( templates.size() );
-        for ( CouponTemplateBO couponTemplateBO : templates ) {
-            list.add( convert( couponTemplateBO ) );
-        }
-
-        return list;
-    }
-
-    protected AdminsCouponTemplatePageVO couponTemplatePageBOToAdminsCouponTemplatePageVO(CouponTemplatePageBO couponTemplatePageBO) {
-        if ( couponTemplatePageBO == null ) {
-            return null;
-        }
-
-        AdminsCouponTemplatePageVO adminsCouponTemplatePageVO = new AdminsCouponTemplatePageVO();
-
-        adminsCouponTemplatePageVO.setList( convertList( couponTemplatePageBO.getList() ) );
-        adminsCouponTemplatePageVO.setTotal( couponTemplatePageBO.getTotal() );
-
-        return adminsCouponTemplatePageVO;
-    }
-}

promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/ProductRecommendConvertImpl.java

@@ -1,115 +0,0 @@
-package cn.iocoder.mall.promotion.application.convert;
-
-import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.product.api.bo.ProductSpuBO;
-import cn.iocoder.mall.promotion.api.bo.ProductRecommendBO;
-import cn.iocoder.mall.promotion.api.bo.ProductRecommendPageBO;
-import cn.iocoder.mall.promotion.application.vo.admins.AdminsProductRecommendPageVO;
-import cn.iocoder.mall.promotion.application.vo.admins.AdminsProductRecommendVO;
-import cn.iocoder.mall.promotion.application.vo.users.UsersProductRecommendVO;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2019-04-06T01:40:13+0800",
-    comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
-)
-public class ProductRecommendConvertImpl implements ProductRecommendConvert {
-
-    @Override
-    public AdminsProductRecommendVO convert(ProductRecommendBO bannerBO) {
-        if ( bannerBO == null ) {
-            return null;
-        }
-
-        AdminsProductRecommendVO adminsProductRecommendVO = new AdminsProductRecommendVO();
-
-        adminsProductRecommendVO.setId( bannerBO.getId() );
-        adminsProductRecommendVO.setType( bannerBO.getType() );
-        adminsProductRecommendVO.setProductSpuId( bannerBO.getProductSpuId() );
-        adminsProductRecommendVO.setSort( bannerBO.getSort() );
-        adminsProductRecommendVO.setStatus( bannerBO.getStatus() );
-        adminsProductRecommendVO.setMemo( bannerBO.getMemo() );
-        adminsProductRecommendVO.setCreateTime( bannerBO.getCreateTime() );
-
-        return adminsProductRecommendVO;
-    }
-
-    @Override
-    public CommonResult<AdminsProductRecommendVO> convert2(CommonResult<ProductRecommendBO> result) {
-        if ( result == null ) {
-            return null;
-        }
-
-        CommonResult<AdminsProductRecommendVO> commonResult = new CommonResult<AdminsProductRecommendVO>();
-
-        commonResult.setCode( result.getCode() );
-        commonResult.setMessage( result.getMessage() );
-        commonResult.setData( convert( result.getData() ) );
-
-        return commonResult;
-    }
-
-    @Override
-    public CommonResult<AdminsProductRecommendPageVO> convert(CommonResult<ProductRecommendPageBO> result) {
-        if ( result == null ) {
-            return null;
-        }
-
-        CommonResult<AdminsProductRecommendPageVO> commonResult = new CommonResult<AdminsProductRecommendPageVO>();
-
-        commonResult.setCode( result.getCode() );
-        commonResult.setMessage( result.getMessage() );
-        commonResult.setData( productRecommendPageBOToAdminsProductRecommendPageVO( result.getData() ) );
-
-        return commonResult;
-    }
-
-    @Override
-    public UsersProductRecommendVO convert(ProductSpuBO productSpu) {
-        if ( productSpu == null ) {
-            return null;
-        }
-
-        UsersProductRecommendVO usersProductRecommendVO = new UsersProductRecommendVO();
-
-        usersProductRecommendVO.setId( productSpu.getId() );
-        usersProductRecommendVO.setName( productSpu.getName() );
-        usersProductRecommendVO.setSellPoint( productSpu.getSellPoint() );
-        List<String> list = productSpu.getPicUrls();
-        if ( list != null ) {
-            usersProductRecommendVO.setPicUrls( new ArrayList<String>( list ) );
-        }
-        usersProductRecommendVO.setPrice( productSpu.getPrice() );
-
-        return usersProductRecommendVO;
-    }
-
-    protected List<AdminsProductRecommendVO> productRecommendBOListToAdminsProductRecommendVOList(List<ProductRecommendBO> list) {
-        if ( list == null ) {
-            return null;
-        }
-
-        List<AdminsProductRecommendVO> list1 = new ArrayList<AdminsProductRecommendVO>( list.size() );
-        for ( ProductRecommendBO productRecommendBO : list ) {
-            list1.add( convert( productRecommendBO ) );
-        }
-
-        return list1;
-    }
-
-    protected AdminsProductRecommendPageVO productRecommendPageBOToAdminsProductRecommendPageVO(ProductRecommendPageBO productRecommendPageBO) {
-        if ( productRecommendPageBO == null ) {
-            return null;
-        }
-
-        AdminsProductRecommendPageVO adminsProductRecommendPageVO = new AdminsProductRecommendPageVO();
-
-        adminsProductRecommendPageVO.setList( productRecommendBOListToAdminsProductRecommendVOList( productRecommendPageBO.getList() ) );
-        adminsProductRecommendPageVO.setTotal( productRecommendPageBO.getTotal() );
-
-        return adminsProductRecommendPageVO;
-    }
-}

promotion/promotion-service-impl/target/classes/mapper/CouponTemplateMapper.xml

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.mall.promotion.biz.dao.CouponTemplateMapper">
-
-    <sql id="FIELDS">
-        id, title, description, type, code_type,
-        status, quota, total, price_available, range_type,
-        range_values, date_type, valid_start_time, valid_end_time, fixed_start_term, fixed_end_term,
-        preferential_type, percent_off, price_off, discount_price_limit, stat_fetch_num,
-        create_time
-    </sql>
-
-<!--    <select id="selectListByPidAndStatusOrderBySort" resultType="CouponTemplateDO">-->
-<!--        SELECT-->
-<!--            <include refid="FIELDS" />-->
-<!--        FROM coupon_template-->
-<!--        WHERE pid = #{pid}-->
-<!--        AND status = #{status}-->
-<!--        AND deleted = 0-->
-<!--        ORDER BY sort ASC-->
-<!--    </select>-->
-
-<!--    <select id="selectList" resultType="CouponTemplateDO">-->
-<!--        SELECT-->
-<!--          <include refid="FIELDS" />-->
-<!--        FROM coupon_template-->
-<!--        WHERE deleted = 0-->
-<!--    </select>-->
-
-    <select id="selectById" parameterType="Integer" resultType="CouponTemplateDO">
-        SELECT
-          <include refid="FIELDS" />
-        FROM coupon_template
-        WHERE id = #{id}
-    </select>
-
-    <select id="selectListByPage" resultType="CouponTemplateDO">
-        SELECT
-          <include refid="FIELDS" />
-        FROM coupon_template
-        <where>
-            <if test="type != null">
-                AND type = #{type}
-            </if>
-            <if test="title != null">
-                AND title LIKE "%"#{title}"%"
-            </if>
-            <if test="status != null">
-                AND status = #{status}
-            </if>
-            <if test="preferentialType != null">
-                AND preferential_type = #{preferentialType}
-            </if>
-        </where>
-        LIMIT #{offset}, #{limit}
-    </select>
-
-    <select id="selectCountByPage" resultType="Integer">
-        SELECT
-          COUNT(1)
-        FROM coupon_template
-        <where>
-            <if test="type != null">
-                AND type = #{type}
-            </if>
-            <if test="title != null">
-                AND title LIKE "%"#{title}"%"
-            </if>
-            <if test="status != null">
-                AND status = #{status}
-            </if>
-            <if test="preferentialType != null">
-                AND preferential_type = #{preferentialType}
-            </if>
-        </where>
-    </select>
-
-    <insert id="insert" parameterType="CouponTemplateDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO coupon_template (
-          title, description, type, code_type,
-          status, quota, total, price_available, range_type,
-          range_values, date_type, valid_start_time, valid_end_time, fixed_start_term, fixed_end_term,
-          preferential_type, percent_off, price_off, discount_price_limit, stat_fetch_num,
-          create_time
-        ) VALUES (
-          #{title}, #{description}, #{type}, #{codeType},
-          #{status}, #{quota}, #{total}, #{priceAvailable}, #{rangeType},
-          #{rangeValues}, #{dateType}, #{validStartTime}, #{validEndTime}, #{fixedStartTerm}, #{fixedEndTerm}
-          #{preferentialType}, #{percentOff}, #{priceOff}, #{discountPriceLimit}, #{statFetchNum},
-          #{createTime}
-        )
-    </insert>
-
-    <update id="update" parameterType="CouponTemplateDO">
-        UPDATE coupon_template
-        <set>
-            <if test="title != null">
-                title = #{title},
-            </if>
-            <if test="description != null">
-                description = #{description},
-            </if>
-            <if test="status != null">
-                status = #{status},
-            </if>
-            <if test="quota != null">
-                quota = #{quota},
-            </if>
-            <if test="total != null">
-                total = #{total},
-            </if>
-            <if test="priceAvailable != null">
-                price_available = #{priceAvailable},
-            </if>
-            <if test="rangeType != null">
-                range_type = #{rangeType},
-            </if>
-            <if test="rangeValues != null">
-                range_values = #{rangeValues},
-            </if>
-            <if test="dateType != null">
-                date_type = #{dateType},
-            </if>
-            <if test="validStartTime != null">
-                valid_start_time = #{validStartTime},
-            </if>
-            <if test="validEndTime != null">
-                valid_end_time = #{validEndTime},
-            </if>
-            <if test="fixedStartTerm != null">
-                fixed_start_term = #{fixedStartTerm},
-            </if>
-            <if test="fixedEndTerm != null">
-                fixed_end_term = #{fixedEndTerm},
-            </if>
-            <if test="preferentialType != null">
-                preferential_type = #{preferentialType},
-            </if>
-            <if test="percentOff != null">
-                percent_off = #{percentOff},
-            </if>
-            <if test="priceOff != null">
-                price_off = #{priceOff},
-            </if>
-            <if test="discountPriceLimit != null">
-                discount_price_limit = #{discountPriceLimit},
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
-</mapper>

promotion/promotion-service-impl/target/classes/mapper/ProductRecommendMapper.xml

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.mall.promotion.biz.dao.ProductRecommendMapper">
-
-    <sql id="FIELDS">
-        id, type, product_spu_id, sort,
-        status, memo, create_time
-    </sql>
-
-<!--    <select id="selectListByPidAndStatusOrderBySort" resultType="ProductRecommendDO">-->
-<!--        SELECT-->
-<!--            <include refid="FIELDS" />-->
-<!--        FROM product_recommend-->
-<!--        WHERE pid = #{pid}-->
-<!--        AND status = #{status}-->
-<!--        AND deleted = 0-->
-<!--        ORDER BY sort ASC-->
-<!--    </select>-->
-
-<!--    <select id="selectList" resultType="ProductRecommendDO">-->
-<!--        SELECT-->
-<!--          <include refid="FIELDS" />-->
-<!--        FROM product_recommend-->
-<!--        WHERE deleted = 0-->
-<!--    </select>-->
-
-    <select id="selectById" parameterType="Integer" resultType="ProductRecommendDO">
-        SELECT
-          <include refid="FIELDS" />
-        FROM product_recommend
-        WHERE id = #{id}
-        AND deleted = 0
-    </select>
-
-    <select id="selectByProductSpuIdAndType" resultType="ProductRecommendDO">
-        SELECT
-            <include refid="FIELDS" />
-        FROM product_recommend
-        <where>
-            <if test="productSpuId != null">
-                product_spu_id = #{productSpuId}
-            </if>
-            <if test="type != null">
-                AND type = #{type}
-            </if>
-            AND deleted = 0
-        </where>
-    </select>
-
-    <select id="selectListByTypeAndStatus" parameterType="Integer" resultType="ProductRecommendDO">
-        SELECT
-            <include refid="FIELDS" />
-        FROM product_recommend
-        <where>
-            <if test="type != null">
-                type = #{type}
-            </if>
-            <if test="status != null">
-                AND status = #{status}
-            </if>
-            AND deleted = 0
-        </where>
-    </select>
-
-    <select id="selectPageByType" resultType="ProductRecommendDO">
-        SELECT
-          <include refid="FIELDS" />
-        FROM product_recommend
-        <where>
-            <if test="type != null">
-                type = #{type}
-            </if>
-            AND deleted = 0
-        </where>
-        LIMIT #{offset}, #{limit}
-    </select>
-
-    <select id="selectCountByType" resultType="Integer">
-        SELECT
-          COUNT(1)
-        FROM product_recommend
-        <where>
-            <if test="type != null">
-                type = #{type}
-            </if>
-            AND deleted = 0
-        </where>
-    </select>
-
-    <insert id="insert" parameterType="ProductRecommendDO" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        INSERT INTO product_recommend (
-          type, product_spu_id, sort, status, memo,
-          create_time, deleted
-        ) VALUES (
-          #{type}, #{productSpuId}, #{sort}, #{status}, #{memo},
-          #{createTime}, #{deleted}
-        )
-    </insert>
-
-    <update id="update" parameterType="ProductRecommendDO">
-        UPDATE product_recommend
-        <set>
-            <if test="type != null">
-                type = #{type},
-            </if>
-            <if test="productSpuId != null">
-                product_spu_id = #{productSpuId},
-            </if>
-            <if test="sort != null">
-                sort = #{sort},
-            </if>
-            <if test="status != null">
-                status = #{status},
-            </if>
-            <if test="memo != null">
-                memo = #{memo},
-            </if>
-            <if test="deleted != null">
-                deleted = #{deleted}
-            </if>
-        </set>
-        WHERE id = #{id}
-    </update>
-
-</mapper>

promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java

@@ -1,135 +0,0 @@
-package cn.iocoder.mall.promotion.biz.convert;
-
-import cn.iocoder.mall.promotion.api.bo.CouponTemplateBO;
-import cn.iocoder.mall.promotion.api.dto.CouponCardTemplateAddDTO;
-import cn.iocoder.mall.promotion.api.dto.CouponCardTemplateUpdateDTO;
-import cn.iocoder.mall.promotion.api.dto.CouponCodeTemplateAddDTO;
-import cn.iocoder.mall.promotion.api.dto.CouponCodeTemplateUpdateDTO;
-import cn.iocoder.mall.promotion.biz.dataobject.CouponTemplateDO;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2019-04-06T20:54:04+0800",
-    comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
-)
-public class CouponTemplateConvertImpl implements CouponTemplateConvert {
-
-    @Override
-    public List<CouponTemplateBO> convertToBO(List<CouponTemplateDO> templateList) {
-        if ( templateList == null ) {
-            return null;
-        }
-
-        List<CouponTemplateBO> list = new ArrayList<CouponTemplateBO>( templateList.size() );
-        for ( CouponTemplateDO couponTemplateDO : templateList ) {
-            list.add( convert( couponTemplateDO ) );
-        }
-
-        return list;
-    }
-
-    @Override
-    public CouponTemplateDO convert(CouponCodeTemplateUpdateDTO template) {
-        if ( template == null ) {
-            return null;
-        }
-
-        CouponTemplateDO couponTemplateDO = new CouponTemplateDO();
-
-        return couponTemplateDO;
-    }
-
-    @Override
-    public CouponTemplateDO convert(CouponCardTemplateAddDTO template) {
-        if ( template == null ) {
-            return null;
-        }
-
-        CouponTemplateDO couponTemplateDO = new CouponTemplateDO();
-
-        couponTemplateDO.setTitle( template.getTitle() );
-        couponTemplateDO.setDescription( template.getDescription() );
-        couponTemplateDO.setQuota( template.getQuota() );
-        couponTemplateDO.setTotal( template.getTotal() );
-        couponTemplateDO.setPriceAvailable( template.getPriceAvailable() );
-        couponTemplateDO.setRangeType( template.getRangeType() );
-        couponTemplateDO.setRangeValues( template.getRangeValues() );
-        couponTemplateDO.setDateType( template.getDateType() );
-        couponTemplateDO.setValidStartTime( template.getValidStartTime() );
-        couponTemplateDO.setValidEndTime( template.getValidEndTime() );
-        couponTemplateDO.setFixedEndTerm( template.getFixedEndTerm() );
-        couponTemplateDO.setPreferentialType( template.getPreferentialType() );
-        couponTemplateDO.setPercentOff( template.getPercentOff() );
-        couponTemplateDO.setPriceOff( template.getPriceOff() );
-        couponTemplateDO.setDiscountPriceLimit( template.getDiscountPriceLimit() );
-
-        return couponTemplateDO;
-    }
-
-    @Override
-    public CouponTemplateDO convert(CouponCardTemplateUpdateDTO template) {
-        if ( template == null ) {
-            return null;
-        }
-
-        CouponTemplateDO couponTemplateDO = new CouponTemplateDO();
-
-        couponTemplateDO.setId( template.getId() );
-        couponTemplateDO.setTitle( template.getTitle() );
-        couponTemplateDO.setDescription( template.getDescription() );
-        couponTemplateDO.setQuota( template.getQuota() );
-        couponTemplateDO.setTotal( template.getTotal() );
-        couponTemplateDO.setRangeType( template.getRangeType() );
-        couponTemplateDO.setRangeValues( template.getRangeValues() );
-
-        return couponTemplateDO;
-    }
-
-    @Override
-    public CouponTemplateDO convert(CouponCodeTemplateAddDTO template) {
-        if ( template == null ) {
-            return null;
-        }
-
-        CouponTemplateDO couponTemplateDO = new CouponTemplateDO();
-
-        return couponTemplateDO;
-    }
-
-    @Override
-    public CouponTemplateBO convert(CouponTemplateDO template) {
-        if ( template == null ) {
-            return null;
-        }
-
-        CouponTemplateBO couponTemplateBO = new CouponTemplateBO();
-
-        couponTemplateBO.setId( template.getId() );
-        couponTemplateBO.setTitle( template.getTitle() );
-        couponTemplateBO.setDescription( template.getDescription() );
-        couponTemplateBO.setType( template.getType() );
-        couponTemplateBO.setCodeType( template.getCodeType() );
-        couponTemplateBO.setStatus( template.getStatus() );
-        couponTemplateBO.setQuota( template.getQuota() );
-        couponTemplateBO.setTotal( template.getTotal() );
-        couponTemplateBO.setPriceAvailable( template.getPriceAvailable() );
-        couponTemplateBO.setRangeType( template.getRangeType() );
-        couponTemplateBO.setRangeValues( template.getRangeValues() );
-        couponTemplateBO.setDateType( template.getDateType() );
-        couponTemplateBO.setValidStartTime( template.getValidStartTime() );
-        couponTemplateBO.setValidEndTime( template.getValidEndTime() );
-        couponTemplateBO.setFixedStartTerm( template.getFixedStartTerm() );
-        couponTemplateBO.setFixedEndTerm( template.getFixedEndTerm() );
-        couponTemplateBO.setPreferentialType( template.getPreferentialType() );
-        couponTemplateBO.setPercentOff( template.getPercentOff() );
-        couponTemplateBO.setPriceOff( template.getPriceOff() );
-        couponTemplateBO.setDiscountPriceLimit( template.getDiscountPriceLimit() );
-        couponTemplateBO.setStatFetchNum( template.getStatFetchNum() );
-        couponTemplateBO.setCreateTime( template.getCreateTime() );
-
-        return couponTemplateBO;
-    }
-}

promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/ProductRecommendConvertImpl.java

@@ -1,83 +0,0 @@
-package cn.iocoder.mall.promotion.biz.convert;
-
-import cn.iocoder.mall.promotion.api.bo.ProductRecommendBO;
-import cn.iocoder.mall.promotion.api.dto.ProductRecommendAddDTO;
-import cn.iocoder.mall.promotion.api.dto.ProductRecommendUpdateDTO;
-import cn.iocoder.mall.promotion.biz.dataobject.ProductRecommendDO;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
-    value = "org.mapstruct.ap.MappingProcessor",
-    date = "2019-04-06T01:40:11+0800",
-    comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)"
-)
-public class ProductRecommendConvertImpl implements ProductRecommendConvert {
-
-    @Override
-    public ProductRecommendBO convertToBO(ProductRecommendDO banner) {
-        if ( banner == null ) {
-            return null;
-        }
-
-        ProductRecommendBO productRecommendBO = new ProductRecommendBO();
-
-        productRecommendBO.setId( banner.getId() );
-        productRecommendBO.setType( banner.getType() );
-        productRecommendBO.setProductSpuId( banner.getProductSpuId() );
-        productRecommendBO.setSort( banner.getSort() );
-        productRecommendBO.setStatus( banner.getStatus() );
-        productRecommendBO.setMemo( banner.getMemo() );
-        productRecommendBO.setCreateTime( banner.getCreateTime() );
-
-        return productRecommendBO;
-    }
-
-    @Override
-    public List<ProductRecommendBO> convertToBO(List<ProductRecommendDO> bannerList) {
-        if ( bannerList == null ) {
-            return null;
-        }
-
-        List<ProductRecommendBO> list = new ArrayList<ProductRecommendBO>( bannerList.size() );
-        for ( ProductRecommendDO productRecommendDO : bannerList ) {
-            list.add( convertToBO( productRecommendDO ) );
-        }
-
-        return list;
-    }
-
-    @Override
-    public ProductRecommendDO convert(ProductRecommendAddDTO bannerAddDTO) {
-        if ( bannerAddDTO == null ) {
-            return null;
-        }
-
-        ProductRecommendDO productRecommendDO = new ProductRecommendDO();
-
-        productRecommendDO.setType( bannerAddDTO.getType() );
-        productRecommendDO.setProductSpuId( bannerAddDTO.getProductSpuId() );
-        productRecommendDO.setSort( bannerAddDTO.getSort() );
-        productRecommendDO.setMemo( bannerAddDTO.getMemo() );
-
-        return productRecommendDO;
-    }
-
-    @Override
-    public ProductRecommendDO convert(ProductRecommendUpdateDTO bannerUpdateDTO) {
-        if ( bannerUpdateDTO == null ) {
-            return null;
-        }
-
-        ProductRecommendDO productRecommendDO = new ProductRecommendDO();
-
-        productRecommendDO.setId( bannerUpdateDTO.getId() );
-        productRecommendDO.setType( bannerUpdateDTO.getType() );
-        productRecommendDO.setProductSpuId( bannerUpdateDTO.getProductSpuId() );
-        productRecommendDO.setSort( bannerUpdateDTO.getSort() );
-        productRecommendDO.setMemo( bannerUpdateDTO.getMemo() );
-
-        return productRecommendDO;
-    }
-}

search/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

system/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>

system/system-application/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>admin-application</artifactId>
+    <artifactId>system-application</artifactId>
 
     <dependencies>
         <dependency>

user/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>mall-parent</artifactId>
+        <artifactId>onemall</artifactId>
         <groupId>cn.iocoder.mall</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>