kelude / canrd-patent · Commits

Commit c1000e12da552daefd6133f2c1356f04bd6b6f5c

Authored by maoyangou
1 parent 0e22c93a

订单流程和支付流程

Inline Side-by-side
Showing 60 changed files with 992 additions and 752 deletions
.idea/workspace.xml
  View file @c1000e1
... ... @@ -2,34 +2,57 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="">
5   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
6   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
7   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" />
8   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" />
9   - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/error.jsp" />
10   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/HomePatentController.class" afterPath="" />
11   - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/HomePatentController.class" afterPath="" />
12   - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/HomePatentService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java" />
13   - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" />
14   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/CaseHandlingService.class" />
15   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/CaseHandlingService.class" />
16   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/IndexController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/IndexController.class" />
17   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/IndexController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/IndexController.class" />
  5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
  7 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/notice.jsp" />
  8 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
  9 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
  10 + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/PaymentMapper.java" afterPath="" />
  11 + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Payment.java" afterPath="" />
  12 + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/PaymentExample.java" afterPath="" />
  13 + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" afterPath="" />
  14 + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" afterPath="" />
  15 + <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/resources/mapper/PaymentMapper.xml" afterPath="" />
  16 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/mapper/PaymentMapper.class" afterPath="" />
  17 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/Payment.class" afterPath="" />
  18 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class" afterPath="" />
  19 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class" afterPath="" />
  20 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class" afterPath="" />
  21 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/model/PaymentExample.class" afterPath="" />
  22 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/service/PaymentService.class" afterPath="" />
  23 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/PaymentDataController.class" afterPath="" />
  24 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/PaymentPageController.class" afterPath="" />
  25 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/classes/mapper/PaymentMapper.xml" afterPath="" />
  26 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/mapper/PaymentMapper.class" afterPath="" />
  27 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Payment.class" afterPath="" />
  28 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class" afterPath="" />
  29 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class" afterPath="" />
  30 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class" afterPath="" />
  31 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample.class" afterPath="" />
  32 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/service/PaymentService.class" afterPath="" />
  33 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentDataController.class" afterPath="" />
  34 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentPageController.class" afterPath="" />
  35 + <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/PaymentMapper.xml" afterPath="" />
  36 + <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" />
  37 + <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/case-detail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_detail.jsp" />
  38 + <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" />
  39 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/web/CasementPageController.class" />
  40 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class" />
  41 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/test-classes/com/canrd/patent/CommonTest.class" afterPath="$PROJECT_DIR$/target/test-classes/com/canrd/patent/CommonTest.class" />
18 42 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb.bak" afterPath="$PROJECT_DIR$/doc/patent.mwb.bak" />
19   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
20   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" />
21   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" />
  43 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
  44 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java" afterPath="$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java" />
  45 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/error.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/error.jsp" />
  46 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/error.jsp" afterPath="$PROJECT_DIR$/target/patent/error.jsp" />
22 47 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
23 48 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" />
24   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
25   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/home_patent.jsp" afterPath="$PROJECT_DIR$/target/patent/home_patent.jsp" />
  49 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/logback.xml" afterPath="$PROJECT_DIR$/src/main/resources.local/logback.xml" />
  50 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/logback.xml" afterPath="$PROJECT_DIR$/target/classes/logback.xml" />
  51 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/logback.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/logback.xml" />
26 52 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/patent.mwb" afterPath="$PROJECT_DIR$/doc/patent.mwb" />
27 53 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/pay.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
28 54 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/pay.jsp" afterPath="$PROJECT_DIR$/target/patent/pay.jsp" />
29   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
30   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/springmvc-servlet.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/springmvc-servlet.xml" />
31 55 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
32   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/manual/开发规范.txt" afterPath="$PROJECT_DIR$/doc/manual/开发规范.txt" />
33 56 </list>
34 57 <ignored path="patent.iws" />
35 58 <ignored path=".idea/workspace.xml" />
... ... @@ -52,45 +75,105 @@
52 75 </component>
53 76 <component name="FileEditorManager">
54 77 <leaf>
55   - <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false">
56   - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
  78 + <file leaf-file-name="OrderPageController.java" pinned="false" current-in-tab="true">
  79 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
57 80 <provider selected="true" editor-type-id="text-editor">
58   - <state vertical-scroll-proportion="6.25">
59   - <caret line="38" column="16" selection-start-line="38" selection-start-column="16" selection-end-line="45" selection-end-column="23" />
  81 + <state vertical-scroll-proportion="3.0097086">
  82 + <caret line="83" column="0" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
60 83 <folding />
61 84 </state>
62 85 </provider>
63 86 </entry>
64 87 </file>
65   - <file leaf-file-name="PaymentPageController.java" pinned="false" current-in-tab="true">
66   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java">
  88 + <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
67 90 <provider selected="true" editor-type-id="text-editor">
68   - <state vertical-scroll-proportion="0.58563536">
69   - <caret line="22" column="47" selection-start-line="22" selection-start-column="47" selection-end-line="22" selection-end-column="47" />
70   - <folding>
71   - <element signature="imports" expanded="true" />
72   - </folding>
  91 + <state vertical-scroll-proportion="0.0">
  92 + <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
  93 + <folding />
  94 + </state>
  95 + </provider>
  96 + </entry>
  97 + </file>
  98 + <file leaf-file-name="error.jsp" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
  100 + <provider selected="true" editor-type-id="text-editor">
  101 + <state vertical-scroll-proportion="-3.75">
  102 + <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
  103 + <folding />
  104 + </state>
  105 + </provider>
  106 + </entry>
  107 + </file>
  108 + <file leaf-file-name="order_detail.jsp" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
  110 + <provider selected="true" editor-type-id="text-editor">
  111 + <state vertical-scroll-proportion="-16.25">
  112 + <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
  113 + <folding />
73 114 </state>
74 115 </provider>
75 116 </entry>
76 117 </file>
77   - <file leaf-file-name="PaymentService.java" pinned="false" current-in-tab="false">
78   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java">
  118 + <file leaf-file-name="Assert.java" pinned="false" current-in-tab="false">
  119 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
79 120 <provider selected="true" editor-type-id="text-editor">
80 121 <state vertical-scroll-proportion="0.0">
81   - <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
  122 + <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
  123 + <folding />
  124 + </state>
  125 + </provider>
  126 + </entry>
  127 + </file>
  128 + <file leaf-file-name="OrderService.java" pinned="false" current-in-tab="false">
  129 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
  130 + <provider selected="true" editor-type-id="text-editor">
  131 + <state vertical-scroll-proportion="0.0">
  132 + <caret line="75" column="23" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
82 133 <folding>
83 134 <element signature="imports" expanded="true" />
  135 + <element signature="e#1787#1788#0" expanded="true" />
  136 + <element signature="e#1849#1850#0" expanded="true" />
84 137 </folding>
85 138 </state>
86 139 </provider>
87 140 </entry>
88 141 </file>
89   - <file leaf-file-name="pay.jsp" pinned="false" current-in-tab="false">
90   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  142 + <file leaf-file-name="pay_result.jsp" pinned="false" current-in-tab="false">
  143 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
  144 + <provider selected="true" editor-type-id="text-editor">
  145 + <state vertical-scroll-proportion="-15.625">
  146 + <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
  147 + <folding />
  148 + </state>
  149 + </provider>
  150 + </entry>
  151 + </file>
  152 + <file leaf-file-name="notice.jsp" pinned="false" current-in-tab="false">
  153 + <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
91 154 <provider selected="true" editor-type-id="text-editor">
92   - <state vertical-scroll-proportion="-40.72549">
93   - <caret line="164" column="48" selection-start-line="164" selection-start-column="48" selection-end-line="164" selection-end-column="48" />
  155 + <state vertical-scroll-proportion="-16.875">
  156 + <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
  157 + <folding />
  158 + </state>
  159 + </provider>
  160 + </entry>
  161 + </file>
  162 + <file leaf-file-name="OrderDataController.java" pinned="false" current-in-tab="false">
  163 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
  164 + <provider selected="true" editor-type-id="text-editor">
  165 + <state vertical-scroll-proportion="0.0">
  166 + <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
  167 + <folding />
  168 + </state>
  169 + </provider>
  170 + </entry>
  171 + </file>
  172 + <file leaf-file-name="OrderMapper.java" pinned="false" current-in-tab="false">
  173 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java">
  174 + <provider selected="true" editor-type-id="text-editor">
  175 + <state vertical-scroll-proportion="0.0">
  176 + <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
94 177 <folding />
95 178 </state>
96 179 </provider>
... ... @@ -120,15 +203,6 @@
120 203 <component name="IdeDocumentHistory">
121 204 <option name="CHANGED_PATHS">
122 205 <list>
123   - <option value="$PROJECT_DIR$/src/main/webapp/service.jsp" />
124   - <option value="$PROJECT_DIR$/src/main/resources.local/props/application.properties" />
125   - <option value="$PROJECT_DIR$/src/main/resources.prod/props/application.properties" />
126   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/FrontConstant.java" />
127   - <option value="$PROJECT_DIR$/src/main/webapp/js/index.js" />
128   - <option value="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" />
129   - <option value="$PROJECT_DIR$/pom.xml" />
130   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java" />
131   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java" />
132 206 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseType.java" />
133 207 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java" />
134 208 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PriceEnum.java" />
... ... @@ -155,7 +229,6 @@
155 229 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java" />
156 230 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java" />
157 231 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentController.java" />
158   - <option value="$PROJECT_DIR$/src/main/webapp/error.jsp" />
159 232 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" />
160 233 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
161 234 <option value="$PROJECT_DIR$/doc/manual/开发规范.txt" />
... ... @@ -163,14 +236,24 @@
163 236 <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
164 237 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java" />
165 238 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentDataController.java" />
166   - <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
167 239 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" />
168 240 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
169   - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
170 241 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java" />
  242 + <option value="$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java" />
  243 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java" />
  244 + <option value="$PROJECT_DIR$/src/main/webapp/pay-result.jsp" />
  245 + <option value="$PROJECT_DIR$/src/main/webapp/error.jsp" />
171 246 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java" />
172   - <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
173 247 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java" />
  248 + <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
  249 + <option value="$PROJECT_DIR$/src/main/resources.local/logback.xml" />
  250 + <option value="$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml" />
  251 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java" />
  252 + <option value="$PROJECT_DIR$/src/main/webapp/order_detail.jsp" />
  253 + <option value="$PROJECT_DIR$/src/main/webapp/notice.jsp" />
  254 + <option value="$PROJECT_DIR$/src/main/webapp/pay_result.jsp" />
  255 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java" />
  256 + <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java" />
174 257 </list>
175 258 </option>
176 259 </component>
... ... @@ -253,9 +336,10 @@
253 336 <order />
254 337 </component>
255 338 <component name="ProjectFrameBounds">
  339 + <option name="x" value="1280" />
256 340 <option name="y" value="23" />
257   - <option name="width" value="1280" />
258   - <option name="height" value="734" />
  341 + <option name="width" value="1920" />
  342 + <option name="height" value="1057" />
