diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 72985eb..caca779 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,11 +7,11 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b661a5..fa18721 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,11 @@ + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java b/payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java similarity index 92% rename from payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java rename to payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java index 2ab436a..2ebd8b0 100644 --- a/payment-base-app/src/main/java/com/base/springclould/PaymentBaseApplication.java +++ b/payment-base-app/src/main/java/com/base/springcloud/PaymentBaseApplication.java @@ -1,4 +1,4 @@ -package com.base.springclould; +package com.base.springcloud; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java b/payment-base-app/src/main/java/com/base/springcloud/base/CommonResult.java similarity index 91% rename from payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java rename to payment-base-app/src/main/java/com/base/springcloud/base/CommonResult.java index c8ad5f7..e74764d 100644 --- a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/base/CommonResult.java +++ b/payment-base-app/src/main/java/com/base/springcloud/base/CommonResult.java @@ -1,4 +1,4 @@ -package com.rbs.springcloud.pojo.base; +package com.base.springcloud.base; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java b/payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java similarity index 93% rename from payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java rename to payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java index f7767db..cf68c70 100644 --- a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/constant/ErrorConstant.java +++ b/payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java @@ -1,4 +1,4 @@ -package com.rbs.springcloud.pojo.constant; +package com.base.springcloud.constant; public enum ErrorConstant { diff --git a/payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java similarity index 88% rename from payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java rename to payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java index da03b7b..662a1de 100644 --- a/payment-base-app/src/main/java/com/base/springclould/controller/MerchantController.java +++ b/payment-base-app/src/main/java/com/base/springcloud/controller/MerchantController.java @@ -1,6 +1,6 @@ -package com.base.springclould.controller; +package com.base.springcloud.controller; -import com.base.springclould.service.MerchantService; +import com.base.springcloud.service.MerchantService; import com.rbs.springcloud.pojo.base.CommonResult; import com.rbs.springcloud.pojo.constant.ErrorConstant; import com.rbs.springcloud.pojo.merchant.*; diff --git a/payment-base-app/src/main/java/com/base/springcloud/dao/MerchantMapper.java b/payment-base-app/src/main/java/com/base/springcloud/dao/MerchantMapper.java new file mode 100644 index 0000000..79c8390 --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springcloud/dao/MerchantMapper.java @@ -0,0 +1,17 @@ +package com.base.springcloud.dao; + +import com.base.springcloud.entity.Merchant; + +public interface MerchantMapper { + int deleteByPrimaryKey(String id); + + int insert(Merchant record); + + int insertSelective(Merchant record); + + Merchant selectByPrimaryKey(String id); + + int updateByPrimaryKeySelective(Merchant record); + + int updateByPrimaryKey(Merchant record); +} \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java b/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java new file mode 100644 index 0000000..215acce --- /dev/null +++ b/payment-base-app/src/main/java/com/base/springcloud/entity/Merchant.java @@ -0,0 +1,28 @@ +package com.base.springcloud.entity; + +import lombok.Data; + +import java.util.Date; +@Data +public class Merchant { + private String id; + + private String merchantId; + + private String merchantName; + + private String cityStoreName; + + private String storeBrandName; + + private Date timeStamp; + + public Merchant(String id, String merchantId, String merchantName, String cityStoreName, String storeBrandName, Date timeStamp) { + this.id = id; + this.merchantId = merchantId; + this.merchantName = merchantName; + this.cityStoreName = cityStoreName; + this.storeBrandName = storeBrandName; + this.timeStamp = timeStamp; + } +} \ No newline at end of file diff --git a/payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java b/payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java similarity index 76% rename from payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java rename to payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java index 25a190e..e000bdb 100644 --- a/payment-base-app/src/main/java/com/base/springclould/service/MerchantService.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/MerchantService.java @@ -1,4 +1,4 @@ -package com.base.springclould.service; +package com.base.springcloud.service; import com.rbs.springcloud.pojo.merchant.Merchant; diff --git a/payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java similarity index 73% rename from payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java rename to payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java index 95dc008..1e588b9 100644 --- a/payment-base-app/src/main/java/com/base/springclould/service/imp/MerchantServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java @@ -1,6 +1,6 @@ -package com.base.springclould.service.imp; +package com.base.springcloud.service.imp; -import com.base.springclould.service.MerchantService; +import com.base.springcloud.service.MerchantService; import com.rbs.springcloud.pojo.merchant.Merchant; import org.springframework.stereotype.Service; diff --git a/payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java b/payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java deleted file mode 100644 index 4596ea1..0000000 --- a/payment-base-app/src/main/java/com/base/springclould/dao/MerchantDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.base.springclould.dao; - -import com.rbs.springcloud.pojo.merchant.Merchant; -import org.apache.ibatis.annotations.Mapper; - -import javax.annotation.Resource; - -@Mapper -@Resource -public interface MerchantDao { - - int insert(Merchant merchant); -} diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml new file mode 100644 index 0000000..26366d4 --- /dev/null +++ b/payment-base-app/src/main/resources/com/base/payment/mapper/MerchantMapper.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp + + + + delete from pay_merchant + where id = #{id,jdbcType=VARCHAR} + + + insert into pay_merchant (id, merchant_id, merchant_name, + city_store_name, store_brand_name, time_stamp + ) + values (#{id,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, + #{cityStoreName,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, #{timeStamp,jdbcType=TIMESTAMP} + ) + + + insert into pay_merchant + + + id, + + + merchant_id, + + + merchant_name, + + + city_store_name, + + + store_brand_name, + + + time_stamp, + + + + + #{id,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{merchantName,jdbcType=VARCHAR}, + + + #{cityStoreName,jdbcType=VARCHAR}, + + + #{storeBrandName,jdbcType=VARCHAR}, + + + #{timeStamp,jdbcType=TIMESTAMP}, + + + + + update pay_merchant + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + merchant_name = #{merchantName,jdbcType=VARCHAR}, + + + city_store_name = #{cityStoreName,jdbcType=VARCHAR}, + + + store_brand_name = #{storeBrandName,jdbcType=VARCHAR}, + + + time_stamp = #{timeStamp,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=VARCHAR} + + + update pay_merchant + set merchant_id = #{merchantId,jdbcType=VARCHAR}, + merchant_name = #{merchantName,jdbcType=VARCHAR}, + city_store_name = #{cityStoreName,jdbcType=VARCHAR}, + store_brand_name = #{storeBrandName,jdbcType=VARCHAR}, + time_stamp = #{timeStamp,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=VARCHAR} + + + + + + + + + + + id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp + + + + delete from pay_merchant + where id = #{id,jdbcType=VARCHAR} + + + insert into pay_merchant (id, merchant_id, merchant_name, + city_store_name, store_brand_name, time_stamp + ) + values (#{id,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, + #{cityStoreName,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, #{timeStamp,jdbcType=TIMESTAMP} + ) + + + insert into pay_merchant + + + id, + + + merchant_id, + + + merchant_name, + + + city_store_name, + + + store_brand_name, + + + time_stamp, + + + + + #{id,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{merchantName,jdbcType=VARCHAR}, + + + #{cityStoreName,jdbcType=VARCHAR}, + + + #{storeBrandName,jdbcType=VARCHAR}, + + + #{timeStamp,jdbcType=TIMESTAMP}, + + + + + update pay_merchant + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + merchant_name = #{merchantName,jdbcType=VARCHAR}, + + + city_store_name = #{cityStoreName,jdbcType=VARCHAR}, + + + store_brand_name = #{storeBrandName,jdbcType=VARCHAR}, + + + time_stamp = #{timeStamp,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=VARCHAR} + + + update pay_merchant + set merchant_id = #{merchantId,jdbcType=VARCHAR}, + merchant_name = #{merchantName,jdbcType=VARCHAR}, + city_store_name = #{cityStoreName,jdbcType=VARCHAR}, + store_brand_name = #{storeBrandName,jdbcType=VARCHAR}, + time_stamp = #{timeStamp,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=VARCHAR} + + + + + + + + + + + id, merchant_id, merchant_name, city_store_name, store_brand_name, time_stamp + + + + delete from pay_merchant + where id = #{id,jdbcType=VARCHAR} + + + insert into pay_merchant (id, merchant_id, merchant_name, + city_store_name, store_brand_name, time_stamp + ) + values (#{id,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, #{merchantName,jdbcType=VARCHAR}, + #{cityStoreName,jdbcType=VARCHAR}, #{storeBrandName,jdbcType=VARCHAR}, #{timeStamp,jdbcType=TIMESTAMP} + ) + + + insert into pay_merchant + + + id, + + + merchant_id, + + + merchant_name, + + + city_store_name, + + + store_brand_name, + + + time_stamp, + + + + + #{id,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{merchantName,jdbcType=VARCHAR}, + + + #{cityStoreName,jdbcType=VARCHAR}, + + + #{storeBrandName,jdbcType=VARCHAR}, + + + #{timeStamp,jdbcType=TIMESTAMP}, + + + + + update pay_merchant + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + merchant_name = #{merchantName,jdbcType=VARCHAR}, + + + city_store_name = #{cityStoreName,jdbcType=VARCHAR}, + + + store_brand_name = #{storeBrandName,jdbcType=VARCHAR}, + + + time_stamp = #{timeStamp,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=VARCHAR} + + + update pay_merchant + set merchant_id = #{merchantId,jdbcType=VARCHAR}, + merchant_name = #{merchantName,jdbcType=VARCHAR}, + city_store_name = #{cityStoreName,jdbcType=VARCHAR}, + store_brand_name = #{storeBrandName,jdbcType=VARCHAR}, + time_stamp = #{timeStamp,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/payment-base-app/src/main/resources/generatorConfig.xml b/payment-base-app/src/main/resources/generatorConfig.xml new file mode 100644 index 0000000..8ee957c --- /dev/null +++ b/payment-base-app/src/main/resources/generatorConfig.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/payment-base-app/src/main/resources/jdbc.properties b/payment-base-app/src/main/resources/jdbc.properties new file mode 100644 index 0000000..4b533e6 --- /dev/null +++ b/payment-base-app/src/main/resources/jdbc.properties @@ -0,0 +1,4 @@ +jdbc.driver=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://106.14.81.251:3306/rbs_erp_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false +jdbc.username=root +jdbc.password=hnrr%%360 \ No newline at end of file diff --git a/payment-base-app/src/main/resources/mapper/MerchantMapper.xml b/payment-base-app/src/main/resources/mapper/MerchantMapper.xml deleted file mode 100644 index 551c67b..0000000 --- a/payment-base-app/src/main/resources/mapper/MerchantMapper.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - insert into merchant - - - merchant_id, - - - merchant_name, - - - city_store_name, - - - store_brand_name, - - - time_stamp, - - - - - #{merchantId,jdbcType=varchar}, - - - #{merchantName,jdbcType=varchar}, - - - #{cityStoreName,jdbcType=varchar}, - - - #{storeBrandName,jdbcType=varchar}, - - - #{timeStamp,jdbcType=varchar}, - - - - \ No newline at end of file diff --git a/payment-common-app/payment-common-app.iml b/payment-common-app/payment-common-app.iml deleted file mode 100644 index 78b2cc5..0000000 --- a/payment-common-app/payment-common-app.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/payment-common-app/pom.xml b/payment-common-app/pom.xml deleted file mode 100644 index fbedc80..0000000 --- a/payment-common-app/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - rbsservice - com.rbs.springcloud - 1.0-SNAPSHOT - - 4.0.0 - - payment-common-app - - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - - cn.hutool - hutool-all - 5.1.0 - - - - - diff --git a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java b/payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java deleted file mode 100644 index 90e89a6..0000000 --- a/payment-common-app/src/main/java/com/rbs/springcloud/pojo/merchant/Merchant.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.rbs.springcloud.pojo.merchant; - -import com.rbs.springcloud.pojo.base.CommonResult; -import lombok.Data; - -@Data -public class Merchant extends CommonResult { - - // 商户编号 - private String merchantId; - - // 商户名称 - private String merchantName; - - // 城市分店名 - private String cityStoreName; - - // 门店品牌名 - private String storeBrandName; - - // 时间戳 - private String timeStamp; -} diff --git a/payment-common-app/target/classes/com/rbs/springcloud/pojo/base/CommonResult.class b/payment-common-app/target/classes/com/rbs/springcloud/pojo/base/CommonResult.class deleted file mode 100644 index 2e471f4..0000000 Binary files a/payment-common-app/target/classes/com/rbs/springcloud/pojo/base/CommonResult.class and /dev/null differ diff --git a/payment-common-app/target/classes/com/rbs/springcloud/pojo/constant/ErrorConstant.class b/payment-common-app/target/classes/com/rbs/springcloud/pojo/constant/ErrorConstant.class deleted file mode 100644 index 901fe44..0000000 Binary files a/payment-common-app/target/classes/com/rbs/springcloud/pojo/constant/ErrorConstant.class and /dev/null differ diff --git a/payment-common-app/target/classes/com/rbs/springcloud/pojo/merchant/Merchant.class b/payment-common-app/target/classes/com/rbs/springcloud/pojo/merchant/Merchant.class deleted file mode 100644 index fd5a544..0000000 Binary files a/payment-common-app/target/classes/com/rbs/springcloud/pojo/merchant/Merchant.class and /dev/null differ diff --git a/payment-common-app/target/maven-archiver/pom.properties b/payment-common-app/target/maven-archiver/pom.properties deleted file mode 100644 index e107b80..0000000 --- a/payment-common-app/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Feb 23 09:55:53 CST 2022 -version=1.0-SNAPSHOT -groupId=com.rbs.springcloud -artifactId=payment-common-app diff --git a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index 2086f9f..0000000 --- a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -com\rbs\springcloud\pojo\merchant\Merchant.class -com\rbs\springcloud\pojo\base\CommonResult.class diff --git a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 525989f..0000000 --- a/payment-common-app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,2 +0,0 @@ -F:\RongRun\rbsservice\payment-common-app\src\main\java\com\rbs\springcloud\pojo\merchant\Merchant.java -F:\RongRun\rbsservice\payment-common-app\src\main\java\com\rbs\springcloud\pojo\base\CommonResult.java diff --git a/payment-common-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/payment-common-app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/payment-common-app/target/payment-common-app-1.0-SNAPSHOT.jar b/payment-common-app/target/payment-common-app-1.0-SNAPSHOT.jar deleted file mode 100644 index 7b9e236..0000000 Binary files a/payment-common-app/target/payment-common-app-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/payment-eureka-app/pom.xml b/payment-eureka-app/pom.xml index cd4b09d..53cb921 100644 --- a/payment-eureka-app/pom.xml +++ b/payment-eureka-app/pom.xml @@ -37,5 +37,4 @@ test - \ No newline at end of file diff --git a/pom.xml b/pom.xml index c2e8062..a8278ae 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,7 @@ pom 1.0-SNAPSHOT - payment-common-app payment-base-app - rbs-eureka-server-app payment-eureka-app @@ -88,6 +86,47 @@ logback-core 1.2.3 + + + mysql + mysql-connector-java + 5.1.38 + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.4 + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.4 + + + mysql + mysql-connector-java + 5.1.38 + + + + true + + + + + + src/main/resources + + lib/*.jar + + + + \ No newline at end of file