From 87ab3a6c87b26a9f0388d3a803f56c0e45cf1510 Mon Sep 17 00:00:00 2001 From: sin <2943460818@qq.com> Date: Mon, 6 May 2019 21:21:44 +0800 Subject: [PATCH] =?UTF-8?q?-=20mall-parent=20=E6=94=B9=E4=B8=BA=20onemall?= =?UTF-8?q?=20-=20=E5=88=A0=E9=99=A4=20target=20=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-web/package.json | 1 + .../common/framework/vo/CommonResult.class | Bin 3246 -> 0 bytes common/pom.xml | 2 +- ops/pom.xml | 2 +- order/pom.xml | 2 +- pay/pom.xml | 2 +- product/pom.xml | 2 +- promotion/pom.xml | 2 +- .../convert/BannerConvertImpl.java | 122 -------------- .../convert/CouponTemplateConvertImpl.java | 109 ------------- .../convert/ProductRecommendConvertImpl.java | 115 ------------- .../classes/mapper/CouponTemplateMapper.xml | 152 ------------------ .../classes/mapper/ProductRecommendMapper.xml | 125 -------------- .../convert/CouponTemplateConvertImpl.java | 135 ---------------- .../convert/ProductRecommendConvertImpl.java | 83 ---------- search/pom.xml | 2 +- system/pom.xml | 2 +- system/system-application/pom.xml | 2 +- user/pom.xml | 2 +- .../user/service/api/MobileCodeService.class | Bin 459 -> 0 bytes .../mall/user/service/api/OAuth2Service.class | Bin 718 -> 0 bytes .../mall/user/service/api/UserService.class | Bin 136 -> 0 bytes .../service/api/bo/OAuth2AccessTokenBO.class | Bin 1294 -> 0 bytes .../api/bo/OAuth2AuthenticationBO.class | Bin 722 -> 0 bytes .../mall/user/service/api/bo/UserBO.class | Bin 941 -> 0 bytes .../api/constant/ThirdPlatformConstant.class | Bin 447 -> 0 bytes .../api/constant/UserErrorCodeEnum.class | Bin 3213 -> 0 bytes 27 files changed, 11 insertions(+), 851 deletions(-) delete mode 100644 common/common-framework/target/classes/cn/iocoder/common/framework/vo/CommonResult.class delete mode 100644 promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/BannerConvertImpl.java delete mode 100644 promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/CouponTemplateConvertImpl.java delete mode 100644 promotion/promotion-application/target/generated-sources/annotations/cn/iocoder/mall/promotion/application/convert/ProductRecommendConvertImpl.java delete mode 100644 promotion/promotion-service-impl/target/classes/mapper/CouponTemplateMapper.xml delete mode 100644 promotion/promotion-service-impl/target/classes/mapper/ProductRecommendMapper.xml delete mode 100644 promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java delete mode 100644 promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/ProductRecommendConvertImpl.java delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/MobileCodeService.class delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/OAuth2Service.class delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/UserService.class delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AccessTokenBO.class delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/OAuth2AuthenticationBO.class delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/bo/UserBO.class delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/ThirdPlatformConstant.class delete mode 100644 user/user-service-api/target/classes/cn/iocoder/mall/user/service/api/constant/UserErrorCodeEnum.class 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 c379f5db09c7a676e3739a36201ed8c0014450f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3246 zcmbtVTUQ%Z6y5{5XHp8ZL9tp8+vWltTCG~32m+;G0!UJ{Sgk`C(xJ%=&P?#Kd~q%P z1@%Gu=94e3g_quzb?LkR!%Lt12QI%omt+!Pt!DXj%3Hm~v7x5D(cK;q2u z?A(pQ)tQ;OLP4P3+_t9AR0IlF71NZBEYRXcrx}g|Fd81;x z(o1q>O*T|syT*WZQ#Az|$(1xo)tQ|kmGo*=*Q6~&t|}ku#w}@Amu76+s$$kE%p#d< z!uoi}!#m#&&;xm9|?1lX4C=L3v39R4BzM!6d4h z1@8sWP}T){dbOrmYE@ZNO%;t}TGMn(wp3kn`i5SWwqz3}@lmxRZ9_dKdWT#;BrRgS zP}X!qfxg13Ip@@RWTI4Y`&R1UNAjh&9#E{H*Nl>KS>=Y-?QcqFS&hm(hYhaeWOt*P7t8oFuAHg`jroAas>%J@O|(I zCv~GNnLGRk(df%HORY%Lrl}YfAXKwx)R2~BYTcJQzg%|ZN=;eb;v)+Osh0-vm)4Dc z#{j;_8fG0Fo&80C_7^b{L}AbSDSw-o5?2|uLBBZ^*oK(YLA<{rg|v-e0GW)cBAv?K*F zKZPuvMi$P%eG0R*O=`fwbTh~#IEMnxIYc|^;X9Tgu*d=}NF7I}1e730q>EN(}ffupk z83b2;pvGQ*eQyYRZc_VTbmSnxh}y&0EQY%jZ?JI0aKZO%!9&F$(0O_h%ouLPjWv|P z6T}Ovno`V$2? Umx8ZBMi8#^0<$!Sy$-tkAK?g)G5`Po 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 3102c314b160ecf0b91c50dbf6f2b8313bd6795a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmbtR%TB{E5S%S(L(8itz5y;+LWoNd5~|?T3PdFCuCo-E#I78t@NFFU06q$_iFj1% zk;BOAk#}cj{PFqr4&V&K6niQ52}#8+CtMv(7J8*sq1{|%F<3Vr9Z!r?)*GL5P{x;~ zcj__dl3#pyRx7W@EqBjVUBnS#aQ$j{8Lf9!iUY!M%JIqPce?3`94bPu^fOy9p`Y2g z)3FXxXaCi{Slj)<+kAA{Y?Jvq7`|!c4yUc|Sgd3mR@U%IW0!EcX0g;oq3TM^3Ys@c zFRj|>6k~r;-Od(lBH?^(&PG)HlZ*Nm{|%}~AavwM07?j3NCaKECBpZRO4TK7%h4Bf LFc5mDt#-cv?P!Tw 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 13b7313305daf7cdc8facd104e2ef7aaa1fe4fdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 718 zcmb_a!A`?440T4g(hbJgSHNYF5Vs+ufy8O3i1GtjX4-6Rg3`1c`2#+P10TRgA>3|2 z5xY!quoC;(*7LL9-d|n;;1q^F4173b(2vngq{KYGGfUJAqNC|Tl!B*1$2@XY>3IA* zay*rqDH%NOaJHpCvnzfoQX8$MNZtwN+pqt2gPTGhm*o3Ck;U^!tpur@5%(_axKwh z1G{Yn>4~Q3Pk-&W)pRr>YNw=d%IMDlBU4z3SM^4QD;c7dHlyku7>pVl->lz{D%$z? z9fh+6O4nh)phfow(DE4UfJa`Nyr2agdVI3o3WR{*F7(!Lo59`}v`;BsnJg?$ka#D12h4oOFt(uFJ0e1DJwO(1ZV{# R0~63r5MX3r29it+ECBRFB>eyY 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 1a7dc972416932ae42bf3993be469b7f60ff0bcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1294 zcmbu7-EPxB5QWb=KPHYzLP`oPP-qJ@Nf9d{B!obqf5< zbpepto{Wb6(K``{k&I+ObybP&{ain*L@^(+N%JOYa$}A@X|qj^s zr{n^ojfPsugvuqSPAXcj`^o?S 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 d8c2be88cb331727f7671908191c55dcca266652..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmbtSO>Y`85Pe=gHc*lRY0{=S^#(+$r7EWewQ4K%v<;PLxSPcSqh(z!UJm(HiPR`k z4*3E7QBj`(DGK7$96a-8?6>n~X8%6i-2*tqaTP@zR#3p}5N|>pg?KAa$jwNg9!=Fk z$wZ}N8QFAvCQ$C0)VNQ4(P|F_ir?%=3%ra>s?YP;P-nl?Fkz+{*;pk5l^GwelSMZ% zbAfIYr_$J%)J)D)lE{2c#IrE5mg={WLo0hL4X&u zGPlU(ATK*#=R104JVR-m0= 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 123b76e5a17e209ee1ad88fc7492a9603e56ad94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 941 zcmb7?$xg#C5Qcwu3oU_`Quh7U7KAU{K!8BvR2GTl?xa?0lqM)mc`lGZNE~6F6skD7qkI+ZlD=BIV#pi@O-d~`lrK+u9Y=;2!imL!E4(WaD(xqW znW(M03>yvC=PGbX8uE_tJl^ZljQ(5YN-k~`cLIJ%{=umRYRTwQ!Nmf^*>Vf2N9Bte?k<_gI?&$BXa|z zaSt~29oZ;g)J6`LjS=J->VIz{-E;q%Pn~P&Mp&cAkfj%rqK`H;GuoHNESRoE)+UeB z$nW-4G8Uin&gE{ib&d0yIe{H|M6yU zJ*vPVG|o+8iVK2!coY%5emd2J&d?x27SdW#<{a@`8l{DNF+#0;h{?=k(|aq6r!-sqxH}_+4{4bxeQT;^`+ruQ%;i$H z5TZ%A{O3kOx0)ubOrFIko@-U$01h9KuYx^z@WIEaDPUgv#q0dThS6kgafPTE@Q>d> buXRhCwZUodzzx<`9sB5@%S6~@btq>j4{VVwzABY$rtoOqGU5P2Wwui{qCr;=hvO zuQ~iu?B;k?@{=3^$$L0XNq(9mDEW4dGm^i?5t4id$Lo@xVAAj*@ERa@pJ$?D3fqLv6Ux zZuI!WhQ}L=+Z|de3kO5qCF!lP>tCKvx2v=@9eJHylJyx3g~P^RgkhWAVvG(NhBs~+ zL2o?Z8TAFCf%yI?^}rX2#fK>YuP4UPW?!OwBcV`y$YauW4%vGK=3{VYb;qpqWO9OGpsRbOdpYDdGBo*9nPhNs z{7^C%u@0q4ajGDpml*bUEzhTWg((PsHesbltXxV)tAuo9tZ|C02a@?C*~7zDj%Yra zqeScaQ<+qL7ejZIv-o^f&No86$sbA4T32V1Zd+%0?}jqT<_@PaR+^#SOpRr%{A7;e zws!rWjhti2e7Q_DUES1a7xBQuX0Pq)ULKx-_b1YoGt(kEO~~dYuYdoFD!7X#%4KFJ zbBW|oO17(Y+52Uy96}9o`Br~X!w0y=(6@s3m4+m)YdDGzH5|nA8eYKn7_`##&G{?W z7caiOFf${q-`DUg_R&NYXHL$)cVh1IbER7!%wN5&!LQ_nPd+S8&5~Ta^;U8EhK7KY zp&=--W#RVy#ml$n?p>QdbJpe*T4pTH78dTGDotO}FkH=8y!LVF(rFF*u}?!-daN&< zdA&4!m!i{|OLuM*PoAB>c%yWBR)Z<+8@{yD-t+gSmbyfwi&(sQc46j3Ij@HaM3-7@ z2OC*tnfu~C#nfF}^(npJ@rZmK) z*Lu5!+~@9|Uwr?<{P|NFo|E>*uU1>9EW$Da@4joM<@-$F8?U!pXZB0z{ z*@m|ACbLg_mC_+ihenL^k2rBfi^i403i*5Lh8Cg>bgQ|utMskLTZ~r z>YPIAkV0yMLMpmKDzQQ;s6r~ALMo6#Dg>QC$ca@*LksBb@>&qDLp>}U0z-n>CPMjf z6~I2jst2g~h#13R`mR$pPX0-}gjLGFmr$;72}jT8sC@v3^k22ae~c8Z?1dvTHd6G| zG8{QBUFp7{Ms4;yVJ(?N&l8W#qOPaoQ#gCt9G`-JOlo;kK?Mam=`fqI8jqtHTOb2G zN^513X_f55bjzAd*r9?pJ20*T8F~(q`wR4B=~;!B>3lyxj=p6T+=Mc#+MZ9~{G)RC zssKGIUOA!KN<4-MFtCXGkYVl3+Eu}oI zlyB>r_>SmPO21N`(Hq1r@m-}1D8-{Uirr#RDPE-*dXpFudz7+Q*T10J)D+NQ#vBDS zo3YvgTFh8o0c~c?SwM#w;{`ls#&nW46Oh(LK;n}G^#yDrpb76KSY5!=1X=<81PuiY z5HuFxC1@&OuXzVdPG9*74AH!S=B}9rdJ`J31C8*a2~p^DC7SUgn!wl4f@!qkHrnt2 f?f45eU=EMqujpVL8(BLz4P1Hben>0i`2G055?WyJ