259 343 </component>
260 344 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
261 345 <OptionsSetting value="true" id="Add" />
... ... @@ -280,9 +364,6 @@
280 364 <sortByType />
281 365 </navigator>
282 366 <panes>
283   - <pane id="PackagesPane" />
284   - <pane id="Scratches" />
285   - <pane id="Scope" />
286 367 <pane id="ProjectPane">
287 368 <subPane>
288 369 <PATH>
... ... @@ -301,254 +382,11 @@
301 382 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
302 383 </PATH_ELEMENT>
303 384 </PATH>
304   - <PATH>
305   - <PATH_ELEMENT>
306   - <option name="myItemId" value="patent" />
307   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
308   - </PATH_ELEMENT>
309   - <PATH_ELEMENT>
310   - <option name="myItemId" value="canrd-patent" />
311   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
312   - </PATH_ELEMENT>
313   - <PATH_ELEMENT>
314   - <option name="myItemId" value="src" />
315   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
316   - </PATH_ELEMENT>
317   - <PATH_ELEMENT>
318   - <option name="myItemId" value="test" />
319   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
320   - </PATH_ELEMENT>
321   - <PATH_ELEMENT>
322   - <option name="myItemId" value="resources" />
323   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
324   - </PATH_ELEMENT>
325   - </PATH>
326   - <PATH>
327   - <PATH_ELEMENT>
328   - <option name="myItemId" value="patent" />
329   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
330   - </PATH_ELEMENT>
331   - <PATH_ELEMENT>
332   - <option name="myItemId" value="canrd-patent" />
333   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
334   - </PATH_ELEMENT>
335   - <PATH_ELEMENT>
336   - <option name="myItemId" value="src" />
337   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
338   - </PATH_ELEMENT>
339   - <PATH_ELEMENT>
340   - <option name="myItemId" value="test" />
341   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
342   - </PATH_ELEMENT>
343   - <PATH_ELEMENT>
344   - <option name="myItemId" value="resources" />
345   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
346   - </PATH_ELEMENT>
347   - <PATH_ELEMENT>
348   - <option name="myItemId" value="mbg" />
349   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
350   - </PATH_ELEMENT>
351   - </PATH>
352   - <PATH>
353   - <PATH_ELEMENT>
354   - <option name="myItemId" value="patent" />
355   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
356   - </PATH_ELEMENT>
357   - <PATH_ELEMENT>
358   - <option name="myItemId" value="canrd-patent" />
359   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
360   - </PATH_ELEMENT>
361   - <PATH_ELEMENT>
362   - <option name="myItemId" value="src" />
363   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
364   - </PATH_ELEMENT>
365   - <PATH_ELEMENT>
366   - <option name="myItemId" value="test" />
367   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
368   - </PATH_ELEMENT>
369   - </PATH>
370   - <PATH>
371   - <PATH_ELEMENT>
372   - <option name="myItemId" value="patent" />
373   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
374   - </PATH_ELEMENT>
375   - <PATH_ELEMENT>
376   - <option name="myItemId" value="canrd-patent" />
377   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
378   - </PATH_ELEMENT>
379   - <PATH_ELEMENT>
380   - <option name="myItemId" value="src" />
381   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
382   - </PATH_ELEMENT>
383   - <PATH_ELEMENT>
384   - <option name="myItemId" value="main" />
385   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
386   - </PATH_ELEMENT>
387   - <PATH_ELEMENT>
388   - <option name="myItemId" value="webapp" />
389   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
390   - </PATH_ELEMENT>
391   - </PATH>
392   - <PATH>
393   - <PATH_ELEMENT>
394   - <option name="myItemId" value="patent" />
395   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
396   - </PATH_ELEMENT>
397   - <PATH_ELEMENT>
398   - <option name="myItemId" value="canrd-patent" />
399   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
400   - </PATH_ELEMENT>
401   - <PATH_ELEMENT>
402   - <option name="myItemId" value="src" />
403   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
404   - </PATH_ELEMENT>
405   - <PATH_ELEMENT>
406   - <option name="myItemId" value="main" />
407   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
408   - </PATH_ELEMENT>
409   - </PATH>
410   - <PATH>
411   - <PATH_ELEMENT>
412   - <option name="myItemId" value="patent" />
413   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
414   - </PATH_ELEMENT>
415   - <PATH_ELEMENT>
416   - <option name="myItemId" value="canrd-patent" />
417   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
418   - </PATH_ELEMENT>
419   - <PATH_ELEMENT>
420   - <option name="myItemId" value="src" />
421   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
422   - </PATH_ELEMENT>
423   - <PATH_ELEMENT>
424   - <option name="myItemId" value="main" />
425   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
426   - </PATH_ELEMENT>
427   - <PATH_ELEMENT>
428   - <option name="myItemId" value="resources" />
429   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
430   - </PATH_ELEMENT>
431   - </PATH>
432   - <PATH>
433   - <PATH_ELEMENT>
434   - <option name="myItemId" value="patent" />
435   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
436   - </PATH_ELEMENT>
437   - <PATH_ELEMENT>
438   - <option name="myItemId" value="canrd-patent" />
439   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
440   - </PATH_ELEMENT>
441   - <PATH_ELEMENT>
442   - <option name="myItemId" value="src" />
443   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
444   - </PATH_ELEMENT>
445   - <PATH_ELEMENT>
446   - <option name="myItemId" value="main" />
447   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
448   - </PATH_ELEMENT>
449   - <PATH_ELEMENT>
450   - <option name="myItemId" value="java" />
451   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
452   - </PATH_ELEMENT>
453   - <PATH_ELEMENT>
454   - <option name="myItemId" value="patent" />
455   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
456   - </PATH_ELEMENT>
457   - <PATH_ELEMENT>
458   - <option name="myItemId" value="web" />
459   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
460   - </PATH_ELEMENT>
461   - </PATH>
462   - <PATH>
463   - <PATH_ELEMENT>
464   - <option name="myItemId" value="patent" />
465   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
466   - </PATH_ELEMENT>
467   - <PATH_ELEMENT>
468   - <option name="myItemId" value="canrd-patent" />
469   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
470   - </PATH_ELEMENT>
471   - <PATH_ELEMENT>
472   - <option name="myItemId" value="src" />
473   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
474   - </PATH_ELEMENT>
475   - <PATH_ELEMENT>
476   - <option name="myItemId" value="main" />
477   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
478   - </PATH_ELEMENT>
479   - <PATH_ELEMENT>
480   - <option name="myItemId" value="java" />
481   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
482   - </PATH_ELEMENT>
483   - <PATH_ELEMENT>
484   - <option name="myItemId" value="patent" />
485   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
486   - </PATH_ELEMENT>
487   - <PATH_ELEMENT>
488   - <option name="myItemId" value="service" />
489   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
490   - </PATH_ELEMENT>
491   - </PATH>
492   - <PATH>
493   - <PATH_ELEMENT>
494   - <option name="myItemId" value="patent" />
495   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
496   - </PATH_ELEMENT>
497   - <PATH_ELEMENT>
498   - <option name="myItemId" value="canrd-patent" />
499   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
500   - </PATH_ELEMENT>
501   - <PATH_ELEMENT>
502   - <option name="myItemId" value="src" />
503   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
504   - </PATH_ELEMENT>
505   - <PATH_ELEMENT>
506   - <option name="myItemId" value="main" />
507   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
508   - </PATH_ELEMENT>
509   - <PATH_ELEMENT>
510   - <option name="myItemId" value="java" />
511   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
512   - </PATH_ELEMENT>
513   - <PATH_ELEMENT>
514   - <option name="myItemId" value="patent" />
515   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
516   - </PATH_ELEMENT>
517   - </PATH>
518   - <PATH>
519   - <PATH_ELEMENT>
520   - <option name="myItemId" value="patent" />
521   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
522   - </PATH_ELEMENT>
523   - <PATH_ELEMENT>
524   - <option name="myItemId" value="canrd-patent" />
525   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
526   - </PATH_ELEMENT>
527   - <PATH_ELEMENT>
528   - <option name="myItemId" value="doc" />
529   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
530   - </PATH_ELEMENT>
531   - </PATH>
532   - <PATH>
533   - <PATH_ELEMENT>
534   - <option name="myItemId" value="patent" />
535   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
536   - </PATH_ELEMENT>
537   - <PATH_ELEMENT>
538   - <option name="myItemId" value="canrd-patent" />
539   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
540   - </PATH_ELEMENT>
541   - <PATH_ELEMENT>
542   - <option name="myItemId" value="doc" />
543   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
544   - </PATH_ELEMENT>
545   - <PATH_ELEMENT>
546   - <option name="myItemId" value="manual" />
547   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
548   - </PATH_ELEMENT>
549   - </PATH>
550 385 </subPane>
551 386 </pane>
  387 + <pane id="Scope" />
  388 + <pane id="PackagesPane" />
  389 + <pane id="Scratches" />
552 390 </panes>
553 391 </component>
554 392 <component name="PropertiesComponent">
... ... @@ -567,6 +405,7 @@
567 405 <property name="OverrideImplement.combined" value="true" />
568 406 <property name="OverrideImplement.overriding.sorted" value="false" />
569 407 <property name="extract.method.default.visibility" value="private" />
  408 + <property name="last_opened_file_path" value="$USER_HOME$/ToolUtil.class" />
570 409 </component>
571 410 <component name="RecentsManager">
572 411 <key name="CopyClassDialog.RECENTS_KEY">
... ... @@ -1032,37 +871,39 @@
1032 871 <workItem from="1468748693910" duration="7618000" />
1033 872 <workItem from="1468885739175" duration="14625000" />
1034 873 <workItem from="1469026864774" duration="4528000" />
1035   - <workItem from="1469112269396" duration="5853000" />
  874 + <workItem from="1469112269396" duration="6881000" />
  875 + <workItem from="1469242140776" duration="1637000" />
  876 + <workItem from="1469243959439" duration="3634000" />
1036 877 </task>
1037 878 <servers />
1038 879 </component>
1039 880 <component name="TimeTrackingManager">
1040   - <option name="totallyTimeSpent" value="75190000" />
  881 + <option name="totallyTimeSpent" value="81489000" />
1041 882 </component>
1042 883 <component name="ToolWindowManager">
1043   - <frame x="0" y="23" width="1280" height="734" extended-state="6" />
1044   - <editor active="true" />
  884 + <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
  885 + <editor active="false" />
1045 886 <layout>
1046 887 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
1047 888 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
1048 889 <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1049   - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22274144" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  890 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.6507772" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1050 891 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1051   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44548288" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  892 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32435232" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
1052 893 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
1053 894 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1054 895 <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1055   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3504673" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  896 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5316062" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1056 897 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
1057 898 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
1058   - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
  899 + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1059 900 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.31619936" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1060 901 <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
1061 902 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
1062 903 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
1063   - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1292407" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
  904 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10915868" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1064 905 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1065   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19789983" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  906 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15601704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
1066 907 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36165804" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
1067 908 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
1068 909 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
... ... @@ -1112,7 +953,7 @@
1112 953 </component>
1113 954 <component name="XDebuggerManager">
1114 955 <breakpoint-manager>
1115   - <option name="time" value="21" />
  956 + <option name="time" value="23" />
1116 957 </breakpoint-manager>
1117 958 <watches-manager>
1118 959 <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
... ... @@ -1128,364 +969,294 @@
1128 969 <option name="FILTER_TARGETS" value="false" />
1129 970 </component>
1130 971 <component name="editorHistoryManager">
1131   - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/src.zip!/java/lang/String.java">
  972 + <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js">
1132 973 <provider selected="true" editor-type-id="text-editor">
1133 974 <state vertical-scroll-proportion="0.0">
1134   - <caret line="2980" column="25" selection-start-line="2980" selection-start-column="25" selection-end-line="2980" selection-end-column="25" />
1135   - <folding>
1136   - <element signature="e#117557#117558#0" expanded="false" />
1137   - <element signature="e#117619#117620#0" expanded="false" />
1138   - </folding>
  975 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1139 976 </state>
1140 977 </provider>
1141 978 </entry>
1142   - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_45.jdk/Contents/Home/src.zip!/java/lang/Enum.java">
  979 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java">
1143 980 <provider selected="true" editor-type-id="text-editor">
1144 981 <state vertical-scroll-proportion="0.0">
1145   - <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
  982 + <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
1146 983 </state>
1147 984 </provider>
1148 985 </entry>
1149   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/StringUtils.java">
  986 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_manage.jsp">
1150 987 <provider selected="true" editor-type-id="text-editor">
1151   - <state vertical-scroll-proportion="0.0">
1152   - <caret line="82" column="26" selection-start-line="82" selection-start-column="26" selection-end-line="82" selection-end-column="26" />
1153   - <folding>
1154   - <element signature="e#2894#2895#0" expanded="false" />
1155   - <element signature="e#2939#2940#0" expanded="false" />
1156   - </folding>
  988 + <state vertical-scroll-proportion="7.9166665">
  989 + <caret line="197" column="60" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" />
1157 990 </state>
1158 991 </provider>
1159 992 </entry>
1160   - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
  993 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
1161 994 <provider selected="true" editor-type-id="text-editor">
1162 995 <state vertical-scroll-proportion="0.0">
1163   - <caret line="23" column="42" selection-start-line="23" selection-start-column="42" selection-end-line="23" selection-end-column="42" />
1164   - <folding />
  996 + <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
1165 997 </state>
1166 998 </provider>
1167 999 </entry>
1168   - <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
  1000 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java">
1169 1001 <provider selected="true" editor-type-id="text-editor">
1170 1002 <state vertical-scroll-proportion="0.0">
1171   - <caret line="13" column="9" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="9" />
1172   - <folding />
1173   - </state>
1174   - </provider>
1175   - </entry>
1176   - <entry file="file://$PROJECT_DIR$/src/main/webapp/case-detail.jsp">
1177   - <provider selected="true" editor-type-id="text-editor">
1178   - <state vertical-scroll-proportion="-3.75">
1179   - <caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
1180   - <folding />
  1003 + <caret line="137" column="28" selection-start-line="137" selection-start-column="28" selection-end-line="137" selection-end-column="28" />
1181 1004 </state>
1182 1005 </provider>
1183 1006 </entry>
1184   - <entry file="file://$PROJECT_DIR$/src/main/webapp/service.jsp">
  1007 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java">
1185 1008 <provider selected="true" editor-type-id="text-editor">
1186   - <state vertical-scroll-proportion="-78.916664">
1187   - <caret line="231" column="61" selection-start-line="231" selection-start-column="61" selection-end-line="231" selection-end-column="61" />
1188   - <folding />
  1009 + <state vertical-scroll-proportion="0.0">
  1010 + <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
  1011 + <folding>
  1012 + <element signature="e#2334#2335#0" expanded="false" />
  1013 + <element signature="e#2389#2390#0" expanded="false" />
  1014 + </folding>
1189 1015 </state>
1190 1016 </provider>
1191 1017 </entry>
1192   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ServiceTypeEnum.java">
  1018 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/standard/StdJson.java">
1193 1019 <provider selected="true" editor-type-id="text-editor">
1194 1020 <state vertical-scroll-proportion="0.0">
1195   - <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="10" selection-end-column="31" />
  1021 + <caret line="55" column="24" selection-start-line="55" selection-start-column="24" selection-end-line="55" selection-end-column="24" />
1196 1022 </state>
1197 1023 </provider>
1198 1024 </entry>
1199   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.2.3.RELEASE/spring-tx-4.2.3.RELEASE.jar!/org/springframework/transaction/annotation/Transactional.class">
  1025 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java">
1200 1026 <provider selected="true" editor-type-id="text-editor">
1201   - <state vertical-scroll-proportion="-5.5555553">
1202   - <caret line="21" column="18" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
  1027 + <state vertical-scroll-proportion="0.0">
  1028 + <caret line="184" column="20" selection-start-line="184" selection-start-column="20" selection-end-line="184" selection-end-column="20" />
1203 1029 </state>
1204 1030 </provider>
1205 1031 </entry>
1206   - <entry file="file://$PROJECT_DIR$/doc/sql/ddl.sql">
1207   - <provider editor-type-id="com.intellij.database.editor.CsvTableFileEditorProvider">
1208   - <state />
1209   - </provider>
  1032 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java">
1210 1033 <provider selected="true" editor-type-id="text-editor">
1211   - <state vertical-scroll-proportion="-1.1111112">
1212   - <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
  1034 + <state vertical-scroll-proportion="0.0">
  1035 + <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
1213 1036 </state>
1214 1037 </provider>
1215 1038 </entry>
1216   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/query/CaseQuery.java">
  1039 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java">
1217 1040 <provider selected="true" editor-type-id="text-editor">
1218 1041 <state vertical-scroll-proportion="0.0">
1219   - <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
  1042 + <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="16" selection-end-column="31" />
  1043 + <folding />
1220 1044 </state>
1221 1045 </provider>
1222 1046 </entry>
1223   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">
  1047 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java">
1224 1048 <provider selected="true" editor-type-id="text-editor">
1225 1049 <state vertical-scroll-proportion="0.0">
1226   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1227   - <folding />
  1050 + <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
1228 1051 </state>
1229 1052 </provider>
1230 1053 </entry>
1231   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css">
  1054 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
1232 1055 <provider selected="true" editor-type-id="text-editor">
1233 1056 <state vertical-scroll-proportion="0.0">
1234   - <caret line="89" column="16" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
  1057 + <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
1235 1058 </state>
1236 1059 </provider>
1237 1060 </entry>
1238   - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/footer.jsp">
  1061 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
1239 1062 <provider selected="true" editor-type-id="text-editor">
1240   - <state vertical-scroll-proportion="0.0">
1241   - <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="62" />
  1063 + <state vertical-scroll-proportion="0.22900763">
  1064 + <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
1242 1065 <folding />
1243 1066 </state>
1244 1067 </provider>
1245 1068 </entry>
1246   - <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js">
  1069 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">
1247 1070 <provider selected="true" editor-type-id="text-editor">
1248   - <state vertical-scroll-proportion="0.0">
1249   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1071 + <state vertical-scroll-proportion="0.13686131">
  1072 + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
1250 1073 </state>
1251 1074 </provider>
1252 1075 </entry>
1253   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java">
  1076 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">
1254 1077 <provider selected="true" editor-type-id="text-editor">
1255   - <state vertical-scroll-proportion="0.0">
1256   - <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
  1078 + <state vertical-scroll-proportion="0.3448905">
  1079 + <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
1257 1080 </state>
1258 1081 </provider>
1259 1082 </entry>
1260   - <entry file="file://$PROJECT_DIR$/src/main/webapp/case-manage.jsp">
  1083 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
1261 1084 <provider selected="true" editor-type-id="text-editor">
1262   - <state vertical-scroll-proportion="7.9166665">
1263   - <caret line="197" column="60" selection-start-line="197" selection-start-column="60" selection-end-line="197" selection-end-column="60" />
1264   - <folding />
  1085 + <state vertical-scroll-proportion="0.61496353">
  1086 + <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
1265 1087 </state>
1266 1088 </provider>
1267 1089 </entry>
1268   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
  1090 + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
