diff --git a/admin-web/package.json b/admin-web/package.json index bd7367e56..11be4d07f 100644 --- a/admin-web/package.json +++ b/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", diff --git a/common/common-framework/target/classes/cn/iocoder/common/framework/vo/CommonResult.class b/common/common-framework/target/classes/cn/iocoder/common/framework/vo/CommonResult.class deleted file mode 100644 index c379f5db0..000000000 Binary files a/common/common-framework/target/classes/cn/iocoder/common/framework/vo/CommonResult.class and /dev/null differ diff --git a/common/pom.xml b/common/pom.xml index cf833fe77..8c8ad2c1f 100644 --- a/common/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/ops/pom.xml b/ops/pom.xml index 9e0891e56..de6fb0206 100644 --- a/ops/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/order/pom.xml b/order/pom.xml index 4c13bb3ec..26a55ac3f 100644 --- a/order/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/pay/pom.xml b/pay/pom.xml index 78e402bcf..d0fe8f9f1 100644 --- a/pay/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/product/pom.xml b/product/pom.xml index 52389badc..f7ded7cbf 100644 --- a/product/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/promotion/pom.xml b/promotion/pom.xml index 85a80cb1a..2bc55b718 100644 --- a/promotion/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/BannerConvertImpl.java b/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/BannerConvertImpl.java deleted file mode 100644 index 35482450a..000000000 --- a/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/BannerConvertImpl.java +++ /dev/null @@ -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 convert2(CommonResult result) { - if ( result == null ) { - return null; - } - - CommonResult commonResult = new CommonResult(); - - commonResult.setCode( result.getCode() ); - commonResult.setMessage( result.getMessage() ); - commonResult.setData( convert( result.getData() ) ); - - return commonResult; - } - - @Override - public CommonResult convert(CommonResult result) { - if ( result == null ) { - return null; - } - - CommonResult commonResult = new CommonResult(); - - commonResult.setCode( result.getCode() ); - commonResult.setMessage( result.getMessage() ); - commonResult.setData( bannerPageBOToAdminsBannerPageVO( result.getData() ) ); - - return commonResult; - } - - @Override - public List convertList(List banners) { - if ( banners == null ) { - return null; - } - - List list = new ArrayList( banners.size() ); - for ( BannerBO bannerBO : banners ) { - list.add( bannerBOToUsersBannerVO( bannerBO ) ); - } - - return list; - } - - protected List bannerBOListToAdminsBannerVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( 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; - } -} diff --git a/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/CouponTemplateConvertImpl.java b/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/CouponTemplateConvertImpl.java deleted file mode 100644 index 3a6ead592..000000000 --- a/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/CouponTemplateConvertImpl.java +++ /dev/null @@ -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 convert2(CommonResult result) { - if ( result == null ) { - return null; - } - - CommonResult commonResult = new CommonResult(); - - commonResult.setCode( result.getCode() ); - commonResult.setMessage( result.getMessage() ); - commonResult.setData( convert( result.getData() ) ); - - return commonResult; - } - - @Override - public CommonResult convert(CommonResult result) { - if ( result == null ) { - return null; - } - - CommonResult commonResult = new CommonResult(); - - commonResult.setCode( result.getCode() ); - commonResult.setMessage( result.getMessage() ); - commonResult.setData( couponTemplatePageBOToAdminsCouponTemplatePageVO( result.getData() ) ); - - return commonResult; - } - - @Override - public List convertList(List templates) { - if ( templates == null ) { - return null; - } - - List list = new ArrayList( 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; - } -} diff --git a/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/ProductRecommendConvertImpl.java b/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/ProductRecommendConvertImpl.java deleted file mode 100644 index de469091f..000000000 --- a/promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/ProductRecommendConvertImpl.java +++ /dev/null @@ -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 convert2(CommonResult result) { - if ( result == null ) { - return null; - } - - CommonResult commonResult = new CommonResult(); - - commonResult.setCode( result.getCode() ); - commonResult.setMessage( result.getMessage() ); - commonResult.setData( convert( result.getData() ) ); - - return commonResult; - } - - @Override - public CommonResult convert(CommonResult result) { - if ( result == null ) { - return null; - } - - CommonResult commonResult = new CommonResult(); - - 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 list = productSpu.getPicUrls(); - if ( list != null ) { - usersProductRecommendVO.setPicUrls( new ArrayList( list ) ); - } - usersProductRecommendVO.setPrice( productSpu.getPrice() ); - - return usersProductRecommendVO; - } - - protected List productRecommendBOListToAdminsProductRecommendVOList(List list) { - if ( list == null ) { - return null; - } - - List list1 = new ArrayList( 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; - } -} diff --git a/promotion/promotion-service-impl/target/classes/mapper/CouponTemplateMapper.xml b/promotion/promotion-service-impl/target/classes/mapper/CouponTemplateMapper.xml deleted file mode 100644 index 8a4938ded..000000000 --- a/promotion/promotion-service-impl/target/classes/mapper/CouponTemplateMapper.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - 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} - ) - - - - UPDATE coupon_template - - - title = #{title}, - - - description = #{description}, - - - status = #{status}, - - - quota = #{quota}, - - - total = #{total}, - - - price_available = #{priceAvailable}, - - - range_type = #{rangeType}, - - - range_values = #{rangeValues}, - - - date_type = #{dateType}, - - - valid_start_time = #{validStartTime}, - - - valid_end_time = #{validEndTime}, - - - fixed_start_term = #{fixedStartTerm}, - - - fixed_end_term = #{fixedEndTerm}, - - - preferential_type = #{preferentialType}, - - - percent_off = #{percentOff}, - - - price_off = #{priceOff}, - - - discount_price_limit = #{discountPriceLimit}, - - - WHERE id = #{id} - - - diff --git a/promotion/promotion-service-impl/target/classes/mapper/ProductRecommendMapper.xml b/promotion/promotion-service-impl/target/classes/mapper/ProductRecommendMapper.xml deleted file mode 100644 index 7632b2579..000000000 --- a/promotion/promotion-service-impl/target/classes/mapper/ProductRecommendMapper.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - id, type, product_spu_id, sort, - status, memo, create_time - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - INSERT INTO product_recommend ( - type, product_spu_id, sort, status, memo, - create_time, deleted - ) VALUES ( - #{type}, #{productSpuId}, #{sort}, #{status}, #{memo}, - #{createTime}, #{deleted} - ) - - - - UPDATE product_recommend - - - type = #{type}, - - - product_spu_id = #{productSpuId}, - - - sort = #{sort}, - - - status = #{status}, - - - memo = #{memo}, - - - deleted = #{deleted} - - - WHERE id = #{id} - - - \ No newline at end of file diff --git a/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java b/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java deleted file mode 100644 index 5bd1c7cc0..000000000 --- a/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java +++ /dev/null @@ -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 convertToBO(List templateList) { - if ( templateList == null ) { - return null; - } - - List list = new ArrayList( 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; - } -} diff --git a/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/ProductRecommendConvertImpl.java b/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/ProductRecommendConvertImpl.java deleted file mode 100644 index e0ab55fac..000000000 --- a/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/ProductRecommendConvertImpl.java +++ /dev/null @@ -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 convertToBO(List bannerList) { - if ( bannerList == null ) { - return null; - } - - List list = new ArrayList( 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; - } -} diff --git a/search/pom.xml b/search/pom.xml index 7f1c1129b..effbfedc3 100644 --- a/search/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/system/pom.xml b/system/pom.xml index 0ce67710c..9165f0aac 100644 --- a/system/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/system/system-application/pom.xml b/system/system-application/pom.xml index 63ba9b76f..bf151bf1a 100644 --- a/system/system-application/pom.xml +++ b/system/system-application/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - admin-application + system-application diff --git a/user/pom.xml b/user/pom.xml index 351a49a63..5eef8792a 100644 --- a/user/pom.xml +++ b/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"> - mall-parent + onemall cn.iocoder.mall 1.0-SNAPSHOT diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/MobileCodeService.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/MobileCodeService.class deleted file mode 100644 index 3102c314b..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/MobileCodeService.class and /dev/null differ diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/OAuth2Service.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/OAuth2Service.class deleted file mode 100644 index 13b731330..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/OAuth2Service.class and /dev/null differ diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/UserService.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/UserService.class deleted file mode 100644 index cedd1d792..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/UserService.class and /dev/null differ diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AccessTokenBO.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AccessTokenBO.class deleted file mode 100644 index 1a7dc9724..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AccessTokenBO.class and /dev/null differ diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AuthenticationBO.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AuthenticationBO.class deleted file mode 100644 index d8c2be88c..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AuthenticationBO.class and /dev/null differ diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/UserBO.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/UserBO.class deleted file mode 100644 index 123b76e5a..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/UserBO.class and /dev/null differ diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/ThirdPlatformConstant.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/ThirdPlatformConstant.class deleted file mode 100644 index 1239ca28f..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/ThirdPlatformConstant.class and /dev/null differ diff --git a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/UserErrorCodeEnum.class b/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/UserErrorCodeEnum.class deleted file mode 100644 index e3799f640..000000000 Binary files a/user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/UserErrorCodeEnum.class and /dev/null differ