This commit is contained in:
Le Deng
2017-03-10 17:57:09 -05:00
parent eee2c66ecf
commit 59c7301aae
8 changed files with 137 additions and 109 deletions

View File

@@ -26,11 +26,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="ShippingResource.java" pinned="false" current-in-tab="true">
<file leaf-file-name="ShippingResource.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="49" column="50" lean-forward="false" selection-start-line="49" selection-start-column="50" selection-end-line="49" selection-end-column="50" />
<state relative-caret-position="143">
<caret line="49" column="4" lean-forward="false" selection-start-line="49" selection-start-column="4" selection-end-line="57" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -38,82 +38,32 @@
</provider>
</entry>
</file>
<file leaf-file-name="UserShipping.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserShipping.java">
<file leaf-file-name="PaymentResource.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#828#829#0" expanded="false" />
<element signature="e#853#854#0" expanded="false" />
<element signature="e#887#888#0" expanded="false" />
<element signature="e#915#916#0" expanded="false" />
<element signature="e#961#962#0" expanded="false" />
<element signature="e#1003#1004#0" expanded="false" />
<element signature="e#1073#1074#0" expanded="false" />
<element signature="e#1135#1136#0" expanded="false" />
<element signature="e#1181#1182#0" expanded="false" />
<element signature="e#1223#1224#0" expanded="false" />
<element signature="e#1293#1294#0" expanded="false" />
<element signature="e#1355#1356#0" expanded="false" />
<element signature="e#1398#1399#0" expanded="false" />
<element signature="e#1437#1438#0" expanded="false" />
<element signature="e#1501#1502#0" expanded="false" />
<element signature="e#1557#1558#0" expanded="false" />
<element signature="e#1601#1602#0" expanded="false" />
<element signature="e#1641#1642#0" expanded="false" />
<element signature="e#1707#1708#0" expanded="false" />
<element signature="e#1765#1766#0" expanded="false" />
<element signature="e#1811#1812#0" expanded="false" />
<element signature="e#1853#1854#0" expanded="false" />
<element signature="e#1923#1924#0" expanded="false" />
<element signature="e#1985#1986#0" expanded="false" />
<element signature="e#2031#2032#0" expanded="false" />
<element signature="e#2073#2074#0" expanded="false" />
<element signature="e#2143#2144#0" expanded="false" />
<element signature="e#2205#2206#0" expanded="false" />
<element signature="e#2234#2235#0" expanded="false" />
<element signature="e#2261#2262#0" expanded="false" />
<element signature="e#2299#2300#0" expanded="false" />
<element signature="e#2331#2332#0" expanded="false" />
<element signature="e#2377#2378#0" expanded="false" />
<element signature="e#2419#2420#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2552#2553#0" expanded="false" />
<element signature="e#2595#2596#0" expanded="false" />
<element signature="e#2634#2635#0" expanded="false" />
<element signature="e#2698#2699#0" expanded="false" />
<element signature="e#2754#2755#0" expanded="false" />
</folding>
<state relative-caret-position="563">
<caret line="113" column="30" lean-forward="false" selection-start-line="113" selection-start-column="30" selection-end-line="113" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShippingAddressServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/ShippingAddressServiceImpl.java">
<file leaf-file-name="Payment.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
<folding>
<element signature="imports" expanded="false" />
</folding>
<state relative-caret-position="270">
<caret line="23" column="35" lean-forward="true" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserShippingServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/service/impl/UserShippingServiceImpl.java">
<file leaf-file-name="UserPayment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserPayment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#536#537#0" expanded="false" />
<element signature="e#593#594#0" expanded="false" />
<element signature="e#632#633#0" expanded="false" />
<element signature="e#681#682#0" expanded="false" />
</folding>
<state relative-caret-position="150">
<caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
@@ -229,7 +179,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShoppingCart.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserPayment.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserBilling.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserShipping.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/UserResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Book.java" />
@@ -239,6 +188,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShoppingCartResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/domain/Order.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java" />
</list>
</option>
</component>
@@ -1038,12 +988,12 @@
<workItem from="1488378219247" duration="650000" />
<workItem from="1488461561430" duration="18419000" />
<workItem from="1488731165185" duration="30270000" />
<workItem from="1489159532831" duration="4235000" />
<workItem from="1489159532831" duration="4518000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="96517000" />
<option name="totallyTimeSpent" value="96800000" />
</component>
<component name="ToolWindowManager">
<frame x="72" y="23" width="1280" height="797" extended-state="0" />
@@ -1144,13 +1094,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/ShippingAddress.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@@ -1301,14 +1244,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserPayment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="29" column="15" lean-forward="false" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserBilling.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
@@ -1425,14 +1360,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="945">
<caret line="79" column="7" lean-forward="false" selection-start-line="47" selection-start-column="6" selection-end-line="79" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserShipping.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
@@ -1559,13 +1486,37 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/ShippingResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="49" column="50" lean-forward="false" selection-start-line="49" selection-start-column="50" selection-end-line="49" selection-end-column="50" />
<state relative-caret-position="143">
<caret line="49" column="4" lean-forward="false" selection-start-line="49" selection-start-column="4" selection-end-line="57" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/resource/PaymentResource.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="563">
<caret line="113" column="30" lean-forward="false" selection-start-line="113" selection-start-column="30" selection-end-line="113" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/UserPayment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/bookstore/domain/Payment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="23" column="35" lean-forward="true" selection-start-line="23" selection-start-column="35" selection-end-line="23" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

View File

@@ -3,6 +3,7 @@ package com.bookstore.resource;
import com.bookstore.domain.User;
import com.bookstore.domain.UserBilling;
import com.bookstore.domain.UserPayment;
import com.bookstore.domain.UserShipping;
import com.bookstore.service.UserPaymentService;
import com.bookstore.service.UserService;
import com.bookstore.utility.USConstants;
@@ -102,4 +103,14 @@ public class PaymentResource {
return new ResponseEntity("Set Default Payment Successfully!", HttpStatus.OK);
}
@RequestMapping(value = "/getUserPaymentList")
public List<UserPayment> getUserPaymentList(
Principal principal) {
User user = userService.findByUsername(principal.getName());
List<UserPayment> userPaymentList = user.getUserPaymentList();
return userPaymentList;
}
}