1269 1091 <provider selected="true" editor-type-id="text-editor">
1270   - <state vertical-scroll-proportion="0.0">
1271   - <caret line="41" column="1" selection-start-line="41" selection-start-column="1" selection-end-line="41" selection-end-column="1" />
  1092 + <state vertical-scroll-proportion="-12.5">
  1093 + <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="21" />
1272 1094 </state>
1273 1095 </provider>
1274 1096 </entry>
1275   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java">
  1097 + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml">
1276 1098 <provider selected="true" editor-type-id="text-editor">
1277 1099 <state vertical-scroll-proportion="0.0">
1278   - <caret line="137" column="28" selection-start-line="137" selection-start-column="28" selection-end-line="137" selection-end-column="28" />
  1100 + <caret line="15" column="43" selection-start-line="15" selection-start-column="43" selection-end-line="15" selection-end-column="43" />
  1101 + <folding />
1279 1102 </state>
1280 1103 </provider>
1281 1104 </entry>
1282   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
  1105 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
1283 1106 <provider selected="true" editor-type-id="text-editor">
1284 1107 <state vertical-scroll-proportion="0.0">
1285   - <caret line="89" column="23" selection-start-line="89" selection-start-column="23" selection-end-line="89" selection-end-column="23" />
  1108 + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
1286 1109 <folding />
1287 1110 </state>
1288 1111 </provider>
1289 1112 </entry>
1290   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java">
  1113 + <entry file="file://$PROJECT_DIR$/doc/manual/开发注意.txt">
1291 1114 <provider selected="true" editor-type-id="text-editor">
1292 1115 <state vertical-scroll-proportion="0.0">
1293   - <caret line="76" column="0" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
1294   - <folding>
1295   - <element signature="e#2334#2335#0" expanded="false" />
1296   - <element signature="e#2389#2390#0" expanded="false" />
1297   - </folding>
  1116 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1298 1117 </state>
1299 1118 </provider>
1300 1119 </entry>
1301   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/standard/StdJson.java">
  1120 + <entry file="file://$PROJECT_DIR$/doc/manual/开发规范.txt">
1302 1121 <provider selected="true" editor-type-id="text-editor">
1303 1122 <state vertical-scroll-proportion="0.0">
1304   - <caret line="55" column="24" selection-start-line="55" selection-start-column="24" selection-end-line="55" selection-end-column="24" />
1305   - <folding>
1306   - <element signature="e#1351#1352#0" expanded="false" />
1307   - <element signature="e#1419#1420#0" expanded="false" />
1308   - </folding>
  1123 + <caret line="6" column="37" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
1309 1124 </state>
1310 1125 </provider>
1311 1126 </entry>
1312   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java">
  1127 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
1313 1128 <provider selected="true" editor-type-id="text-editor">
1314 1129 <state vertical-scroll-proportion="0.0">
1315   - <caret line="184" column="20" selection-start-line="184" selection-start-column="20" selection-end-line="184" selection-end-column="20" />
1316   - <folding />
  1130 + <caret line="111" column="73" selection-start-line="111" selection-start-column="73" selection-end-line="111" selection-end-column="73" />
1317 1131 </state>
1318 1132 </provider>
1319 1133 </entry>
1320   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/AbstractEnum.java">
  1134 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
1321 1135 <provider selected="true" editor-type-id="text-editor">
1322 1136 <state vertical-scroll-proportion="0.0">
1323   - <caret line="11" column="28" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
  1137 + <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
1324 1138 </state>
1325 1139 </provider>
1326 1140 </entry>
1327   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseTypeEnum.java">
  1141 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
1328 1142 <provider selected="true" editor-type-id="text-editor">
1329 1143 <state vertical-scroll-proportion="0.0">
1330   - <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="16" selection-end-column="31" />
1331   - <folding />
  1144 + <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
1332 1145 </state>
1333 1146 </provider>
1334 1147 </entry>
1335   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/CaseStatusEnum.java">
  1148 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
1336 1149 <provider selected="true" editor-type-id="text-editor">
1337 1150 <state vertical-scroll-proportion="0.0">
1338   - <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
  1151 + <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
1339 1152 </state>
1340 1153 </provider>
1341 1154 </entry>
1342   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/ReduceTypeEnum.java">
  1155 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
1343 1156 <provider selected="true" editor-type-id="text-editor">
1344 1157 <state vertical-scroll-proportion="0.0">
1345   - <caret line="8" column="21" selection-start-line="8" selection-start-column="21" selection-end-line="8" selection-end-column="21" />
  1158 + <caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
1346 1159 </state>
1347 1160 </provider>
1348 1161 </entry>
1349   - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
  1162 + <entry file="file://$USER_HOME$/ToolUtil.class">
1350 1163 <provider selected="true" editor-type-id="text-editor">
1351   - <state vertical-scroll-proportion="0.22900763">
1352   - <caret line="8" column="62" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
1353   - <folding />
  1164 + <state vertical-scroll-proportion="0.43436295">
  1165 + <caret line="20" column="23" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
1354 1166 </state>
1355 1167 </provider>
1356 1168 </entry>
1357   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseInputDto.java">
  1169 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java">
1358 1170 <provider selected="true" editor-type-id="text-editor">
1359   - <state vertical-scroll-proportion="0.13686131">
1360   - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  1171 + <state vertical-scroll-proportion="0.0">
  1172 + <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
1361 1173 </state>
1362 1174 </provider>
1363 1175 </entry>
1364   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/DateUtils.java">
  1176 + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/BaseTest.java">
1365 1177 <provider selected="true" editor-type-id="text-editor">
1366   - <state vertical-scroll-proportion="0.3448905">
1367   - <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
1368   - <folding>
1369   - <element signature="e#0#6857#0" expanded="false" />
1370   - <element signature="e#895#896#0" expanded="false" />
1371   - <element signature="e#953#954#0" expanded="false" />
1372   - <element signature="e#1114#1115#0" expanded="false" />
1373   - <element signature="e#1173#1174#0" expanded="false" />
1374   - </folding>
  1178 + <state vertical-scroll-proportion="0.0">
  1179 + <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" />
1375 1180 </state>
1376 1181 </provider>
1377 1182 </entry>
1378   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/CaseOutputDto.java">
  1183 + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/CommonTest.java">
1379 1184 <provider selected="true" editor-type-id="text-editor">
1380   - <state vertical-scroll-proportion="0.61496353">
1381   - <caret line="60" column="16" selection-start-line="60" selection-start-column="16" selection-end-line="60" selection-end-column="16" />
1382   - <folding>
1383   - <element signature="e#348#349#0" expanded="false" />
1384   - <element signature="e#373#374#0" expanded="false" />
1385   - <element signature="e#407#408#0" expanded="false" />
1386   - <element signature="e#435#436#0" expanded="false" />
1387   - <element signature="e#466#467#0" expanded="false" />
1388   - <element signature="e#493#494#0" expanded="false" />
1389   - <element signature="e#533#534#0" expanded="false" />
1390   - <element signature="e#565#566#0" expanded="false" />
1391   - <element signature="e#598#599#0" expanded="false" />
1392   - <element signature="e#627#628#0" expanded="false" />
1393   - <element signature="e#671#672#0" expanded="false" />
1394   - <element signature="e#707#708#0" expanded="false" />
1395   - <element signature="e#745#746#0" expanded="false" />
1396   - <element signature="e#779#780#0" expanded="false" />
1397   - <element signature="e#833#834#0" expanded="false" />
1398   - <element signature="e#879#880#0" expanded="false" />
1399   - <element signature="e#914#915#0" expanded="false" />
1400   - <element signature="e#945#946#0" expanded="false" />
1401   - <element signature="e#993#994#0" expanded="false" />
1402   - <element signature="e#1033#1034#0" expanded="false" />
1403   - <element signature="e#1065#1066#0" expanded="false" />
1404   - <element signature="e#1095#1096#0" expanded="false" />
1405   - <element signature="e#1139#1140#0" expanded="false" />
1406   - <element signature="e#1177#1178#0" expanded="false" />
1407   - <element signature="e#1214#1215#0" expanded="false" />
1408   - <element signature="e#1247#1248#0" expanded="false" />
1409   - <element signature="e#1299#1300#0" expanded="false" />
1410   - <element signature="e#1343#1344#0" expanded="false" />
1411   - </folding>
  1185 + <state vertical-scroll-proportion="0.0">
  1186 + <caret line="19" column="24" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" />
1412 1187 </state>
1413 1188 </provider>
1414 1189 </entry>
1415   - <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
  1190 + <entry file="file://$PROJECT_DIR$/pom.xml">
1416 1191 <provider selected="true" editor-type-id="text-editor">
1417   - <state vertical-scroll-proportion="-8.125">
1418   - <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
  1192 + <state vertical-scroll-proportion="0.0">
  1193 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1419 1194 <folding />
1420 1195 </state>
1421 1196 </provider>
1422 1197 </entry>
1423   - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp">
  1198 + <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc">
1424 1199 <provider selected="true" editor-type-id="text-editor">
1425   - <state vertical-scroll-proportion="-12.5">
1426   - <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="21" />
  1200 + <state vertical-scroll-proportion="0.0">
  1201 + <caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
1427 1202 <folding />
1428 1203 </state>
1429 1204 </provider>
1430 1205 </entry>
1431   - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml">
  1206 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">
1432 1207 <provider selected="true" editor-type-id="text-editor">
1433 1208 <state vertical-scroll-proportion="0.0">
1434   - <caret line="15" column="43" selection-start-line="15" selection-start-column="43" selection-end-line="15" selection-end-column="43" />
  1209 + <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
1435 1210 <folding />
1436 1211 </state>
1437 1212 </provider>
1438 1213 </entry>
1439   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/Casement.java">
  1214 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/header.css">
1440 1215 <provider selected="true" editor-type-id="text-editor">
1441 1216 <state vertical-scroll-proportion="0.0">
1442   - <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
  1217 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1443 1218 <folding />
1444 1219 </state>
1445 1220 </provider>
1446 1221 </entry>
1447   - <entry file="file://$PROJECT_DIR$/doc/manual/开发注意.txt">
  1222 + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
1448 1223 <provider selected="true" editor-type-id="text-editor">
1449   - <state vertical-scroll-proportion="0.0">
1450   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1224 + <state vertical-scroll-proportion="1.2162921">
  1225 + <caret line="300" column="57" selection-start-line="300" selection-start-column="46" selection-end-line="300" selection-end-column="57" />
1451 1226 <folding />
1452 1227 </state>
1453 1228 </provider>
1454 1229 </entry>
1455   - <entry file="file://$PROJECT_DIR$/doc/manual/开发规范.txt">
  1230 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1456 1231 <provider selected="true" editor-type-id="text-editor">
1457   - <state vertical-scroll-proportion="0.0">
1458   - <caret line="6" column="37" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
  1232 + <state vertical-scroll-proportion="0.8623595">
  1233 + <caret line="195" column="49" selection-start-line="195" selection-start-column="49" selection-end-line="195" selection-end-column="49" />
1459 1234 <folding />
1460 1235 </state>
1461 1236 </provider>
1462 1237 </entry>
1463   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
  1238 + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml">
1464 1239 <provider selected="true" editor-type-id="text-editor">
1465 1240 <state vertical-scroll-proportion="0.0">
1466   - <caret line="111" column="73" selection-start-line="111" selection-start-column="73" selection-end-line="111" selection-end-column="73" />
  1241 + <caret line="181" column="20" selection-start-line="181" selection-start-column="20" selection-end-line="181" selection-end-column="20" />
1467 1242 <folding>
1468   - <element signature="imports" expanded="false" />
1469   - <element signature="e#1232#1233#0" expanded="false" />
1470   - <element signature="e#1268#1269#0" expanded="false" />
1471   - <element signature="e#1779#1780#0" expanded="false" />
1472   - <element signature="e#1814#1815#0" expanded="false" />
  1243 + <marker date="1469245798000" expanded="true" signature="-1:-1" placeholder="update order..." />
1473 1244 </folding>
1474 1245 </state>
1475 1246 </provider>
1476 1247 </entry>
1477   - <entry file="file://$PROJECT_DIR$/src/main/webapp/css/pay.css">
  1248 + <entry file="file://$PROJECT_DIR$/src/main/resources.local/logback.xml">
1478 1249 <provider selected="true" editor-type-id="text-editor">
1479   - <state vertical-scroll-proportion="0.0">
1480   - <caret line="244" column="1" selection-start-line="244" selection-start-column="1" selection-end-line="244" selection-end-column="1" />
  1250 + <state vertical-scroll-proportion="-6.111111">
  1251 + <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
1481 1252 <folding />
1482 1253 </state>
1483 1254 </provider>
1484 1255 </entry>
1485   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CaseHandlingService.java">
  1256 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
1486 1257 <provider selected="true" editor-type-id="text-editor">
1487 1258 <state vertical-scroll-proportion="0.0">
1488   - <caret line="37" column="20" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
  1259 + <caret line="41" column="26" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
1489 1260 <folding />
1490 1261 </state>
1491 1262 </provider>
... ... @@ -1493,92 +1264,100 @@
1493 1264 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementPageController.java">
1494 1265 <provider selected="true" editor-type-id="text-editor">
1495 1266 <state vertical-scroll-proportion="0.0">
1496   - <caret line="47" column="42" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="42" />
  1267 + <caret line="51" column="46" selection-start-line="51" selection-start-column="46" selection-end-line="51" selection-end-column="46" />
1497 1268 <folding />
1498 1269 </state>
1499 1270 </provider>
1500 1271 </entry>
1501   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
  1272 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java">
1502 1273 <provider selected="true" editor-type-id="text-editor">
1503 1274 <state vertical-scroll-proportion="0.0">
1504   - <caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="27" selection-end-column="5" />
  1275 + <caret line="62" column="22" selection-start-line="62" selection-start-column="22" selection-end-line="62" selection-end-column="22" />
1505 1276 <folding />
1506 1277 </state>
1507 1278 </provider>
1508 1279 </entry>
1509   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java">
  1280 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE-sources.jar!/org/springframework/util/Assert.java">
1510 1281 <provider selected="true" editor-type-id="text-editor">
1511   - <state vertical-scroll-proportion="0.29085872">
1512   - <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
  1282 + <state vertical-scroll-proportion="0.0">
  1283 + <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
1513 1284 <folding />
1514 1285 </state>
1515 1286 </provider>
1516 1287 </entry>
1517   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
  1288 + <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
1518 1289 <provider selected="true" editor-type-id="text-editor">
1519   - <state vertical-scroll-proportion="0.0">
1520   - <caret line="91" column="5" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
  1290 + <state vertical-scroll-proportion="-16.25">
  1291 + <caret line="26" column="31" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
1521 1292 <folding />
1522 1293 </state>
1523 1294 </provider>
1524 1295 </entry>
1525   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/CasementService.java">
  1296 + <entry file="file://$PROJECT_DIR$/src/main/webapp/case_detail.jsp">
