From bbdfdeb998f36484fb4548943c847a80d2f23519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8C=E1=85=A5=E1=86=BC=E1=84=87?= =?UTF-8?q?=E1=85=A5=E1=86=B7?= Date: Mon, 15 Nov 2021 23:13:38 +0900 Subject: [PATCH 1/9] JungBum Join And Swagger Exclusion complete. --- .../00b6e4d6-edf0-493a-9249-804793f8ef3e.xml | 324 ++++++++++--- .../entities/entities.dat | Bin 4096 -> 4096 bytes .../entities/entities.dat.values | Bin 163115 -> 378115 bytes .../entities/entities.dat.values.at | Bin 31237 -> 31237 bytes .../entities/entities.dat.values.s | 2 +- .../entities/entities.dat_i | Bin 32768 -> 32768 bytes .idea/workspace.xml | 70 ++- .../apidocument/AccountControllerDocs.java | 14 +- .../photo/controller/AccountsController.java | 20 +- ...entController.java => CashController.java} | 23 +- .../photo/controller/ItemController.java | 55 +++ .../photologger/photo/domain/Cart.java | 14 + .../photologger/photo/domain/Gallery.java | 42 ++ .../photo/domain/GalleryPrice.java | 14 + .../photologger/photo/domain/Order.java | 17 + .../photologger/photo/domain/PayJoin.java | 17 + .../photologger/photo/domain/Payment.java | 20 +- .../photo/domain/PaymentHistory.java | 11 +- .../photologger/photo/domain/ReturnCheck.java | 3 + .../photo/domain/ReturnGalleryHistory.java | 32 ++ .../photo/domain/ReturnHistory.java | 5 +- .../photologger/photo/domain/ReturnUser.java | 8 +- .../photo/domain/SellerIdxCheck.java | 13 + .../photologger/photo/domain/User.java | 2 + .../photo/mapper/AccountsMapper.java | 2 - .../photo/mapper/PaymentMapper.java | 21 +- .../photo/service/AccountsService.java | 19 +- .../photo/service/PaymentSerivce.java | 426 ++++++++++++++++-- .../src/main/resources/application.properties | 5 +- .../photo/mapper/PaymentMapper.xml | 83 +++- 30 files changed, 1061 insertions(+), 201 deletions(-) rename photo/src/main/java/com/example/photologger/photo/controller/{PaymentController.java => CashController.java} (56%) create mode 100644 photo/src/main/java/com/example/photologger/photo/controller/ItemController.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/Cart.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/Gallery.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/GalleryPrice.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/Order.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/PayJoin.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/ReturnGalleryHistory.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/SellerIdxCheck.java diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml index 5df55e7..16d4400 100644 --- a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml +++ b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e.xml @@ -1250,265 +1250,473 @@ test\\_%|schema||''||UPDATE|G
- +
+
+
+
+
+
+ 1 varchar(20)|0s 1 - + 2 varchar(20)|0s 1 - + 3 varchar(20)|0s 1 - + 4 varchar(20)|0s - + 5 varchar(30)|0s 1 - + 6 varchar(20)|0s 1 - + 1 identificationNumber 1 - + 1 int(11)|0s 1 null - + 2 int(11)|0s 1 - + 3 - varchar(40)|0s + varchar(100)|0s - + 4 datetime|0s 1 - + 5 int(11)|0s 1 - - 6 - varchar(12)|0s - 1 - - + 7 varchar(100)|0s 1 - + 8 varchar(300)|0s 1 - + 9 int(11)|0s - + + 6 + varchar(100)|0s + 1 + + + 10 + varchar(100)|0s + + + 11 + int(11)|0s + 0 + + idx btree - + 1 gallary_id 1 - + idx user idx - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 int(11)|0s 1 - + 2 - varchar(30)|0s + varchar(300)|0s - + 3 varchar(30)|0s 1 - + 4 varchar(12)|0s 1 - + 5 - varchar(12)|0s + varchar(50)|0s 1 - + 6 char(11)|0s 1 - + 7 varchar(3)|0s 1 - + 8 char(4)|0s 1 - + 9 char(2)|0s 1 - + 10 char(2)|0s 1 - + 11 varchar(200)|0s 1 - + 12 int(11)|0s 1 - + 13 int(11)|0s 1 - + 14 int(11)|0s 1 - + 15 int(1)|0s 1 0 - + + 1 + idx + 1 + + + 1 + int(11)|0s + 1 + + + 2 + int(8)|0s + 1 + + + 3 + varchar(20)|0s + 1 + + + 4 + datetime|0s + 1 + + + 5 + varchar(30)|0s + 1 + + + idx + btree + + + 1 + mid + 1 + + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + varchar(30)|0s + 1 + + + 3 + datetime|0s + 1 + + + 4 + int(11)|0s + 1 + + + idx + btree + + + gallary_id + btree + + + 1 + order_number + 1 + + + idx + user + idx + + + gallary_id + gallary + gallary_id + + + 1 + int(11)|0s + 1 + + + 2 + int(11)|0s + 1 + + + idx + btree + + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + int(10)|0s + 1 + 0 + + + 3 + int(10)|0s + 1 + 0 + + + 4 + int(10)|0s + 1 + 0 + + + 5 + int(10)|0s + 1 + 0 + + + 6 + int(10)|0s + 1 + 0 + + 1 idx 1 + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + int(10)|0s + + + 1 + gallary_id + 1 + + + gallary_id + gallary + gallary_id + + + 1 + int(11)|0s + 1 + + + 2 + int(11)|0s + 1 + + + gallery_id + btree + + + idx + btree + + + idx + user + idx + + + gallery_id + gallary + gallary_id + \ No newline at end of file diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat index 608e48bd80663488caa61de8685d0eafb261b530..6ee31e2cb67a55b42979f821b16983b752e4283a 100644 GIT binary patch delta 29 lcmZorXi(ss?X#Ot>oxd_ueIlnldmAGI!`csw8~r!(0|0&&2*m&Z diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values index fe3e0fb3780f669dd17bf6718e4bdc0d4b20c9eb..4c2ac2dc3c920df13c92a6f6068af09aa42e62bc 100644 GIT binary patch delta 17146 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 literal 31237 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 ZA7W(a2hu%2dIFGs0;DH$0`18%1^{wSBlQ3P diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fefbfc0..7081ca8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,23 +4,40 @@ + @@ -349,6 +379,20 @@ + + + + + + + + + + + + + + @@ -374,6 +418,16 @@
+
+
+
+
+
+ 1 varchar(20)|0s 1 - + 2 varchar(20)|0s 1 @@ -1280,443 +1286,242 @@ test\\_%|schema||''||UPDATE|G varchar(30)|0s 1 + 6 varchar(20)|0s 1 - + 1 identificationNumber 1 - + 1 int(11)|0s 1 null - + 2 int(11)|0s 1 - + 3 varchar(100)|0s - + 4 datetime|0s 1 - + 5 int(11)|0s 1 - + + 6 + varchar(12)|0s + 1 + + 7 varchar(100)|0s 1 - + 8 varchar(300)|0s 1 - + 9 int(11)|0s - - 6 - varchar(100)|0s - 1 - - - 10 - varchar(100)|0s - - - 11 - int(11)|0s - 0 - - + idx btree - + 1 gallary_id 1 - + idx user idx - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 int(11)|0s 1 - + 2 varchar(300)|0s - + 3 varchar(30)|0s 1 - + 4 varchar(12)|0s 1 - + 5 varchar(50)|0s 1 - + 6 char(11)|0s 1 - + 7 varchar(3)|0s 1 - + 8 char(4)|0s 1 - + 9 char(2)|0s 1 - + 10 char(2)|0s 1 - + 11 varchar(200)|0s 1 - + 12 int(11)|0s 1 - + 13 int(11)|0s 1 - + 14 int(11)|0s 1 - + 15 int(1)|0s 1 0 - + 1 idx 1 - - 1 - int(11)|0s - 1 - - - 2 - int(8)|0s - 1 - - - 3 - varchar(20)|0s - 1 - - - 4 - datetime|0s - 1 - - - 5 - varchar(30)|0s - 1 - - - idx - btree - - - 1 - mid - 1 - - - idx - user - idx - - - 1 - int(11)|0s - 1 - - - 2 - varchar(30)|0s - 1 - - - 3 - datetime|0s - 1 - - - 4 - int(11)|0s - 1 - - - idx - btree - - - gallary_id - btree - - - 1 - order_number - 1 - - - idx - user - idx - - - gallary_id - gallary - gallary_id - - - 1 - int(11)|0s - 1 - - - 2 - int(11)|0s - 1 - - - idx - btree - - - idx - user - idx - - - 1 - int(11)|0s - 1 - - - 2 - int(10)|0s - 1 - 0 - - - 3 - int(10)|0s - 1 - 0 - - - 4 - int(10)|0s - 1 - 0 - - - 5 - int(10)|0s - 1 - 0 - - - 6 - int(10)|0s - 1 - 0 - - - 1 - idx - 1 - - - idx - user - idx - - - 1 - int(11)|0s - 1 - - - 2 - int(10)|0s - - - 1 - gallary_id - 1 - - - gallary_id - gallary - gallary_id - - - 1 - int(11)|0s - 1 - - - 2 - int(11)|0s - 1 - - - gallery_id - btree - - - idx - btree - - - idx - user - idx - - - gallery_id - gallary - gallary_id - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c7a2d9d..961f07e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,10 +4,45 @@
-
-
-
-
-
- 1 varchar(20)|0s 1 - + 2 varchar(20)|0s 1 @@ -1286,242 +1280,443 @@ test\\_%|schema||''||UPDATE|G varchar(30)|0s 1 - 6 varchar(20)|0s 1 - + 1 identificationNumber 1 - + 1 int(11)|0s 1 null - + 2 int(11)|0s 1 - + 3 varchar(100)|0s - + 4 datetime|0s 1 - + 5 int(11)|0s 1 - - 6 - varchar(12)|0s - 1 - - + 7 varchar(100)|0s 1 - + 8 varchar(300)|0s 1 - + 9 int(11)|0s - + + 6 + varchar(100)|0s + 1 + + + 10 + varchar(100)|0s + + + 11 + int(11)|0s + 0 + + idx btree - + 1 gallary_id 1 - + idx user idx - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 bigint(21)|0s 1 - + 2 bigint(21)|0s 1 - + 3 bigint(21)|0s 1 - + 4 start value when sequences is created or value if RESTART is used bigint(21)|0s 1 - + 5 increment value bigint(21)|0s 1 - + 6 bigint(21) unsigned|0s 1 - + 7 0 if no cycles are allowed, 1 if the sequence should begin a new cycle when maximum_value is passed tinyint(1) unsigned|0s 1 - + 8 How many cycles have been done bigint(21)|0s 1 - + 1 int(11)|0s 1 - + 2 varchar(300)|0s - + 3 varchar(30)|0s 1 - + 4 varchar(12)|0s 1 - + 5 varchar(50)|0s 1 - + 6 char(11)|0s 1 - + 7 varchar(3)|0s 1 - + 8 char(4)|0s 1 - + 9 char(2)|0s 1 - + 10 char(2)|0s 1 - + 11 varchar(200)|0s 1 - + 12 int(11)|0s 1 - + 13 int(11)|0s 1 - + 14 int(11)|0s 1 - + 15 int(1)|0s 1 0 - + 1 idx 1 + + 1 + int(11)|0s + 1 + + + 2 + int(8)|0s + 1 + + + 3 + varchar(20)|0s + 1 + + + 4 + datetime|0s + 1 + + + 5 + varchar(30)|0s + 1 + + + idx + btree + + + 1 + mid + 1 + + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + varchar(30)|0s + 1 + + + 3 + datetime|0s + 1 + + + 4 + int(11)|0s + 1 + + + idx + btree + + + gallary_id + btree + + + 1 + order_number + 1 + + + idx + user + idx + + + gallary_id + gallary + gallary_id + + + 1 + int(11)|0s + 1 + + + 2 + int(11)|0s + 1 + + + idx + btree + + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + int(10)|0s + 1 + 0 + + + 3 + int(10)|0s + 1 + 0 + + + 4 + int(10)|0s + 1 + 0 + + + 5 + int(10)|0s + 1 + 0 + + + 6 + int(10)|0s + 1 + 0 + + + 1 + idx + 1 + + + idx + user + idx + + + 1 + int(11)|0s + 1 + + + 2 + int(10)|0s + + + 1 + gallary_id + 1 + + + gallary_id + gallary + gallary_id + + + 1 + int(11)|0s + 1 + + + 2 + int(11)|0s + 1 + + + gallery_id + btree + + + idx + btree + + + idx + user + idx + + + gallery_id + gallary + gallary_id + \ No newline at end of file diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat index 6ee31e2cb67a55b42979f821b16983b752e4283a..fe798c2758dba4c8d9e2460ed3b64d4b6df9d990 100644 GIT binary patch delta 21 dcmZorXi#9A?X#QD^zlSCH>U3f8~rx%0{~Km2h{)o delta 21 ccmZorXi#9A?X#Ot>-I!8H>Pl|jeeW>0Zl6g`~Uy| diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values index 4c2ac2dc3c920df13c92a6f6068af09aa42e62bc..68c751f0beea0b13c55d719ab03db01af2ae0a6c 100644 GIT binary patch delta 25 gcmZqf5`Ww%(a^%!!qmdt!m@>x`RMk?iYyPT0er#!qmdt!m@>x`6vKN9tOMs diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s index adc8348..092310e 100644 --- a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s +++ b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat.values.s @@ -1 +1 @@ -qaO[OQOQOQOPOPOPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPMPPNPPNPPNPPNPPNPPNPPNPP \ No newline at end of file +qaO[OQOQOQOPOPOPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPMPPNPPNPPNPPNPPNPPNPPNPPNPP \ No newline at end of file diff --git a/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat_i b/.idea/dataSources/00b6e4d6-edf0-493a-9249-804793f8ef3e/entities/entities.dat_i index 5921784c858601f487d993ee7ca4a0c85bdacb1c..66c5ff3bbf6e15ea38cdb07c4e485e2df6ae178b 100644 GIT binary patch delta 22 ccmZo@U}|V!;%3;!$jkr)`xw+Va(}G{06udC-T(jq delta 22 ccmZo@U}|V!;%3;!$jkr)`x;a>a(}G{06}R6TmS$7 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9fbc0c1..de03b43 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,18 +5,17 @@ + + + + + - - - - - - - - - - - + + + + + diff --git a/photo/src/main/java/com/example/photologger/photo/controller/AccountsController.java b/photo/src/main/java/com/example/photologger/photo/controller/AccountsController.java index 74a44a1..90ae431 100644 --- a/photo/src/main/java/com/example/photologger/photo/controller/AccountsController.java +++ b/photo/src/main/java/com/example/photologger/photo/controller/AccountsController.java @@ -44,7 +44,7 @@ public AccountsController(AccountsService accountsService, this.galleryService = galleryService; } - @PostMapping(value = "", consumes = MediaType.ALL_VALUE) + @PostMapping(value = "") public ResponseEntity JoIn( @RequestBody User user, @RequestParam(value = "images") MultipartFile multipartFile) throws IOException { diff --git a/photo/src/main/java/com/example/photologger/photo/controller/UserController.java b/photo/src/main/java/com/example/photologger/photo/controller/UserController.java index 251ec53..a0b9cd7 100644 --- a/photo/src/main/java/com/example/photologger/photo/controller/UserController.java +++ b/photo/src/main/java/com/example/photologger/photo/controller/UserController.java @@ -39,9 +39,10 @@ public User findUser( } // 아이디 찾기 - @GetMapping("/findId") - public String findUserId(@RequestBody User user) { - return "ok"; + @GetMapping("/findid") + public void findUserId(@RequestBody String name, String phoneNumber) { + userService.findId(name, phoneNumber); + } // 비밀번호 찾기 diff --git a/photo/src/main/java/com/example/photologger/photo/mapper/UserMapper.java b/photo/src/main/java/com/example/photologger/photo/mapper/UserMapper.java index 4247fd1..69dd1bf 100644 --- a/photo/src/main/java/com/example/photologger/photo/mapper/UserMapper.java +++ b/photo/src/main/java/com/example/photologger/photo/mapper/UserMapper.java @@ -7,16 +7,18 @@ @Mapper public interface UserMapper { - //특정 회원 정보 불러오기 + /* Show User One */ User findOne(@Param("idx") Integer idx); - //비밀번호 변경 + /* Change Password */ void updatePassword(User user); - //닉네임 변경 + /* Change NickName */ void updateName(User user); + /* Find Id*/ + void findId(String name, String phoneNumber); - //비밀번호 찾기 + /* Find Password */ User findPwd(User user); } diff --git a/photo/src/main/java/com/example/photologger/photo/service/UserService.java b/photo/src/main/java/com/example/photologger/photo/service/UserService.java index 7b27d63..e77930c 100644 --- a/photo/src/main/java/com/example/photologger/photo/service/UserService.java +++ b/photo/src/main/java/com/example/photologger/photo/service/UserService.java @@ -10,26 +10,28 @@ @Service public class UserService { - @Autowired UserMapper userMapper; - //맴버 조회 + /* Show User One */ public User findOne(Integer idx) { return userMapper.findOne(idx); } - //비밀번호 변경 + /* Change Password */ public void UpdatePassword(User user) { userMapper.updatePassword(user); } - //닉네임 변경 + /* Change NickName */ public void UpdateName(User user) { userMapper.updateName(user); } + /* Find Id*/ + public void findId(String name, String phoneNumber){ userMapper.findId(name, phoneNumber); } + /* Find Password */ public User findpwd(User user) { return userMapper.findPwd(user); } diff --git a/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml b/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml index 959c23e..34bfb7e 100644 --- a/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml +++ b/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml @@ -9,7 +9,7 @@ SELECT COUNT(*) FROM PHOTO.gallery g @@ -15,11 +42,13 @@ ; - - - - - - - - - - - - - - @@ -52,6 +38,7 @@ SELECT idx, subscribe_idx FROM subscribe_user WHERE idx = #{idx} + ORDER BY subscribe_idx From 337785db309f85bf1950b415643afb318e31b00d Mon Sep 17 00:00:00 2001 From: Jeonghoon2 Date: Tue, 23 Nov 2021 22:36:05 +0900 Subject: [PATCH 9/9] merge error fix --- ...heckout_at_2021_11_23_10_08___Changes_.xml | 4 + .../shelved.patch" | 30 ++++ ...heckout_at_2021_11_23_10_09___Changes_.xml | 4 + .../shelved.patch" | 132 ++++++++++++++++++ .../shelved.patch" | 0 .idea/sqldialects.xml | 7 + .idea/workspace.xml | 24 +++- .../photo/apidocument/CashControllerDocs.java | 35 +++++ .../photo/apidocument/itemControllerDocs.java | 34 +++++ .../photo/controller/CashController.java | 4 +- .../photologger/photo/domain/Cart.java | 3 + .../photo/domain/GalleryPrice.java | 3 + .../photologger/photo/domain/Order.java | 5 + .../photologger/photo/domain/PayJoin.java | 5 + .../photo/domain/PaymentHistory.java | 2 +- .../photo/domain/ReturnHistory.java | 7 +- .../photo/domain/ReturnPhotosForSale.java | 19 +++ .../photo/domain/ReturnSubScribe.java | 12 ++ .../photologger/photo/domain/ReturnUser.java | 3 + .../photo/domain/ReturnWithdrawal.java | 5 + .../photo/domain/SellerIdxCheck.java | 3 + .../photologger/photo/domain/Withdrawal.java | 5 + .../photo/mapper/PaymentMapper.java | 3 + .../photologger/photo/mapper/UserMapper.java | 11 ++ .../photo/service/AccountsService.java | 33 ++++- .../photo/service/PaymentSerivce.java | 5 +- .../photo/mapper/AccountsMapper.xml | 2 +- .../photo/mapper/PaymentMapper.xml | 10 ++ .../photologger/photo/mapper/UserMapper.xml | 12 ++ 29 files changed, 408 insertions(+), 14 deletions(-) create mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08___Changes_.xml create mode 100644 ".idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08_\354\230\244\355\233\204_[Changes]/shelved.patch" create mode 100644 .idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09___Changes_.xml create mode 100644 ".idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]/shelved.patch" create mode 100644 ".idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]1/shelved.patch" create mode 100644 .idea/sqldialects.xml create mode 100644 photo/src/main/java/com/example/photologger/photo/apidocument/CashControllerDocs.java create mode 100644 photo/src/main/java/com/example/photologger/photo/apidocument/itemControllerDocs.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/ReturnPhotosForSale.java create mode 100644 photo/src/main/java/com/example/photologger/photo/domain/ReturnSubScribe.java diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08___Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08___Changes_.xml new file mode 100644 index 0000000..5e74c3e --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08___Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08_\354\230\244\355\233\204_[Changes]/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08_\354\230\244\355\233\204_[Changes]/shelved.patch" new file mode 100644 index 0000000..1d4a37c --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_08_\354\230\244\355\233\204_[Changes]/shelved.patch" @@ -0,0 +1,30 @@ +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml (revision 76c79e88a3b51ad26e756b6714c80b742386f9cf) ++++ b/.idea/workspace.xml (date 1637672825920) +@@ -5,10 +5,7 @@ + + + +- + +- +- + + diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09___Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09___Changes_.xml new file mode 100644 index 0000000..b6b4d7d --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09___Changes_.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git "a/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]/shelved.patch" "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]/shelved.patch" new file mode 100644 index 0000000..c833d47 --- /dev/null +++ "b/.idea/shelf/Uncommitted_changes_before_Checkout_at_2021_11_23_10_09_\354\230\244\355\233\204_[Changes]/shelved.patch" @@ -0,0 +1,132 @@ +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n \n<<<<<<< HEAD\n=======\n \n \n>>>>>>> a990b919b6a1cab569a1939f370aefd4b13a3e87\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml ++++ b/.idea/workspace.xml +@@ -4,13 +4,11 @@ + diff --git a/photo/src/main/resources/com/example/photologger/photo/mapper/PaymentMapper.xml b/photo/src/main/resources/com/example/photologger/photo/mapper/PaymentMapper.xml index c2c71b6..5aec576 100644 --- a/photo/src/main/resources/com/example/photologger/photo/mapper/PaymentMapper.xml +++ b/photo/src/main/resources/com/example/photologger/photo/mapper/PaymentMapper.xml @@ -116,4 +116,14 @@ AND idx = #{idx} ORDER BY date ASC + + \ No newline at end of file diff --git a/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml b/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml index 34bfb7e..a75683f 100644 --- a/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml +++ b/photo/src/main/resources/com/example/photologger/photo/mapper/UserMapper.xml @@ -41,4 +41,16 @@ SET name = #{name} WHERE idx = #{idx} + + +