1526 1297 <provider selected="true" editor-type-id="text-editor">
1527   - <state vertical-scroll-proportion="0.0">
1528   - <caret line="81" column="0" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
  1298 + <state vertical-scroll-proportion="-4.9562936">
  1299 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1529 1300 <folding />
1530 1301 </state>
1531 1302 </provider>
1532 1303 </entry>
1533   - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  1304 + <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">
1534 1305 <provider selected="true" editor-type-id="text-editor">
1535   - <state vertical-scroll-proportion="0.0">
1536   - <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
  1306 + <state vertical-scroll-proportion="-3.75">
  1307 + <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />
1537 1308 <folding />
1538 1309 </state>
1539 1310 </provider>
1540 1311 </entry>
1541   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/OrderStatusEnum.java">
  1312 + <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
1542 1313 <provider selected="true" editor-type-id="text-editor">
1543   - <state vertical-scroll-proportion="0.0">
1544   - <caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
  1314 + <state vertical-scroll-proportion="-16.875">
  1315 + <caret line="27" column="24" selection-start-line="27" selection-start-column="24" selection-end-line="27" selection-end-column="24" />
1545 1316 <folding />
1546 1317 </state>
1547 1318 </provider>
1548 1319 </entry>
1549   - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
  1320 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay_result.jsp">
1550 1321 <provider selected="true" editor-type-id="text-editor">
1551   - <state vertical-scroll-proportion="6.25">
1552   - <caret line="38" column="16" selection-start-line="38" selection-start-column="16" selection-end-line="45" selection-end-column="23" />
  1322 + <state vertical-scroll-proportion="-15.625">
  1323 + <caret line="25" column="22" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="22" />
1553 1324 <folding />
1554 1325 </state>
1555 1326 </provider>
1556 1327 </entry>
1557   - <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
  1328 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderDataController.java">
1558 1329 <provider selected="true" editor-type-id="text-editor">
1559   - <state vertical-scroll-proportion="-40.72549">
1560   - <caret line="164" column="48" selection-start-line="164" selection-start-column="48" selection-end-line="164" selection-end-column="48" />
  1330 + <state vertical-scroll-proportion="0.0">
  1331 + <caret line="8" column="32" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="32" />
1561 1332 <folding />
1562 1333 </state>
1563 1334 </provider>
1564 1335 </entry>
1565   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/PaymentService.java">
  1336 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/service/OrderService.java">
1566 1337 <provider selected="true" editor-type-id="text-editor">
1567 1338 <state vertical-scroll-proportion="0.0">
1568   - <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
  1339 + <caret line="75" column="23" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
1569 1340 <folding>
1570 1341 <element signature="imports" expanded="true" />
  1342 + <element signature="e#1787#1788#0" expanded="true" />
  1343 + <element signature="e#1849#1850#0" expanded="true" />
1571 1344 </folding>
1572 1345 </state>
1573 1346 </provider>
1574 1347 </entry>
1575   - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentPageController.java">
  1348 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
1576 1349 <provider selected="true" editor-type-id="text-editor">
1577   - <state vertical-scroll-proportion="0.58563536">
1578   - <caret line="22" column="47" selection-start-line="22" selection-start-column="47" selection-end-line="22" selection-end-column="47" />
1579   - <folding>
1580   - <element signature="imports" expanded="true" />
1581   - </folding>
  1350 + <state vertical-scroll-proportion="0.0">
  1351 + <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
  1352 + <folding />
  1353 + </state>
  1354 + </provider>
  1355 + </entry>
  1356 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/OrderPageController.java">
  1357 + <provider selected="true" editor-type-id="text-editor">
  1358 + <state vertical-scroll-proportion="3.0097086">
  1359 + <caret line="83" column="0" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="0" />
  1360 + <folding />
1582 1361 </state>
1583 1362 </provider>
1584 1363 </entry>
... ...
doc/patent.mwb
View file @c1000e1
No preview for this file type
doc/patent.mwb.bak
View file @c1000e1
No preview for this file type
src/main/java/com/canrd/patent/dal/mapper/PaymentMapper.java renamed to src/main/java/com/canrd/patent/dal/mapper/OrderMapper.java
  View file @c1000e1
1 1 package com.canrd.patent.dal.mapper;
2 2  
3   -import com.canrd.patent.dal.model.Payment;
4   -import com.canrd.patent.dal.model.PaymentExample;
  3 +import com.canrd.patent.dal.model.Order;
  4 +import com.canrd.patent.dal.model.OrderExample;
5 5 import java.util.List;
6 6 import org.apache.ibatis.annotations.Param;
7 7  
8   -public interface PaymentMapper {
  8 +public interface OrderMapper {
9 9 /**
10 10 * This method was generated by MyBatis Generator.
11   - * This method corresponds to the database table payment
  11 + * This method corresponds to the database table orders
12 12 *
13 13 * @mbggenerated
14 14 */
15   - int countByExample(PaymentExample example);
  15 + int countByExample(OrderExample example);
16 16  
17 17 /**
18 18 * This method was generated by MyBatis Generator.
19   - * This method corresponds to the database table payment
  19 + * This method corresponds to the database table orders
20 20 *
21 21 * @mbggenerated
22 22 */
23   - int deleteByExample(PaymentExample example);
  23 + int deleteByExample(OrderExample example);
24 24  
25 25 /**
26 26 * This method was generated by MyBatis Generator.
27   - * This method corresponds to the database table payment
  27 + * This method corresponds to the database table orders
28 28 *
29 29 * @mbggenerated
30 30 */
... ... @@ -32,65 +32,65 @@ public interface PaymentMapper {
32 32  
33 33 /**
34 34 * This method was generated by MyBatis Generator.
35   - * This method corresponds to the database table payment
  35 + * This method corresponds to the database table orders
36 36 *
37 37 * @mbggenerated
38 38 */
39   - int insert(Payment record);
  39 + int insert(Order record);
40 40  
41 41 /**
42 42 * This method was generated by MyBatis Generator.
43   - * This method corresponds to the database table payment
  43 + * This method corresponds to the database table orders
44 44 *
45 45 * @mbggenerated
46 46 */
47   - int insertSelective(Payment record);
  47 + int insertSelective(Order record);
48 48  
49 49 /**
50 50 * This method was generated by MyBatis Generator.
51   - * This method corresponds to the database table payment
  51 + * This method corresponds to the database table orders
52 52 *
53 53 * @mbggenerated
54 54 */
55   - List<Payment> selectByExample(PaymentExample example);
  55 + List<Order> selectByExample(OrderExample example);
56 56  
57 57 /**
58 58 * This method was generated by MyBatis Generator.
59   - * This method corresponds to the database table payment
  59 + * This method corresponds to the database table orders
60 60 *
61 61 * @mbggenerated
62 62 */
63   - Payment selectByPrimaryKey(Long id);
  63 + Order selectByPrimaryKey(Long id);
64 64  
65 65 /**
66 66 * This method was generated by MyBatis Generator.
67   - * This method corresponds to the database table payment
  67 + * This method corresponds to the database table orders
68 68 *
69 69 * @mbggenerated
70 70 */
71   - int updateByExampleSelective(@Param("record") Payment record, @Param("example") PaymentExample example);
  71 + int updateByExampleSelective(@Param("record") Order record, @Param("example") OrderExample example);
72 72  
73 73 /**
74 74 * This method was generated by MyBatis Generator.
75   - * This method corresponds to the database table payment
  75 + * This method corresponds to the database table orders
76 76 *
77 77 * @mbggenerated
78 78 */
79   - int updateByExample(@Param("record") Payment record, @Param("example") PaymentExample example);
  79 + int updateByExample(@Param("record") Order record, @Param("example") OrderExample example);
80 80  
81 81 /**
82 82 * This method was generated by MyBatis Generator.
83   - * This method corresponds to the database table payment
  83 + * This method corresponds to the database table orders
84 84 *
85 85 * @mbggenerated
86 86 */
87   - int updateByPrimaryKeySelective(Payment record);
  87 + int updateByPrimaryKeySelective(Order record);
88 88  
89 89 /**
90 90 * This method was generated by MyBatis Generator.
91   - * This method corresponds to the database table payment
  91 + * This method corresponds to the database table orders
92 92 *
93 93 * @mbggenerated
94 94 */
95   - int updateByPrimaryKey(Payment record);
  95 + int updateByPrimaryKey(Order record);
96 96 }
97 97 \ No newline at end of file
... ...
src/main/java/com/canrd/patent/dal/model/Payment.java renamed to src/main/java/com/canrd/patent/dal/model/Order.java
  View file @c1000e1
... ... @@ -2,10 +2,10 @@ package com.canrd.patent.dal.model;
2 2  
3 3 import java.util.Date;
4 4  
5   -public class Payment {
  5 +public class Order {
6 6 /**
7 7 * This field was generated by MyBatis Generator.
8   - * This field corresponds to the database column payment.id
  8 + * This field corresponds to the database column orders.id
9 9 *
10 10 * @mbggenerated
11 11 */
... ... @@ -13,7 +13,7 @@ public class Payment {
13 13  
14 14 /**
15 15 * This field was generated by MyBatis Generator.
16   - * This field corresponds to the database column payment.case_id
  16 + * This field corresponds to the database column orders.case_id
17 17 *
18 18 * @mbggenerated
19 19 */
... ... @@ -21,7 +21,15 @@ public class Payment {
21 21  
22 22 /**
23 23 * This field was generated by MyBatis Generator.
24   - * This field corresponds to the database column payment.expense
  24 + * This field corresponds to the database column orders.quantity
  25 + *
  26 + * @mbggenerated
  27 + */
  28 + private Long quantity;
  29 +
  30 + /**
  31 + * This field was generated by MyBatis Generator.
  32 + * This field corresponds to the database column orders.expense
25 33 *
26 34 * @mbggenerated
27 35 */
... ... @@ -29,7 +37,7 @@ public class Payment {
29 37  
30 38 /**
31 39 * This field was generated by MyBatis Generator.
32   - * This field corresponds to the database column payment.pay_type
  40 + * This field corresponds to the database column orders.pay_type
33 41 *
34 42 * @mbggenerated
35 43 */
... ... @@ -37,7 +45,7 @@ public class Payment {
37 45  
38 46 /**
39 47 * This field was generated by MyBatis Generator.
40   - * This field corresponds to the database column payment.order_status
  48 + * This field corresponds to the database column orders.order_status
41 49 *
42 50 * @mbggenerated
43 51 */
... ... @@ -45,7 +53,7 @@ public class Payment {
45 53  
46 54 /**
47 55 * This field was generated by MyBatis Generator.
48   - * This field corresponds to the database column payment.member_id
  56 + * This field corresponds to the database column orders.member_id
49 57 *
50 58 * @mbggenerated
51 59 */
... ... @@ -53,7 +61,7 @@ public class Payment {
53 61  
54 62 /**
55 63 * This field was generated by MyBatis Generator.
56   - * This field corresponds to the database column payment.create_date
  64 + * This field corresponds to the database column orders.create_date
57 65 *
58 66 * @mbggenerated
59 67 */
... ... @@ -61,7 +69,7 @@ public class Payment {
61 69  
62 70 /**
63 71 * This field was generated by MyBatis Generator.
64   - * This field corresponds to the database column payment.update_date
  72 + * This field corresponds to the database column orders.update_date
65 73 *
66 74 * @mbggenerated
67 75 */
... ... @@ -69,9 +77,9 @@ public class Payment {
69 77  
70 78 /**
71 79 * This method was generated by MyBatis Generator.
72   - * This method returns the value of the database column payment.id
  80 + * This method returns the value of the database column orders.id
73 81 *
74   - * @return the value of payment.id
  82 + * @return the value of orders.id
75 83 *
76 84 * @mbggenerated
77 85 */
... ... @@ -81,9 +89,9 @@ public class Payment {
81 89  
82 90 /**
83 91 * This method was generated by MyBatis Generator.
84   - * This method sets the value of the database column payment.id
  92 + * This method sets the value of the database column orders.id
85 93 *
86   - * @param id the value for payment.id
  94 + * @param id the value for orders.id
87 95 *
88 96 * @mbggenerated
89 97 */
... ... @@ -93,9 +101,9 @@ public class Payment {
93 101  
94 102 /**
95 103 * This method was generated by MyBatis Generator.
96   - * This method returns the value of the database column payment.case_id
  104 + * This method returns the value of the database column orders.case_id
97 105 *
98   - * @return the value of payment.case_id
  106 + * @return the value of orders.case_id
99 107 *
100 108 * @mbggenerated
101 109 */
... ... @@ -105,9 +113,9 @@ public class Payment {
105 113  
106 114 /**
107 115 * This method was generated by MyBatis Generator.
108   - * This method sets the value of the database column payment.case_id
  116 + * This method sets the value of the database column orders.case_id
109 117 *
110   - * @param caseId the value for payment.case_id
  118 + * @param caseId the value for orders.case_id
111 119 *
112 120 * @mbggenerated
113 121 */
... ... @@ -117,9 +125,33 @@ public class Payment {
117 125  
118 126 /**
119 127 * This method was generated by MyBatis Generator.
120   - * This method returns the value of the database column payment.expense
  128 + * This method returns the value of the database column orders.quantity
  129 + *
  130 + * @return the value of orders.quantity
  131 + *
  132 + * @mbggenerated
  133 + */
  134 + public Long getQuantity() {
  135 + return quantity;
  136 + }
  137 +
  138 + /**
  139 + * This method was generated by MyBatis Generator.
  140 + * This method sets the value of the database column orders.quantity
  141 + *
  142 + * @param quantity the value for orders.quantity
  143 + *
  144 + * @mbggenerated
  145 + */
  146 + public void setQuantity(Long quantity) {
  147 + this.quantity = quantity;
  148 + }
  149 +
  150 + /**
  151 + * This method was generated by MyBatis Generator.
  152 + * This method returns the value of the database column orders.expense
121 153 *
122   - * @return the value of payment.expense
  154 + * @return the value of orders.expense
123 155 *
124 156 * @mbggenerated
125 157 */
... ... @@ -129,9 +161,9 @@ public class Payment {
129 161  
130 162 /**
131 163 * This method was generated by MyBatis Generator.
132   - * This method sets the value of the database column payment.expense
  164 + * This method sets the value of the database column orders.expense
133 165 *
134   - * @param expense the value for payment.expense
  166 + * @param expense the value for orders.expense
135 167 *
136 168 * @mbggenerated
137 169 */
... ... @@ -141,9 +173,9 @@ public class Payment {
141 173  
142 174 /**
143 175 * This method was generated by MyBatis Generator.
144   - * This method returns the value of the database column payment.pay_type
  176 + * This method returns the value of the database column orders.pay_type
145 177 *
146   - * @return the value of payment.pay_type
  178 + * @return the value of orders.pay_type
147 179 *
148 180 * @mbggenerated
149 181 */
... ... @@ -153,9 +185,9 @@ public class Payment {
153 185  
154 186 /**
155 187 * This method was generated by MyBatis Generator.
156   - * This method sets the value of the database column payment.pay_type
  188 + * This method sets the value of the database column orders.pay_type
157 189 *
158   - * @param payType the value for payment.pay_type
  190 + * @param payType the value for orders.pay_type
159 191 *
160 192 * @mbggenerated
161 193 */
... ... @@ -165,9 +197,9 @@ public class Payment {
165 197  
166 198 /**
167 199 * This method was generated by MyBatis Generator.
168   - * This method returns the value of the database column payment.order_status
  200 + * This method returns the value of the database column orders.order_status
169 201 *
170   - * @return the value of payment.order_status
  202 + * @return the value of orders.order_status
171 203 *
172 204 * @mbggenerated
173 205 */
... ... @@ -177,9 +209,9 @@ public class Payment {
177 209  
178 210 /**
179 211 * This method was generated by MyBatis Generator.
180   - * This method sets the value of the database column payment.order_status
  212 + * This method sets the value of the database column orders.order_status
181 213 *
182   - * @param orderStatus the value for payment.order_status
  214 + * @param orderStatus the value for orders.order_status
183 215 *
184 216 * @mbggenerated
185 217 */
... ... @@ -189,9 +221,9 @@ public class Payment {
189 221  
190 222 /**
191 223 * This method was generated by MyBatis Generator.
192   - * This method returns the value of the database column payment.member_id
  224 + * This method returns the value of the database column orders.member_id
193 225 *
194   - * @return the value of payment.member_id
  226 + * @return the value of orders.member_id
195 227 *
196 228 * @mbggenerated
197 229 */
... ... @@ -201,9 +233,9 @@ public class Payment {
201 233  
202 234 /**
203 235 * This method was generated by MyBatis Generator.
204   - * This method sets the value of the database column payment.member_id
  236 + * This method sets the value of the database column orders.member_id
205 237 *
206   - * @param memberId the value for payment.member_id
  238 + * @param memberId the value for orders.member_id
207 239 *
208 240 * @mbggenerated
209 241 */
... ... @@ -213,9 +245,9 @@ public class Payment {
213 245  
214 246 /**
215 247 * This method was generated by MyBatis Generator.
216   - * This method returns the value of the database column payment.create_date
  248 + * This method returns the value of the database column orders.create_date
217 249 *
218   - * @return the value of payment.create_date
  250 + * @return the value of orders.create_date
219 251 *
220 252 * @mbggenerated
221 253 */
... ... @@ -225,9 +257,9 @@ public class Payment {
225 257  
226 258 /**
227 259 * This method was generated by MyBatis Generator.
228   - * This method sets the value of the database column payment.create_date
  260 + * This method sets the value of the database column orders.create_date
229 261 *
230   - * @param createDate the value for payment.create_date
  262 + * @param createDate the value for orders.create_date
231 263 *
232 264 * @mbggenerated
233 265 */
... ... @@ -237,9 +269,9 @@ public class Payment {
237 269  
238 270 /**
239 271 * This method was generated by MyBatis Generator.
240   - * This method returns the value of the database column payment.update_date
  272 + * This method returns the value of the database column orders.update_date
241 273 *
242   - * @return the value of payment.update_date
  274 + * @return the value of orders.update_date
243 275 *
244 276 * @mbggenerated
245 277 */
... ... @@ -249,9 +281,9 @@ public class Payment {
249 281  
250 282 /**
251 283 * This method was generated by MyBatis Generator.
252   - * This method sets the value of the database column payment.update_date
  284 + * This method sets the value of the database column orders.update_date
253 285 *
254   - * @param updateDate the value for payment.update_date
  286 + * @param updateDate the value for orders.update_date
255 287 *
256 288 * @mbggenerated
257 289 */
... ...
src/main/java/com/canrd/patent/dal/model/PaymentExample.java renamed to src/main/java/com/canrd/patent/dal/model/OrderExample.java
  View file @c1000e1
... ... @@ -4,10 +4,10 @@ import java.util.ArrayList;
4 4 import java.util.Date;
5 5 import java.util.List;
6 6  
7   -public class PaymentExample {
  7 +public class OrderExample {
8 8 /**
9 9 * This field was generated by MyBatis Generator.
10   - * This field corresponds to the database table payment
  10 + * This field corresponds to the database table orders
11 11 *
12 12 * @mbggenerated
13 13 */
... ... @@ -15,7 +15,7 @@ public class PaymentExample {
15 15  
16 16 /**
17 17 * This field was generated by MyBatis Generator.
18   - * This field corresponds to the database table payment
  18 + * This field corresponds to the database table orders
19 19 *
20 20 * @mbggenerated
21 21 */
... ... @@ -23,7 +23,7 @@ public class PaymentExample {
23 23  
24 24 /**
25 25 * This field was generated by MyBatis Generator.
26   - * This field corresponds to the database table payment
  26 + * This field corresponds to the database table orders
27 27 *
28 28 * @mbggenerated
29 29 */
... ... @@ -31,17 +31,17 @@ public class PaymentExample {
31 31  
32 32 /**
33 33 * This method was generated by MyBatis Generator.
34   - * This method corresponds to the database table payment
  34 + * This method corresponds to the database table orders
35 35 *
36 36 * @mbggenerated
37 37 */
38   - public PaymentExample() {
  38 + public OrderExample() {
39 39 oredCriteria = new ArrayList<Criteria>();
40 40 }
41 41  
42 42 /**
43 43 * This method was generated by MyBatis Generator.
44   - * This method corresponds to the database table payment
  44 + * This method corresponds to the database table orders
45 45 *
46 46 * @mbggenerated
47 47 */
... ... @@ -51,7 +51,7 @@ public class PaymentExample {
51 51  
52 52 /**
53 53 * This method was generated by MyBatis Generator.
54   - * This method corresponds to the database table payment
  54 + * This method corresponds to the database table orders
55 55 *
56 56 * @mbggenerated
57 57 */
... ... @@ -61,7 +61,7 @@ public class PaymentExample {
61 61  
62 62 /**
63 63 * This method was generated by MyBatis Generator.
64   - * This method corresponds to the database table payment
  64 + * This method corresponds to the database table orders
65 65 *
66 66 * @mbggenerated
67 67 */
... ... @@ -71,7 +71,7 @@ public class PaymentExample {
71 71  
72 72 /**
73 73 * This method was generated by MyBatis Generator.
74   - * This method corresponds to the database table payment
  74 + * This method corresponds to the database table orders
75 75 *
76 76 * @mbggenerated
77 77 */
... ... @@ -81,7 +81,7 @@ public class PaymentExample {
81 81  
82 82 /**
83 83 * This method was generated by MyBatis Generator.
84   - * This method corresponds to the database table payment
  84 + * This method corresponds to the database table orders
85 85 *
86 86 * @mbggenerated
87 87 */
... ... @@ -91,7 +91,7 @@ public class PaymentExample {
91 91  
92 92 /**
93 93 * This method was generated by MyBatis Generator.
94   - * This method corresponds to the database table payment
  94 + * This method corresponds to the database table orders
95 95 *
96 96 * @mbggenerated
97 97 */
... ... @@ -101,7 +101,7 @@ public class PaymentExample {
101 101  
102 102 /**
103 103 * This method was generated by MyBatis Generator.
104   - * This method corresponds to the database table payment
  104 + * This method corresponds to the database table orders
105 105 *
106 106 * @mbggenerated
107 107 */
... ... @@ -113,7 +113,7 @@ public class PaymentExample {
113 113  
114 114 /**
115 115 * This method was generated by MyBatis Generator.
116   - * This method corresponds to the database table payment
  116 + * This method corresponds to the database table orders
117 117 *
118 118 * @mbggenerated
119 119 */
... ... @@ -127,7 +127,7 @@ public class PaymentExample {
127 127  
128 128 /**
129 129 * This method was generated by MyBatis Generator.
130   - * This method corresponds to the database table payment
  130 + * This method corresponds to the database table orders
131 131 *
132 132 * @mbggenerated
133 133 */
... ... @@ -138,7 +138,7 @@ public class PaymentExample {
138 138  
139 139 /**
140 140 * This method was generated by MyBatis Generator.
141   - * This method corresponds to the database table payment
  141 + * This method corresponds to the database table orders
142 142 *
143 143 * @mbggenerated
144 144 */
... ... @@ -150,7 +150,7 @@ public class PaymentExample {
150 150  
151 151 /**
152 152 * This class was generated by MyBatis Generator.
153   - * This class corresponds to the database table payment
  153 + * This class corresponds to the database table orders
154 154 *
155 155 * @mbggenerated
156 156 */
... ... @@ -315,6 +315,66 @@ public class PaymentExample {
315 315 return (Criteria) this;
316 316 }
317 317  
  318 + public Criteria andQuantityIsNull() {
  319 + addCriterion("quantity is null");
  320 + return (Criteria) this;
  321 + }
  322 +
  323 + public Criteria andQuantityIsNotNull() {
  324 + addCriterion("quantity is not null");
  325 + return (Criteria) this;
  326 + }
  327 +
  328 + public Criteria andQuantityEqualTo(Long value) {
  329 + addCriterion("quantity =", value, "quantity");
  330 + return (Criteria) this;
  331 + }
  332 +
  333 + public Criteria andQuantityNotEqualTo(Long value) {
  334 + addCriterion("quantity <>", value, "quantity");
  335 + return (Criteria) this;
  336 + }
  337 +
  338 + public Criteria andQuantityGreaterThan(Long value) {
  339 + addCriterion("quantity >", value, "quantity");
  340 + return (Criteria) this;
  341 + }
  342 +
  343 + public Criteria andQuantityGreaterThanOrEqualTo(Long value) {
  344 + addCriterion("quantity >=", value, "quantity");
  345 + return (Criteria) this;
  346 + }
  347 +
  348 + public Criteria andQuantityLessThan(Long value) {
  349 + addCriterion("quantity <", value, "quantity");
  350 + return (Criteria) this;
  351 + }
  352 +
  353 + public Criteria andQuantityLessThanOrEqualTo(Long value) {
  354 + addCriterion("quantity <=", value, "quantity");
  355 + return (Criteria) this;
  356 + }
  357 +
  358 + public Criteria andQuantityIn(List<Long> values) {
  359 + addCriterion("quantity in", values, "quantity");
  360 + return (Criteria) this;
  361 + }
  362 +
  363 + public Criteria andQuantityNotIn(List<Long> values) {
  364 + addCriterion("quantity not in", values, "quantity");
  365 + return (Criteria) this;
  366 + }
  367 +
  368 + public Criteria andQuantityBetween(Long value1, Long value2) {
  369 + addCriterion("quantity between", value1, value2, "quantity");
  370 + return (Criteria) this;
  371 + }
  372 +
  373 + public Criteria andQuantityNotBetween(Long value1, Long value2) {
  374 + addCriterion("quantity not between", value1, value2, "quantity");
  375 + return (Criteria) this;
  376 + }
  377 +
318 378 public Criteria andExpenseIsNull() {
319 379 addCriterion("expense is null");
320 380 return (Criteria) this;
... ... @@ -708,7 +768,7 @@ public class PaymentExample {
708 768  
709 769 /**
710 770 * This class was generated by MyBatis Generator.
711   - * This class corresponds to the database table payment
  771 + * This class corresponds to the database table orders
712 772 *
713 773 * @mbggenerated do_not_delete_during_merge
714 774 */
... ... @@ -721,7 +781,7 @@ public class PaymentExample {
721 781  
722 782 /**
723 783 * This class was generated by MyBatis Generator.
724   - * This class corresponds to the database table payment
  784 + * This class corresponds to the database table orders
725 785 *
726 786 * @mbggenerated
727 787 */
... ...
src/main/java/com/canrd/patent/service/OrderService.java 0 → 100644
  View file @c1000e1
  1 +package com.canrd.patent.service;
  2 +
  3 +import com.canrd.patent.dal.enums.OrderStatusEnum;
  4 +import com.canrd.patent.dal.mapper.OrderMapper;
  5 +import com.canrd.patent.dal.model.Order;
  6 +import com.canrd.patent.dal.model.OrderExample;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +import javax.annotation.Resource;
  10 +import java.util.Date;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * Created by ouyangmao on 16/7/21.
  15 + */
  16 +@Service
  17 +public class OrderService {
  18 + @Resource
  19 + OrderMapper orderMapper;
  20 +
  21 + /***
  22 + * 保存订单
  23 + * @param caseId
  24 + * @param quantity
  25 + * @param expense
  26 + * @param adress
  27 + * @param phone
  28 + * @param inName
  29 + * @param invoice
  30 + * @param memberId
  31 + * @return
  32 + */
  33 + public Order save(Long caseId,Long quantity,Long expense,String adress,String phone,String inName,String invoice,String memberId){
  34 + Order order = new Order();
  35 + order.setCaseId(caseId);
  36 + order.setQuantity(quantity);
  37 + order.setExpense(expense);
  38 + order.setPayType("支付宝");
  39 + order.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
  40 + order.setMemberId(memberId);
  41 + order.setCreateDate(new Date());
  42 + order.setUpdateDate(new Date());
  43 + orderMapper.insertSelective(order);
  44 + return order;
  45 + }
  46 +
  47 + /***
  48 + * 更新订单状态
  49 + * @param orderId
  50 + * @param status
  51 + * @return
  52 + */
  53 + public int updateOrderStatus(Long orderId,String status){
  54 + Order preOrder = findByOrderId(orderId);
  55 + if(preOrder!=null){
  56 + preOrder.setOrderStatus(status);
  57 + preOrder.setUpdateDate(new Date());
  58 + return orderMapper.updateByPrimaryKey(preOrder);
  59 + }
  60 + return 0;
  61 + }
  62 +
  63 + /***
  64 + * 查询订单
  65 + * @param orderId
  66 + * @return
  67 + */
  68 + public Order findByOrderId(Long orderId){
  69 + return orderMapper.selectByPrimaryKey(orderId);
  70 + }
  71 +
  72 + /***
  73 + * 查询订单LIST
  74 + * @return
  75 + */
  76 + public List<Order> findByOrderList(String memberId){
  77 + OrderExample orderExample = new OrderExample();
  78 + OrderExample.Criteria criteria = orderExample.createCriteria();
  79 + criteria.andMemberIdEqualTo(memberId);
  80 + return orderMapper.selectByExample(orderExample);
  81 + }
  82 +}
... ...
src/main/java/com/canrd/patent/service/PaymentService.java deleted 100644 → 0
  View file @0e22c93
1   -package com.canrd.patent.service;
2   -
3   -import com.canrd.patent.dal.enums.OrderStatusEnum;
4   -import com.canrd.patent.dal.mapper.PaymentMapper;
5   -import com.canrd.patent.dal.model.Payment;
6   -import org.springframework.stereotype.Service;
7   -
8   -import javax.annotation.Resource;
9   -import java.util.Date;
10   -
11   -/**
12   - * Created by ouyangmao on 16/7/21.
13   - */
14   -@Service
15   -public class PaymentService {
16   - @Resource
17   - PaymentMapper paymentMapper;
18   - public Payment save(Long caseId,Long expense,String adress,String phone,String inName,String invoice,String memberId){
19   - Payment payment = new Payment();
20   - payment.setCaseId(caseId);
21   - payment.setExpense(expense);
22   - payment.setPayType("支付宝");
23   - payment.setOrderStatus(OrderStatusEnum.PAY_PENDING.name());
24   - payment.setMemberId(memberId);
25   - payment.setCreateDate(new Date());
26   - payment.setUpdateDate(new Date());
27   - paymentMapper.insertSelective(payment);
28   - return payment;
29   - }
30   -}
src/main/java/com/canrd/patent/web/CasementPageController.java
  View file @c1000e1
... ... @@ -49,6 +49,7 @@ public class CasementPageController {
49 49 modelAndView.addObject("caseType", CaseTypeEnum.valueOf(casement.getCaseType()).getTitle());
50 50 modelAndView.addObject("name", casement.getName() == null ? "暂无名称" : casement.getName());
51 51 modelAndView.addObject("caseSn", casement.getCasesn());
  52 + modelAndView.addObject("contractSn", casement.getCasesn());
52 53 modelAndView.addObject("expense", casement.getExpense()/100);
53 54 modelAndView.addObject("totalExpense", casement.getExpense()/100);
54 55 modelAndView.addObject("createDate", DateUtils.format(casement.getCreateDate()));
... ...
src/main/java/com/canrd/patent/web/PaymentDataController.java renamed to src/main/java/com/canrd/patent/web/OrderDataController.java
  View file @c1000e1
... ... @@ -6,5 +6,5 @@ import org.springframework.stereotype.Controller;
6 6 * Created by ouyangmao on 16/7/21.
7 7 */
8 8 @Controller
9   -public class PaymentDataController {
  9 +public class OrderDataController {
10 10 }
... ...
src/main/java/com/canrd/patent/web/OrderPageController.java 0 → 100644
  View file @c1000e1
  1 +package com.canrd.patent.web;
  2 +
  3 +import com.canrd.patent.dal.enums.OrderStatusEnum;
  4 +import com.canrd.patent.dal.model.Order;
  5 +import com.canrd.patent.service.OrderService;
  6 +import org.springframework.stereotype.Controller;
  7 +import org.springframework.util.Assert;
  8 +import org.springframework.web.bind.annotation.RequestMapping;
  9 +import org.springframework.web.servlet.ModelAndView;
  10 +
  11 +import javax.annotation.Resource;
  12 +import javax.servlet.http.HttpServletResponse;
  13 +import java.io.IOException;
  14 +import java.util.List;
  15 +
  16 +/**
  17 + * Created by ouyangmao on 16/7/21.
  18 + */
  19 +@Controller
  20 +public class OrderPageController {
  21 + @Resource
  22 + private OrderService orderService;
  23 + /***
  24 + * 保存订单并跳转到支付宝进行支付
  25 + * @return
  26 + */
  27 + @RequestMapping(value="/save_order")
  28 + public void pay(Long caseId,Long expense,String address,String phone,String inName,String invoice,HttpServletResponse response) throws IOException {
  29 + //判断是否已经存在同样的订单，如果存在，则提醒用户并且数量+1即可
  30 + orderService.save(caseId, 1l, expense * 100, address, phone, inName, invoice, IndexController.MEMBER_ID);
  31 + //跳转到支付宝
  32 + //暂时直接跳转到支付成功的页面
  33 + response.sendRedirect("http://localhost:8081/notity_result?orderId=xxxxorderIdxxxx&paymentResult=xxxxSUCCESStxxxx&totalAmount=10000000");
  34 + }
  35 +
  36 + @RequestMapping(value="/notify_result")
  37 + public ModelAndView notifyResult(String orderId,String paymentResult,Long totalAmount){
  38 + System.out.println("orderId:"+orderId+",paymentResult:"+paymentResult+",totalAmount:"+totalAmount);
  39 +
  40 + if("success".equals(paymentResult)){
  41 + //更新支付成功
  42 + orderService.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.PAID_SUCCESS.name());
  43 + }else{
  44 + //更新支付失败
  45 + orderService.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.PADI_FAILURE.name());
  46 + }
  47 +
  48 + ModelAndView modelAndView = new ModelAndView();
  49 + modelAndView.addObject("orderId",orderId);
  50 + modelAndView.addObject("paymentResult",paymentResult);
  51 + modelAndView.addObject("totalAmount",totalAmount);
  52 + modelAndView.setViewName("/pay_result");
  53 + return modelAndView;
  54 + }
  55 +
  56 + /***
  57 + * 查看订单详情
  58 + * @param orderId
  59 + * @return
  60 + */
  61 + @RequestMapping(value="/query_order")
  62 + public ModelAndView queryOrder(Long orderId){
  63 + Assert.notNull(orderId);
  64 + ModelAndView modelAndView = new ModelAndView();
  65 + Order order = orderService.findByOrderId(orderId);
  66 + modelAndView.addObject("order",order);
  67 + modelAndView.setViewName("/order_detail");
  68 + return modelAndView;
  69 + }
  70 +
  71 + /***
  72 + * 查询orderList
  73 + * @return
  74 + */
  75 + @RequestMapping(value="/query_order_list")
  76 + public ModelAndView queryOrderList(){
  77 + List<Order> order = orderService.findByOrderList(IndexController.MEMBER_ID);
  78 + ModelAndView modelAndView = new ModelAndView();
  79 + modelAndView.addObject("order",order);
  80 + modelAndView.setViewName("/order_detail");
  81 + return modelAndView;
  82 + }
  83 +}
... ...
src/main/java/com/canrd/patent/web/PaymentPageController.java deleted 100644 → 0
  View file @0e22c93
1   -package com.canrd.patent.web;
2   -
3   -import com.canrd.patent.dal.model.Payment;
4   -import com.canrd.patent.service.PaymentService;
5   -import org.springframework.stereotype.Controller;
6   -import org.springframework.web.bind.annotation.RequestMapping;
7   -
8   -import javax.annotation.Resource;
9   -
10   -/**
11   - * Created by ouyangmao on 16/7/21.
12   - */
13   -@Controller
14   -public class PaymentPageController {
15   - @Resource
16   - private PaymentService paymentService;
17   - /***
18   - * 返回视图
19   - * @return
20   - */
21   - @RequestMapping(value="/pay")
22   - public void pay(Long caseId,Long expense,String address,String phone,String inName,String invoice){
23   - paymentService.save(caseId, expense*100, address, phone, inName, invoice, IndexController.MEMBER_ID);
24   - //跳转到支付宝
25   - }
26   -}
src/main/resources.local/logback.xml
  View file @c1000e1
... ... @@ -9,6 +9,7 @@
9 9 <encoder><pattern>%date{HH:mm:ss.SSS} %-5level [%thread] %class{32}:%line - %msg%n</pattern></encoder>
10 10 </appender>
11 11 <root level="INFO"><appender-ref ref="ROOT" /></root>
  12 + <logger name="org.mybatis" level="DEBUG"></logger>
12 13 <logger name="com.qunar.piao.spider" level="DEBUG" />
13 14 <logger name="com.qunar.piao.spider.common.quartz" level="INFO" />
14 15 <logger name="com.qunar.piao.spider.dal.mapper" level="INFO" />
... ...
src/main/resources/mapper/PaymentMapper.xml renamed to src/main/resources/mapper/OrderMapper.xml
  View file @c1000e1
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="com.canrd.patent.dal.mapper.PaymentMapper">
4   - <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Payment">
  3 +<mapper namespace="com.canrd.patent.dal.mapper.OrderMapper">
  4 + <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Order">
5 5 <!--
6 6 WARNING - @mbggenerated
7 7 This element is automatically generated by MyBatis Generator, do not modify.
8 8 -->
9 9 <id column="id" jdbcType="BIGINT" property="id" />
10 10 <result column="case_id" jdbcType="BIGINT" property="caseId" />
  11 + <result column="quantity" jdbcType="BIGINT" property="quantity" />
11 12 <result column="expense" jdbcType="BIGINT" property="expense" />
12 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
13 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
... ... @@ -86,9 +87,9 @@
86 87 WARNING - @mbggenerated
87 88 This element is automatically generated by MyBatis Generator, do not modify.
88 89 -->
89   - id, case_id, expense, pay_type, order_status, member_id, create_date, update_date
  90 + id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
90 91 </sql>
91   - <select id="selectByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultMap="BaseResultMap">
  92 + <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
92 93 <!--
93 94 WARNING - @mbggenerated
94 95 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -98,7 +99,7 @@
98 99 distinct
99 100 </if>
100 101 <include refid="Base_Column_List" />
101   - from payment
  102 + from orders
102 103 <if test="_parameter != null">
103 104 <include refid="Example_Where_Clause" />
104 105 </if>
... ... @@ -113,7 +114,7 @@
113 114 -->
114 115 select
115 116 <include refid="Base_Column_List" />
116   - from payment
  117 + from orders
117 118 where id = #{id,jdbcType=BIGINT}
118 119 </select>
119 120 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
... ... @@ -121,20 +122,20 @@
121 122 WARNING - @mbggenerated
122 123 This element is automatically generated by MyBatis Generator, do not modify.
123 124 -->
124   - delete from payment
  125 + delete from orders
125 126 where id = #{id,jdbcType=BIGINT}
126 127 </delete>
127   - <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.PaymentExample">
  128 + <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.OrderExample">
128 129 <!--
129 130 WARNING - @mbggenerated
130 131 This element is automatically generated by MyBatis Generator, do not modify.
131 132 -->
132   - delete from payment
  133 + delete from orders
133 134 <if test="_parameter != null">
134 135 <include refid="Example_Where_Clause" />
135 136 </if>
136 137 </delete>
137   - <insert id="insert" parameterType="com.canrd.patent.dal.model.Payment">
  138 + <insert id="insert" parameterType="com.canrd.patent.dal.model.Order">
138 139 <!--
139 140 WARNING - @mbggenerated
140 141 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -142,14 +143,14 @@
142 143 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
143 144 SELECT LAST_INSERT_ID()
144 145 </selectKey>
145   - insert into payment (case_id, expense, pay_type,
146   - order_status, member_id, create_date,
147   - update_date)
148   - values (#{caseId,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, #{payType,jdbcType=VARCHAR},
149   - #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
150   - #{updateDate,jdbcType=TIMESTAMP})
  146 + insert into orders (case_id, quantity, expense,
  147 + pay_type, order_status, member_id,
  148 + create_date, update_date)
  149 + values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
  150 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
  151 + #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
151 152 </insert>
152   - <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Payment">
  153 + <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
153 154 <!--
154 155 WARNING - @mbggenerated
155 156 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -157,11 +158,14 @@
157 158 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
158 159 SELECT LAST_INSERT_ID()
159 160 </selectKey>
160   - insert into payment
  161 + insert into orders
161 162 <trim prefix="(" suffix=")" suffixOverrides=",">
162 163 <if test="caseId != null">
163 164 case_id,
164 165 </if>
  166 + <if test="quantity != null">
  167 + quantity,
  168 + </if>
165 169 <if test="expense != null">
166 170 expense,
167 171 </if>
... ... @@ -185,6 +189,9 @@
185 189 <if test="caseId != null">
186 190 #{caseId,jdbcType=BIGINT},
187 191 </if>
  192 + <if test="quantity != null">
  193 + #{quantity,jdbcType=BIGINT},
  194 + </if>
188 195 <if test="expense != null">
189 196 #{expense,jdbcType=BIGINT},
190 197 </if>
... ... @@ -205,12 +212,12 @@
205 212 </if>
206 213 </trim>
207 214 </insert>
208   - <select id="countByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultType="java.lang.Integer">
  215 + <select id="countByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultType="java.lang.Integer">
209 216 <!--
210 217 WARNING - @mbggenerated
211 218 This element is automatically generated by MyBatis Generator, do not modify.
212 219 -->
213   - select count(*) from payment
  220 + select count(*) from orders
214 221 <if test="_parameter != null">
215 222 <include refid="Example_Where_Clause" />
216 223 </if>
... ... @@ -220,7 +227,7 @@
220 227 WARNING - @mbggenerated
221 228 This element is automatically generated by MyBatis Generator, do not modify.
222 229 -->
223   - update payment
  230 + update orders
224 231 <set>
225 232 <if test="record.id != null">
226 233 id = #{record.id,jdbcType=BIGINT},
... ... @@ -228,6 +235,9 @@
228 235 <if test="record.caseId != null">
229 236 case_id = #{record.caseId,jdbcType=BIGINT},
230 237 </if>
  238 + <if test="record.quantity != null">
  239 + quantity = #{record.quantity,jdbcType=BIGINT},
  240 + </if>
231 241 <if test="record.expense != null">
232 242 expense = #{record.expense,jdbcType=BIGINT},
233 243 </if>
... ... @@ -256,9 +266,10 @@
256 266 WARNING - @mbggenerated
257 267 This element is automatically generated by MyBatis Generator, do not modify.
258 268 -->
259   - update payment
  269 + update orders
260 270 set id = #{record.id,jdbcType=BIGINT},
261 271 case_id = #{record.caseId,jdbcType=BIGINT},
  272 + quantity = #{record.quantity,jdbcType=BIGINT},
262 273 expense = #{record.expense,jdbcType=BIGINT},
263 274 pay_type = #{record.payType,jdbcType=VARCHAR},
264 275 order_status = #{record.orderStatus,jdbcType=VARCHAR},
... ... @@ -269,16 +280,19 @@
269 280 <include refid="Update_By_Example_Where_Clause" />
270 281 </if>
271 282 </update>
272   - <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Payment">
  283 + <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Order">
273 284 <!--
274 285 WARNING - @mbggenerated
275 286 This element is automatically generated by MyBatis Generator, do not modify.
276 287 -->
277   - update payment
  288 + update orders
278 289 <set>
279 290 <if test="caseId != null">
280 291 case_id = #{caseId,jdbcType=BIGINT},
281 292 </if>
  293 + <if test="quantity != null">
  294 + quantity = #{quantity,jdbcType=BIGINT},
  295 + </if>
282 296 <if test="expense != null">
283 297 expense = #{expense,jdbcType=BIGINT},
284 298 </if>
... ... @@ -300,13 +314,14 @@
300 314 </set>
301 315 where id = #{id,jdbcType=BIGINT}
302 316 </update>
303   - <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Payment">
  317 + <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Order">
304 318 <!--
305 319 WARNING - @mbggenerated
306 320 This element is automatically generated by MyBatis Generator, do not modify.
307 321 -->
308   - update payment
  322 + update orders
309 323 set case_id = #{caseId,jdbcType=BIGINT},
  324 + quantity = #{quantity,jdbcType=BIGINT},
310 325 expense = #{expense,jdbcType=BIGINT},
311 326 pay_type = #{payType,jdbcType=VARCHAR},
312 327 order_status = #{orderStatus,jdbcType=VARCHAR},
... ...
src/main/webapp/case-detail.jsp renamed to src/main/webapp/case_detail.jsp
  View file @c1000e1
src/main/webapp/case-manage.jsp renamed to src/main/webapp/case_manage.jsp
  View file @c1000e1
src/main/webapp/error.jsp
  View file @c1000e1
... ... @@ -5,13 +5,18 @@
5 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6 6 <title>科路得</title>
7 7 <link rel="stylesheet" type="text/css" href="/css/pay.css">
  8 + <style type="text/css">
  9 + .content{
  10 +
  11 + }
  12 + </style>
8 13 </head>
9 14  
10 15 <body>
11 16 <jsp:include page="/include/header.jsp" flush="true"/>
12 17  
13 18 <div class="content">
14   - <p>小科程序猿正在努力修复</p>
  19 + <p style="margin: 0 auto;padding-top: 100px;padding-bottom: 100px;text-align: center">小科程序猿正在努力修复</p>
15 20 </div>
16 21  
17 22 <jsp:include page="/include/footer.jsp" flush="true"/>
... ...
src/main/webapp/notice.jsp 0 → 100644
  View file @c1000e1
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <style type="text/css">
  8 + *{
  9 + margin:0 auto;
  10 + padding: 0;
  11 + }
  12 + .content{
  13 + min-height: 200px;
  14 + }
  15 + .content .show{
  16 + margin-top:20px;
  17 + width: 32%;
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 +<jsp:include page="/include/header.jsp" flush="true"/>
  24 +
  25 +<div class="content">
  26 + <div class="show">
  27 + <p>案件详情功能不断完善中......</p>
  28 + <p>小科即将与您联系......</p>
  29 + </div>
  30 +</div>
  31 +
  32 +<jsp:include page="/include/footer.jsp" flush="true"/>
  33 +</body>
  34 +</html>
... ...
src/main/webapp/order_detail.jsp 0 → 100644
  View file @c1000e1
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <style type="text/css">
  8 + *{
  9 + margin:0 auto;
  10 + padding: 0;
  11 + }
  12 + .content{
  13 + min-height: 200px;
  14 + }
  15 + .content .show{
  16 + margin-top:20px;
  17 + width: 32%;
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 +<jsp:include page="/include/header.jsp" flush="true"/>
  24 +
  25 +<div class="content">
  26 + <div class="show">
  27 + <p>订单ID: ${order.id}</p>
  28 + </div>
  29 +</div>
  30 +
  31 +<jsp:include page="/include/footer.jsp" flush="true"/>
  32 +</body>
  33 +</html>
... ...
src/main/webapp/pay.jsp
  View file @c1000e1
... ... @@ -193,7 +193,7 @@
193 193 $("#pay_phone").val(phone);
194 194 $("#in_name").val(company==null?person:company);
195 195 $("#pay_invoice").val(invoice);
196   - $("#pay_form").attr("action","/pay");
  196 + $("#pay_form").attr("action","/save_order");
197 197 $("#pay_form").submit();
198 198 }
199 199 /*var case_list_body=$(".case_list_body");
... ...
src/main/webapp/pay_result.jsp 0 → 100644
  View file @c1000e1
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <style type="text/css">
  8 + *{
  9 + margin:0 auto;
  10 + padding: 0;
  11 + }
  12 + .content{
  13 + min-height: 200px;
  14 + }
  15 + .content .show{
  16 + margin-top:20px;
  17 + width: 32%;
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 +<jsp:include page="/include/header.jsp" flush="true"/>
  24 +
  25 +<div class="content">
  26 + <div class="show">
  27 + <p>订单ID: ${orderId}</p>
  28 + <p>支付结果: ${paymentResult}</p>
  29 + <p>支付金额: ${totalAmount}</p>
  30 + <p><a href="/query_order?orderId=${orderId}">查看订单</a></p>
  31 + <p><a href="/case_detail.jsp">案件详情</a></p>
  32 + </div>
  33 +</div>
  34 +
  35 +<jsp:include page="/include/footer.jsp" flush="true"/>
  36 +</body>
  37 +</html>
... ...
src/test/java/com/canrd/patent/CommonTest.java
  View file @c1000e1
... ... @@ -10,8 +10,6 @@ import javax.annotation.Resource;
10 10 * Created by ouyangmao on 16/6/30.
11 11 */
12 12 public class CommonTest extends BaseTest{
13   - @Resource
14   - private TestMapper testMapper;
15 13  
16 14 @Test
17 15 public void testA(){
... ... @@ -20,11 +18,6 @@ public class CommonTest extends BaseTest{
20 18  
21 19 @Test
22 20 public void testB(){
23   - System.out.println("start ===========================================");
24   - TestModel test = new TestModel();
25   - test.setName("谢茂盛");
26   - test.setAge(22);
27   - testMapper.add(test);
28   - System.out.println("end ===========================================");
  21 +
29 22 }
30 23 }
... ...
src/test/resources/mbg/generatorConfig.xml
  View file @c1000e1
... ... @@ -48,7 +48,7 @@
48 48 <!-- 要生成哪些表-->
49 49 <table schema="public" tableName="mybatis_test" domainObjectName="MybatisTest"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
50 50 <table schema="public" tableName="casement" domainObjectName="Casement"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
51   - <table schema="public" tableName="payment" domainObjectName="Payment"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
  51 + <table schema="public" tableName="orders" domainObjectName="Order"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
52 52 <!-- java -jar /Users/ouyangmao/.m2/repository/org/mybatis/generator/mybatis-generator-core/1.3.2/mybatis-generator-core-1.3.2.jar -configfile src/test/resources/mbg/generatorConfig.xml -overwrite
53 53 -->
54 54 </context>
... ...
target/classes/com/canrd/patent/dal/mapper/PaymentMapper.class renamed to target/classes/com/canrd/patent/dal/mapper/OrderMapper.class
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/dal/model/Payment.class renamed to target/classes/com/canrd/patent/dal/model/Order.class
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class 0 → 100644
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class renamed to target/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class renamed to target/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample.class renamed to target/classes/com/canrd/patent/dal/model/OrderExample.class
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class deleted 100644 → 0
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/service/OrderService.class 0 → 100644
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/service/PaymentService.class deleted 100644 → 0
View file @0e22c93
No preview for this file type
target/classes/com/canrd/patent/web/CasementPageController.class
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/web/PaymentDataController.class renamed to target/classes/com/canrd/patent/web/OrderDataController.class
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/web/OrderPageController.class 0 → 100644
View file @c1000e1
No preview for this file type
target/classes/com/canrd/patent/web/PaymentPageController.class deleted 100644 → 0
View file @0e22c93
No preview for this file type
target/classes/logback.xml
  View file @c1000e1
... ... @@ -9,6 +9,7 @@
9 9 <encoder><pattern>%date{HH:mm:ss.SSS} %-5level [%thread] %class{32}:%line - %msg%n</pattern></encoder>
10 10 </appender>
11 11 <root level="INFO"><appender-ref ref="ROOT" /></root>
  12 + <logger name="org.mybatis" level="DEBUG"></logger>
12 13 <logger name="com.qunar.piao.spider" level="DEBUG" />
13 14 <logger name="com.qunar.piao.spider.common.quartz" level="INFO" />
14 15 <logger name="com.qunar.piao.spider.dal.mapper" level="INFO" />
... ...
target/classes/mapper/PaymentMapper.xml renamed to target/classes/mapper/OrderMapper.xml
  View file @c1000e1
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="com.canrd.patent.dal.mapper.PaymentMapper">
4   - <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Payment">
  3 +<mapper namespace="com.canrd.patent.dal.mapper.OrderMapper">
  4 + <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Order">
5 5 <!--
6 6 WARNING - @mbggenerated
7 7 This element is automatically generated by MyBatis Generator, do not modify.
8 8 -->
9 9 <id column="id" jdbcType="BIGINT" property="id" />
10 10 <result column="case_id" jdbcType="BIGINT" property="caseId" />
  11 + <result column="quantity" jdbcType="BIGINT" property="quantity" />
11 12 <result column="expense" jdbcType="BIGINT" property="expense" />
12 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
13 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
... ... @@ -86,9 +87,9 @@
86 87 WARNING - @mbggenerated
87 88 This element is automatically generated by MyBatis Generator, do not modify.
88 89 -->
89   - id, case_id, expense, pay_type, order_status, member_id, create_date, update_date
  90 + id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
90 91 </sql>
91   - <select id="selectByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultMap="BaseResultMap">
  92 + <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
92 93 <!--
93 94 WARNING - @mbggenerated
94 95 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -98,7 +99,7 @@
98 99 distinct
99 100 </if>
100 101 <include refid="Base_Column_List" />
101   - from payment
  102 + from orders
102 103 <if test="_parameter != null">
103 104 <include refid="Example_Where_Clause" />
104 105 </if>
... ... @@ -113,7 +114,7 @@
113 114 -->
114 115 select
115 116 <include refid="Base_Column_List" />
116   - from payment
  117 + from orders
117 118 where id = #{id,jdbcType=BIGINT}
118 119 </select>
119 120 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
... ... @@ -121,20 +122,20 @@
121 122 WARNING - @mbggenerated
122 123 This element is automatically generated by MyBatis Generator, do not modify.
123 124 -->
124   - delete from payment
  125 + delete from orders
125 126 where id = #{id,jdbcType=BIGINT}
126 127 </delete>
127   - <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.PaymentExample">
  128 + <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.OrderExample">
128 129 <!--
129 130 WARNING - @mbggenerated
130 131 This element is automatically generated by MyBatis Generator, do not modify.
131 132 -->
132   - delete from payment
  133 + delete from orders
133 134 <if test="_parameter != null">
134 135 <include refid="Example_Where_Clause" />
135 136 </if>
136 137 </delete>
137   - <insert id="insert" parameterType="com.canrd.patent.dal.model.Payment">
  138 + <insert id="insert" parameterType="com.canrd.patent.dal.model.Order">
138 139 <!--
139 140 WARNING - @mbggenerated
140 141 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -142,14 +143,14 @@
142 143 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
143 144 SELECT LAST_INSERT_ID()
144 145 </selectKey>
145   - insert into payment (case_id, expense, pay_type,
146   - order_status, member_id, create_date,
147   - update_date)
148   - values (#{caseId,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, #{payType,jdbcType=VARCHAR},
149   - #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
150   - #{updateDate,jdbcType=TIMESTAMP})
  146 + insert into orders (case_id, quantity, expense,
  147 + pay_type, order_status, member_id,
  148 + create_date, update_date)
  149 + values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
  150 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
  151 + #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
151 152 </insert>
152   - <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Payment">
  153 + <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
153 154 <!--
154 155 WARNING - @mbggenerated
155 156 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -157,11 +158,14 @@
157 158 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
158 159 SELECT LAST_INSERT_ID()
159 160 </selectKey>
160   - insert into payment
  161 + insert into orders
161 162 <trim prefix="(" suffix=")" suffixOverrides=",">
162 163 <if test="caseId != null">
163 164 case_id,
164 165 </if>
  166 + <if test="quantity != null">
  167 + quantity,
  168 + </if>
165 169 <if test="expense != null">
166 170 expense,
167 171 </if>
... ... @@ -185,6 +189,9 @@
185 189 <if test="caseId != null">
186 190 #{caseId,jdbcType=BIGINT},
187 191 </if>
  192 + <if test="quantity != null">
  193 + #{quantity,jdbcType=BIGINT},
  194 + </if>
188 195 <if test="expense != null">
189 196 #{expense,jdbcType=BIGINT},
190 197 </if>
... ... @@ -205,12 +212,12 @@
205 212 </if>
206 213 </trim>
207 214 </insert>
208   - <select id="countByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultType="java.lang.Integer">
  215 + <select id="countByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultType="java.lang.Integer">
209 216 <!--
210 217 WARNING - @mbggenerated
211 218 This element is automatically generated by MyBatis Generator, do not modify.
212 219 -->
213   - select count(*) from payment
  220 + select count(*) from orders
214 221 <if test="_parameter != null">
215 222 <include refid="Example_Where_Clause" />
216 223 </if>
... ... @@ -220,7 +227,7 @@
220 227 WARNING - @mbggenerated
221 228 This element is automatically generated by MyBatis Generator, do not modify.
222 229 -->
223   - update payment
  230 + update orders
224 231 <set>
225 232 <if test="record.id != null">
226 233 id = #{record.id,jdbcType=BIGINT},
... ... @@ -228,6 +235,9 @@
228 235 <if test="record.caseId != null">
229 236 case_id = #{record.caseId,jdbcType=BIGINT},
230 237 </if>
  238 + <if test="record.quantity != null">
  239 + quantity = #{record.quantity,jdbcType=BIGINT},
  240 + </if>
231 241 <if test="record.expense != null">
232 242 expense = #{record.expense,jdbcType=BIGINT},
233 243 </if>
... ... @@ -256,9 +266,10 @@
256 266 WARNING - @mbggenerated
257 267 This element is automatically generated by MyBatis Generator, do not modify.
258 268 -->
259   - update payment
  269 + update orders
260 270 set id = #{record.id,jdbcType=BIGINT},
261 271 case_id = #{record.caseId,jdbcType=BIGINT},
  272 + quantity = #{record.quantity,jdbcType=BIGINT},
262 273 expense = #{record.expense,jdbcType=BIGINT},
263 274 pay_type = #{record.payType,jdbcType=VARCHAR},
264 275 order_status = #{record.orderStatus,jdbcType=VARCHAR},
... ... @@ -269,16 +280,19 @@
269 280 <include refid="Update_By_Example_Where_Clause" />
270 281 </if>
271 282 </update>
272   - <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Payment">
  283 + <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Order">
273 284 <!--
274 285 WARNING - @mbggenerated
275 286 This element is automatically generated by MyBatis Generator, do not modify.
276 287 -->
277   - update payment
  288 + update orders
278 289 <set>
279 290 <if test="caseId != null">
280 291 case_id = #{caseId,jdbcType=BIGINT},
281 292 </if>
  293 + <if test="quantity != null">
  294 + quantity = #{quantity,jdbcType=BIGINT},
  295 + </if>
282 296 <if test="expense != null">
283 297 expense = #{expense,jdbcType=BIGINT},
284 298 </if>
... ... @@ -300,13 +314,14 @@
300 314 </set>
301 315 where id = #{id,jdbcType=BIGINT}
302 316 </update>
303   - <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Payment">
  317 + <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Order">
304 318 <!--
305 319 WARNING - @mbggenerated
306 320 This element is automatically generated by MyBatis Generator, do not modify.
307 321 -->
308   - update payment
  322 + update orders
309 323 set case_id = #{caseId,jdbcType=BIGINT},
  324 + quantity = #{quantity,jdbcType=BIGINT},
310 325 expense = #{expense,jdbcType=BIGINT},
311 326 pay_type = #{payType,jdbcType=VARCHAR},
312 327 order_status = #{orderStatus,jdbcType=VARCHAR},
... ...
target/patent/WEB-INF/classes/com/canrd/patent/dal/mapper/PaymentMapper.class renamed to target/patent/WEB-INF/classes/com/canrd/patent/dal/mapper/OrderMapper.class
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Payment.class renamed to target/patent/WEB-INF/classes/com/canrd/patent/dal/model/Order.class
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criteria.class 0 → 100644
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criterion.class renamed to target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$Criterion.class
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$GeneratedCriteria.class renamed to target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample$GeneratedCriteria.class
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample.class renamed to target/patent/WEB-INF/classes/com/canrd/patent/dal/model/OrderExample.class
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/dal/model/PaymentExample$Criteria.class deleted 100644 → 0
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/OrderService.class 0 → 100644
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/service/PaymentService.class deleted 100644 → 0
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/CasementPageController.class
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentDataController.class renamed to target/patent/WEB-INF/classes/com/canrd/patent/web/OrderDataController.class
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/OrderPageController.class 0 → 100644
View file @c1000e1
No preview for this file type
target/patent/WEB-INF/classes/com/canrd/patent/web/PaymentPageController.class deleted 100644 → 0
View file @0e22c93
No preview for this file type
target/patent/WEB-INF/classes/logback.xml
  View file @c1000e1
... ... @@ -9,6 +9,7 @@
9 9 <encoder><pattern>%date{HH:mm:ss.SSS} %-5level [%thread] %class{32}:%line - %msg%n</pattern></encoder>
10 10 </appender>
11 11 <root level="INFO"><appender-ref ref="ROOT" /></root>
  12 + <logger name="org.mybatis" level="DEBUG"></logger>
12 13 <logger name="com.qunar.piao.spider" level="DEBUG" />
13 14 <logger name="com.qunar.piao.spider.common.quartz" level="INFO" />
14 15 <logger name="com.qunar.piao.spider.dal.mapper" level="INFO" />
... ...
target/patent/WEB-INF/classes/mapper/PaymentMapper.xml renamed to target/patent/WEB-INF/classes/mapper/OrderMapper.xml
  View file @c1000e1
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="com.canrd.patent.dal.mapper.PaymentMapper">
4   - <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Payment">
  3 +<mapper namespace="com.canrd.patent.dal.mapper.OrderMapper">
  4 + <resultMap id="BaseResultMap" type="com.canrd.patent.dal.model.Order">
5 5 <!--
6 6 WARNING - @mbggenerated
7 7 This element is automatically generated by MyBatis Generator, do not modify.
8 8 -->
9 9 <id column="id" jdbcType="BIGINT" property="id" />
10 10 <result column="case_id" jdbcType="BIGINT" property="caseId" />
  11 + <result column="quantity" jdbcType="BIGINT" property="quantity" />
11 12 <result column="expense" jdbcType="BIGINT" property="expense" />
12 13 <result column="pay_type" jdbcType="VARCHAR" property="payType" />
13 14 <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
... ... @@ -86,9 +87,9 @@
86 87 WARNING - @mbggenerated
87 88 This element is automatically generated by MyBatis Generator, do not modify.
88 89 -->
89   - id, case_id, expense, pay_type, order_status, member_id, create_date, update_date
  90 + id, case_id, quantity, expense, pay_type, order_status, member_id, create_date, update_date
90 91 </sql>
91   - <select id="selectByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultMap="BaseResultMap">
  92 + <select id="selectByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultMap="BaseResultMap">
92 93 <!--
93 94 WARNING - @mbggenerated
94 95 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -98,7 +99,7 @@
98 99 distinct
99 100 </if>
100 101 <include refid="Base_Column_List" />
101   - from payment
  102 + from orders
102 103 <if test="_parameter != null">
103 104 <include refid="Example_Where_Clause" />
104 105 </if>
... ... @@ -113,7 +114,7 @@
113 114 -->
114 115 select
115 116 <include refid="Base_Column_List" />
116   - from payment
  117 + from orders
117 118 where id = #{id,jdbcType=BIGINT}
118 119 </select>
119 120 <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
... ... @@ -121,20 +122,20 @@
121 122 WARNING - @mbggenerated
122 123 This element is automatically generated by MyBatis Generator, do not modify.
123 124 -->
124   - delete from payment
  125 + delete from orders
125 126 where id = #{id,jdbcType=BIGINT}
126 127 </delete>
127   - <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.PaymentExample">
  128 + <delete id="deleteByExample" parameterType="com.canrd.patent.dal.model.OrderExample">
128 129 <!--
129 130 WARNING - @mbggenerated
130 131 This element is automatically generated by MyBatis Generator, do not modify.
131 132 -->
132   - delete from payment
  133 + delete from orders
133 134 <if test="_parameter != null">
134 135 <include refid="Example_Where_Clause" />
135 136 </if>
136 137 </delete>
137   - <insert id="insert" parameterType="com.canrd.patent.dal.model.Payment">
  138 + <insert id="insert" parameterType="com.canrd.patent.dal.model.Order">
138 139 <!--
139 140 WARNING - @mbggenerated
140 141 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -142,14 +143,14 @@
142 143 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
143 144 SELECT LAST_INSERT_ID()
144 145 </selectKey>
145   - insert into payment (case_id, expense, pay_type,
146   - order_status, member_id, create_date,
147   - update_date)
148   - values (#{caseId,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT}, #{payType,jdbcType=VARCHAR},
149   - #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
150   - #{updateDate,jdbcType=TIMESTAMP})
  146 + insert into orders (case_id, quantity, expense,
  147 + pay_type, order_status, member_id,
  148 + create_date, update_date)
  149 + values (#{caseId,jdbcType=BIGINT}, #{quantity,jdbcType=BIGINT}, #{expense,jdbcType=BIGINT},
  150 + #{payType,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR},
  151 + #{createDate,jdbcType=TIMESTAMP}, #{updateDate,jdbcType=TIMESTAMP})
151 152 </insert>
152   - <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Payment">
  153 + <insert id="insertSelective" parameterType="com.canrd.patent.dal.model.Order">
153 154 <!--
154 155 WARNING - @mbggenerated
155 156 This element is automatically generated by MyBatis Generator, do not modify.
... ... @@ -157,11 +158,14 @@
157 158 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
158 159 SELECT LAST_INSERT_ID()
159 160 </selectKey>
160   - insert into payment
  161 + insert into orders
161 162 <trim prefix="(" suffix=")" suffixOverrides=",">
162 163 <if test="caseId != null">
163 164 case_id,
164 165 </if>
  166 + <if test="quantity != null">
  167 + quantity,
  168 + </if>
165 169 <if test="expense != null">
166 170 expense,
167 171 </if>
... ... @@ -185,6 +189,9 @@
185 189 <if test="caseId != null">
186 190 #{caseId,jdbcType=BIGINT},
187 191 </if>
  192 + <if test="quantity != null">
  193 + #{quantity,jdbcType=BIGINT},
  194 + </if>
188 195 <if test="expense != null">
189 196 #{expense,jdbcType=BIGINT},
190 197 </if>
... ... @@ -205,12 +212,12 @@
205 212 </if>
206 213 </trim>
207 214 </insert>
208   - <select id="countByExample" parameterType="com.canrd.patent.dal.model.PaymentExample" resultType="java.lang.Integer">
  215 + <select id="countByExample" parameterType="com.canrd.patent.dal.model.OrderExample" resultType="java.lang.Integer">
209 216 <!--
210 217 WARNING - @mbggenerated
211 218 This element is automatically generated by MyBatis Generator, do not modify.
212 219 -->
213   - select count(*) from payment
  220 + select count(*) from orders
214 221 <if test="_parameter != null">
215 222 <include refid="Example_Where_Clause" />
216 223 </if>
... ... @@ -220,7 +227,7 @@
220 227 WARNING - @mbggenerated
221 228 This element is automatically generated by MyBatis Generator, do not modify.
222 229 -->
223   - update payment
  230 + update orders
224 231 <set>
225 232 <if test="record.id != null">
226 233 id = #{record.id,jdbcType=BIGINT},
... ... @@ -228,6 +235,9 @@
228 235 <if test="record.caseId != null">
229 236 case_id = #{record.caseId,jdbcType=BIGINT},
230 237 </if>
  238 + <if test="record.quantity != null">
  239 + quantity = #{record.quantity,jdbcType=BIGINT},
  240 + </if>
231 241 <if test="record.expense != null">
232 242 expense = #{record.expense,jdbcType=BIGINT},
233 243 </if>
... ... @@ -256,9 +266,10 @@
256 266 WARNING - @mbggenerated
257 267 This element is automatically generated by MyBatis Generator, do not modify.
258 268 -->
259   - update payment
  269 + update orders
260 270 set id = #{record.id,jdbcType=BIGINT},
261 271 case_id = #{record.caseId,jdbcType=BIGINT},
  272 + quantity = #{record.quantity,jdbcType=BIGINT},
262 273 expense = #{record.expense,jdbcType=BIGINT},
263 274 pay_type = #{record.payType,jdbcType=VARCHAR},
264 275 order_status = #{record.orderStatus,jdbcType=VARCHAR},
... ... @@ -269,16 +280,19 @@
269 280 <include refid="Update_By_Example_Where_Clause" />
270 281 </if>
271 282 </update>
272   - <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Payment">
  283 + <update id="updateByPrimaryKeySelective" parameterType="com.canrd.patent.dal.model.Order">
273 284 <!--
274 285 WARNING - @mbggenerated
275 286 This element is automatically generated by MyBatis Generator, do not modify.
276 287 -->
277   - update payment
  288 + update orders
278 289 <set>
279 290 <if test="caseId != null">
280 291 case_id = #{caseId,jdbcType=BIGINT},
281 292 </if>
  293 + <if test="quantity != null">
  294 + quantity = #{quantity,jdbcType=BIGINT},
  295 + </if>
282 296 <if test="expense != null">
283 297 expense = #{expense,jdbcType=BIGINT},
284 298 </if>
... ... @@ -300,13 +314,14 @@
300 314 </set>
301 315 where id = #{id,jdbcType=BIGINT}
302 316 </update>
303   - <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Payment">
  317 + <update id="updateByPrimaryKey" parameterType="com.canrd.patent.dal.model.Order">
304 318 <!--
305 319 WARNING - @mbggenerated
306 320 This element is automatically generated by MyBatis Generator, do not modify.
307 321 -->
308   - update payment
  322 + update orders
309 323 set case_id = #{caseId,jdbcType=BIGINT},
  324 + quantity = #{quantity,jdbcType=BIGINT},
310 325 expense = #{expense,jdbcType=BIGINT},
311 326 pay_type = #{payType,jdbcType=VARCHAR},
312 327 order_status = #{orderStatus,jdbcType=VARCHAR},
... ...
target/patent/error.jsp
  View file @c1000e1
... ... @@ -5,13 +5,18 @@
5 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6 6 <title>科路得</title>
7 7 <link rel="stylesheet" type="text/css" href="/css/pay.css">
  8 + <style type="text/css">
  9 + .content{
  10 +
  11 + }
  12 + </style>
8 13 </head>
9 14  
10 15 <body>
11 16 <jsp:include page="/include/header.jsp" flush="true"/>
12 17  
13 18 <div class="content">
14   - <p>小科程序猿正在努力修复</p>
  19 + <p style="margin: 0 auto;padding-top: 100px;padding-bottom: 100px;text-align: center">小科程序猿正在努力修复</p>
15 20 </div>
16 21  
17 22 <jsp:include page="/include/footer.jsp" flush="true"/>
... ...
target/patent/notice.jsp 0 → 100644
  View file @c1000e1
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <style type="text/css">
  8 + *{
  9 + margin:0 auto;
  10 + padding: 0;
  11 + }
  12 + .content{
  13 + min-height: 200px;
  14 + }
  15 + .content .show{
  16 + margin-top:20px;
  17 + width: 32%;
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 +<jsp:include page="/include/header.jsp" flush="true"/>
  24 +
  25 +<div class="content">
  26 + <div class="show">
  27 + <p>案件详情功能不断完善中......</p>
  28 + <p>小科即将与您联系......</p>
  29 + </div>
  30 +</div>
  31 +
  32 +<jsp:include page="/include/footer.jsp" flush="true"/>
  33 +</body>
  34 +</html>
... ...
target/patent/order_detail.jsp 0 → 100644
  View file @c1000e1
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <style type="text/css">
  8 + *{
  9 + margin:0 auto;
  10 + padding: 0;
  11 + }
  12 + .content{
  13 + min-height: 200px;
  14 + }
  15 + .content .show{
  16 + margin-top:20px;
  17 + width: 32%;
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 +<jsp:include page="/include/header.jsp" flush="true"/>
  24 +
  25 +<div class="content">
  26 + <div class="show">
  27 + <p>订单ID: ${order.id}</p>
  28 + </div>
  29 +</div>
  30 +
  31 +<jsp:include page="/include/footer.jsp" flush="true"/>
  32 +</body>
  33 +</html>
... ...
target/patent/pay.jsp
  View file @c1000e1
... ... @@ -193,7 +193,7 @@
193 193 $("#pay_phone").val(phone);
194 194 $("#in_name").val(company==null?person:company);
195 195 $("#pay_invoice").val(invoice);
196   - $("#pay_form").attr("action","/pay");
  196 + $("#pay_form").attr("action","/save_order");
197 197 $("#pay_form").submit();
198 198 }
199 199 /*var case_list_body=$(".case_list_body");
... ...
target/patent/pay_result.jsp 0 → 100644
  View file @c1000e1
  1 +<%@ page contentType="text/html;charset=UTF-8" language="java" %>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  6 + <title>科路得</title>
  7 + <style type="text/css">
  8 + *{
  9 + margin:0 auto;
  10 + padding: 0;
  11 + }
  12 + .content{
  13 + min-height: 200px;
  14 + }
  15 + .content .show{
  16 + margin-top:20px;
  17 + width: 32%;
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 +<jsp:include page="/include/header.jsp" flush="true"/>
  24 +
  25 +<div class="content">
  26 + <div class="show">
  27 + <p>订单ID: ${orderId}</p>
  28 + <p>支付结果: ${paymentResult}</p>
  29 + <p>支付金额: ${totalAmount}</p>
  30 + <p><a href="/query_order?orderId=${orderId}">查看订单</a></p>
  31 + <p><a href="/notice.jsp">案件详情</a></p>
  32 + </div>
  33 +</div>
  34 +
  35 +<jsp:include page="/include/footer.jsp" flush="true"/>
  36 +</body>
  37 +</html>
... ...
target/test-classes/com/canrd/patent/CommonTest.class
View file @c1000e1
No preview for this file type
target/test-classes/mbg/generatorConfig.xml
  View file @c1000e1
... ... @@ -48,7 +48,7 @@
48 48 <!-- 要生成哪些表-->
49 49 <table schema="public" tableName="mybatis_test" domainObjectName="MybatisTest"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
50 50 <table schema="public" tableName="casement" domainObjectName="Casement"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
51   - <table schema="public" tableName="payment" domainObjectName="Payment"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
  51 + <table schema="public" tableName="orders" domainObjectName="Order"><generatedKey column="id" sqlStatement="Mysql" type="post" identity="true"/></table>
52 52 <!-- java -jar /Users/ouyangmao/.m2/repository/org/mybatis/generator/mybatis-generator-core/1.3.2/mybatis-generator-core-1.3.2.jar -configfile src/test/resources/mbg/generatorConfig.xml -overwrite
53 53 -->
54 54 </context>
... ...