fuxingfan
/
smartCommunity
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 1 Peticiones pull 0 Lanzamientos 4 Activity
Explorar el Código

合并

dingxin hace 6 años
padre
39f519e674
commit
a45f4138ed
Se han modificado 9 ficheros con 1631 adiciones y 913 borrados
Dividir vista Mostrar estadísticas de diff
  1. 302
    77
      CODE/smart-community-word/.idea/workspace.xml
  2. 45
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java
  3. 114
    0
      CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionLike.java
  4. 20
    3
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java
  5. 2
    1
      CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml
  6. 142
    0
      CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionLikeMapper.xml
  7. 3
    0
      VUECODE/smart-property-manage/src/views/bill/statement/index.vue
  8. 1003
    832
      文档/MYSQL/smartCommunity.pdb
  9. BIN
      文档/计划/V1.6.0/智慧社区V1.6.0.mpp

+ 302
- 77
CODE/smart-community-word/.idea/workspace.xml Ver fichero 

@@ -2,10 +2,10 @@
2 2 
 <project version="4">
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
5 
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" afterDir="false" />
6 
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" afterDir="false" />
7 
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" afterDir="false" />
8 
-      <change beforePath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" afterDir="false" />
5 
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" afterDir="false" />
6 
+      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml" afterDir="false" />
7 
+      <change beforePath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/bill/statement/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../../VUECODE/smart-property-manage/src/views/bill/statement/index.vue" afterDir="false" />
8 
+      <change beforePath="$PROJECT_DIR$/../../文档/MYSQL/smartCommunity.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/../../文档/MYSQL/smartCommunity.pdb" afterDir="false" />
9 9 
     </list>
10 10 
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
11 11 
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
 
@@ -23,31 +23,106 @@
23 23 
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
24 24 
     <option name="LAST_RESOLUTION" value="IGNORE" />
25 25 
   </component>
26 
+  <component name="CoverageDataManager">
27 
+    <SUITE FILE_PATH="coverage/smart_community_word$PropertyApplication.ic" NAME="PropertyApplication Coverage Results" MODIFIED="1552024801928" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
28 
+  </component>
26 29 
   <component name="FileEditorManager">
27 30 
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
31 
+      <file pinned="false" current-in-tab="true">
32 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
33 
+          <provider selected="true" editor-type-id="text-editor">
34 
+            <state relative-caret-position="701">
35 
+              <caret line="623" column="23" selection-start-line="623" selection-start-column="23" selection-end-line="623" selection-end-column="23" />
36 
+            </state>
37 
+          </provider>
38 
+        </entry>
39 
+      </file>
28 40 
       <file pinned="false" current-in-tab="false">
29 
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/TpTicketService.java">
41 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionLike.java">
30 42 
           <provider selected="true" editor-type-id="text-editor">
31 
-            <state relative-caret-position="378">
32 
-              <caret line="48" column="23" lean-forward="true" selection-start-line="48" selection-start-column="17" selection-end-line="48" selection-end-column="26" />
43 
+            <state relative-caret-position="513">
44 
+              <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
45 
+              <folding>
46 
+                <element signature="e#537#538#0" expanded="true" />
47 
+                <element signature="e#563#564#0" expanded="true" />
48 
+                <element signature="e#602#603#0" expanded="true" />
49 
+                <element signature="e#632#633#0" expanded="true" />
50 
+                <element signature="e#528#529#0" expanded="true" />
51 
+                <element signature="e#570#571#0" expanded="true" />
52 
+                <element signature="e#625#626#0" expanded="true" />
53 
+                <element signature="e#671#672#0" expanded="true" />
54 
+                <element signature="e#708#709#0" expanded="true" />
55 
+                <element signature="e#740#741#0" expanded="true" />
56 
+                <element signature="e#779#780#0" expanded="true" />
57 
+                <element signature="e#813#814#0" expanded="true" />
58 
+                <element signature="e#843#844#0" expanded="true" />
59 
+                <element signature="e#868#869#0" expanded="true" />
60 
+                <element signature="e#905#906#0" expanded="true" />
61 
+                <element signature="e#933#934#0" expanded="true" />
62 
+                <element signature="e#972#973#0" expanded="true" />
63 
+                <element signature="e#1006#1007#0" expanded="true" />
64 
+                <element signature="e#1061#1062#0" expanded="true" />
65 
+                <element signature="e#1107#1108#0" expanded="true" />
66 
+                <element signature="e#1143#1144#0" expanded="true" />
67 
+                <element signature="e#1174#1175#0" expanded="true" />
68 
+                <element signature="e#1223#1224#0" expanded="true" />
69 
+                <element signature="e#1263#1264#0" expanded="true" />
70 
+                <element signature="e#1304#1305#0" expanded="true" />
71 
+                <element signature="e#1340#1341#0" expanded="true" />
72 
+                <element signature="e#1399#1400#0" expanded="true" />
73 
+                <element signature="e#1449#1450#0" expanded="true" />
74 
+                <element signature="e#1486#1487#0" expanded="true" />
75 
+                <element signature="e#1519#1520#0" expanded="true" />
76 
+                <element signature="e#1571#1572#0" expanded="true" />
77 
+                <element signature="e#1650#1651#0" expanded="true" />
78 
+                <element signature="e#1685#1686#0" expanded="true" />
79 
+                <element signature="e#1718#1719#0" expanded="true" />
80 
+                <element signature="e#1768#1769#0" expanded="true" />
81 
+                <element signature="e#1812#1813#0" expanded="true" />
82 
+                <element signature="e#1847#1848#0" expanded="true" />
83 
+                <element signature="e#1880#1881#0" expanded="true" />
84 
+                <element signature="e#1930#1931#0" expanded="true" />
85 
+                <element signature="e#1974#1975#0" expanded="true" />
86 
+              </folding>
33 87 
             </state>
34 88 
           </provider>
35 89 
         </entry>
36 90 
       </file>
37 
-      <file pinned="false" current-in-tab="true">
38 
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java">
91 
+      <file pinned="false" current-in-tab="false">
92 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java">
93 
+          <provider selected="true" editor-type-id="text-editor">
94 
+            <state relative-caret-position="647">
95 
+              <caret line="43" column="21" selection-start-line="43" selection-start-column="21" selection-end-line="43" selection-end-column="21" />
96 
+              <folding>
97 
+                <element signature="imports" expanded="true" />
98 
+              </folding>
99 
+            </state>
100 
+          </provider>
101 
+        </entry>
102 
+      </file>
103 
+      <file pinned="false" current-in-tab="false">
104 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionLikeMapper.xml">
39 105 
           <provider selected="true" editor-type-id="text-editor">
40 
-            <state relative-caret-position="585">
41 
-              <caret line="249" column="46" lean-forward="true" selection-start-line="249" selection-start-column="46" selection-end-line="249" selection-end-column="46" />
106 
+            <state relative-caret-position="242">
107 
+              <caret line="125" column="44" selection-start-line="125" selection-start-column="44" selection-end-line="125" selection-end-column="44" />
42 108 
             </state>
43 109 
           </provider>
44 110 
         </entry>
45 111 
       </file>
46 112 
       <file pinned="false" current-in-tab="false">
47 
-        <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/TpTicket.java">
113 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
48 114 
           <provider selected="true" editor-type-id="text-editor">
49 
-            <state relative-caret-position="55">
50 
-              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
115 
+            <state relative-caret-position="512">
116 
+              <caret line="451" column="62" selection-start-line="451" selection-start-column="62" selection-end-line="451" selection-end-column="62" />
117 
+            </state>
118 
+          </provider>
119 
+        </entry>
120 
+      </file>
121 
+      <file pinned="false" current-in-tab="false">
122 
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java">
123 
+          <provider selected="true" editor-type-id="text-editor">
124 
+            <state relative-caret-position="629">
125 
+              <caret line="195" column="25" selection-start-line="195" selection-start-column="17" selection-end-line="195" selection-end-column="36" />
51 126 
             </state>
52 127 
           </provider>
53 128 
         </entry>
 
@@ -122,13 +197,16 @@
122 197 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java" />
123 198 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/ToCommunitiesMapper.java" />
124 199 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/ToCommunitiesMapper.xml" />
125 
-        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
126 200 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/model/Message.java" />
127 201 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/MessageMapper.xml" />
128 202 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpAnnouncementServiceImpl.java" />
129 203 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java" />
130 204 
         <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" />
131 205 
         <option value="$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java" />
206 
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionLikeMapper.xml" />
207 
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java" />
208 
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionLike.java" />
209 
+        <option value="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java" />
132 210 
       </list>
133 211 
     </option>
134 212 
   </component>
 
@@ -150,9 +228,9 @@
150 228 
     <option name="jreName" value="1.8" />
151 229 
     <option name="vmOptions" value="-DarchetypeCatalog=internal" />
152 230 
   </component>
153 
-  <component name="ProjectFrameBounds" extendedState="7">
154 
-    <option name="x" value="953" />
155 
-    <option name="width" value="974" />
231 
+  <component name="ProjectFrameBounds" extendedState="6">
232 
+    <option name="x" value="168" />
233 
+    <option name="width" value="1759" />
156 234 
     <option name="height" value="1047" />
157 235 
   </component>
158 236 
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
 
@@ -161,6 +239,7 @@
161 239 
       <foldersAlwaysOnTop value="true" />
162 240 
     </navigator>
163 241 
     <panes>
242 
+      <pane id="PackagesPane" />
164 243 
       <pane id="ProjectPane">
165 244 
         <subPane>
166 245 
           <expand>
 
@@ -176,63 +255,82 @@
176 255 
             <path>
177 256 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
178 257 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
179 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
258 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
259 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
180 260 
             </path>
181 261 
             <path>
182 262 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
183 263 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
184 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
264 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
185 265 
               <item name="src" type="462c0819:PsiDirectoryNode" />
266 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
186 267 
             </path>
187 268 
             <path>
188 269 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
189 270 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
190 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
271 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
191 272 
               <item name="src" type="462c0819:PsiDirectoryNode" />
192 273 
               <item name="main" type="462c0819:PsiDirectoryNode" />
274 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
193 275 
             </path>
194 276 
             <path>
195 277 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
196 278 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
197 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
279 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
198 280 
               <item name="src" type="462c0819:PsiDirectoryNode" />
199 281 
               <item name="main" type="462c0819:PsiDirectoryNode" />
200 282 
               <item name="java" type="462c0819:PsiDirectoryNode" />
283 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
201 284 
             </path>
202 285 
             <path>
203 286 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
204 287 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
205 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
288 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
206 289 
               <item name="src" type="462c0819:PsiDirectoryNode" />
207 290 
               <item name="main" type="462c0819:PsiDirectoryNode" />
208 291 
               <item name="java" type="462c0819:PsiDirectoryNode" />
209 292 
               <item name="com" type="462c0819:PsiDirectoryNode" />
293 
+              <item name="community" type="462c0819:PsiDirectoryNode" />
210 294 
             </path>
211 295 
             <path>
212 296 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
213 297 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
214 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
298 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
215 299 
               <item name="src" type="462c0819:PsiDirectoryNode" />
216 300 
               <item name="main" type="462c0819:PsiDirectoryNode" />
217 301 
               <item name="java" type="462c0819:PsiDirectoryNode" />
218 302 
               <item name="com" type="462c0819:PsiDirectoryNode" />
219 303 
               <item name="community" type="462c0819:PsiDirectoryNode" />
304 
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
220 305 
             </path>
221 306 
             <path>
222 307 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
223 308 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
224 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
309 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
225 310 
               <item name="src" type="462c0819:PsiDirectoryNode" />
226 311 
               <item name="main" type="462c0819:PsiDirectoryNode" />
227 312 
               <item name="java" type="462c0819:PsiDirectoryNode" />
228 313 
               <item name="com" type="462c0819:PsiDirectoryNode" />
229 314 
               <item name="community" type="462c0819:PsiDirectoryNode" />
230 315 
               <item name="huiju" type="462c0819:PsiDirectoryNode" />
316 
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
231 317 
             </path>
232 318 
             <path>
233 319 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
234 320 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
235 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
321 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
322 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
323 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
324 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
325 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
326 
+              <item name="community" type="462c0819:PsiDirectoryNode" />
327 
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
328 
+              <item name="dao" type="462c0819:PsiDirectoryNode" />
329 
+            </path>
330 
+            <path>
331 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
332 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
333 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
236 334 
               <item name="src" type="462c0819:PsiDirectoryNode" />
237 335 
               <item name="main" type="462c0819:PsiDirectoryNode" />
238 336 
               <item name="java" type="462c0819:PsiDirectoryNode" />
 
@@ -244,7 +342,7 @@
244 342 
             <path>
245 343 
               <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
246 344 
               <item name="smart-community" type="462c0819:PsiDirectoryNode" />
247 
-              <item name="property-api" type="462c0819:PsiDirectoryNode" />
345 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
248 346 
               <item name="src" type="462c0819:PsiDirectoryNode" />
249 347 
               <item name="main" type="462c0819:PsiDirectoryNode" />
250 348 
               <item name="java" type="462c0819:PsiDirectoryNode" />
 
@@ -254,11 +352,95 @@
254 352 
               <item name="service" type="462c0819:PsiDirectoryNode" />
255 353 
               <item name="impl" type="462c0819:PsiDirectoryNode" />
256 354 
             </path>
355 
+            <path>
356 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
357 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
358 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
359 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
360 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
361 
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
362 
+            </path>
363 
+            <path>
364 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
365 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
366 
+              <item name="app-api" type="462c0819:PsiDirectoryNode" />
367 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
368 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
369 
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
370 
+              <item name="mapper" type="462c0819:PsiDirectoryNode" />
371 
+            </path>
372 
+            <path>
373 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
374 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
375 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
376 
+            </path>
377 
+            <path>
378 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
379 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
380 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
381 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
382 
+            </path>
383 
+            <path>
384 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
385 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
386 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
387 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
388 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
389 
+            </path>
390 
+            <path>
391 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
392 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
393 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
394 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
395 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
396 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
397 
+            </path>
398 
+            <path>
399 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
400 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
401 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
402 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
403 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
404 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
405 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
406 
+            </path>
407 
+            <path>
408 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
409 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
410 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
411 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
412 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
413 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
414 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
415 
+              <item name="community" type="462c0819:PsiDirectoryNode" />
416 
+            </path>
417 
+            <path>
418 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
419 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
420 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
421 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
422 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
423 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
424 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
425 
+              <item name="community" type="462c0819:PsiDirectoryNode" />
426 
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
427 
+            </path>
428 
+            <path>
429 
+              <item name="smart-community-word" type="b2602c69:ProjectViewProjectNode" />
430 
+              <item name="smart-community" type="462c0819:PsiDirectoryNode" />
431 
+              <item name="property-api" type="462c0819:PsiDirectoryNode" />
432 
+              <item name="src" type="462c0819:PsiDirectoryNode" />
433 
+              <item name="main" type="462c0819:PsiDirectoryNode" />
434 
+              <item name="java" type="462c0819:PsiDirectoryNode" />
435 
+              <item name="com" type="462c0819:PsiDirectoryNode" />
436 
+              <item name="community" type="462c0819:PsiDirectoryNode" />
437 
+              <item name="huiju" type="462c0819:PsiDirectoryNode" />
438 
+              <item name="model" type="462c0819:PsiDirectoryNode" />
439 
+            </path>
257 440 
           </expand>
258 441 
           <select />
259 442 
         </subPane>
260 443 
       </pane>
261 
-      <pane id="PackagesPane" />
262 444 
       <pane id="Scope" />
263 445 
     </panes>
264 446 
   </component>
 
@@ -269,7 +451,7 @@
269 451 
     <property name="RequestMappingsPanelWidth1" value="75" />
270 452 
     <property name="WebServerToolWindowFactoryState" value="false" />
271 453 
     <property name="aspect.path.notification.shown" value="true" />
272 
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551951295521" />
454 
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552545737254" />
273 455 
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
274 456 
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
275 457 
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
 
@@ -433,13 +615,13 @@
433 615 
     <servers />
434 616 
   </component>
435 617 
   <component name="TimeTrackingManager">
436 
-    <option name="totallyTimeSpent" value="149388000" />
618 
+    <option name="totallyTimeSpent" value="151477000" />
437 619 
   </component>
438 620 
   <component name="ToolWindowManager">
439 
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
621 
+    <frame x="168" y="0" width="1759" height="1047" extended-state="0" />
440 622 
     <editor active="true" />
441 623 
     <layout>
442 
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12846482" />
624 
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.017657446" />
443 625 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
444 626 
       <window_info id="Designer" order="2" />
445 627 
       <window_info id="Image Layers" order="3" />
 
@@ -450,7 +632,7 @@
450 632 
       <window_info anchor="bottom" id="Message" order="0" />
451 633 
       <window_info anchor="bottom" id="Find" order="1" />
452 634 
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.3530067" />
453 
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" visible="true" weight="0.06013363" />
635 
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.8544776" weight="0.06013363" />
454 636 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
455 637 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
456 638 
       <window_info anchor="bottom" id="TODO" order="6" />
 
@@ -571,32 +753,6 @@
571 753 
     </breakpoint-manager>
572 754 
   </component>
573 755 
   <component name="editorHistoryManager">
574 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/BillStatementMapper.java">
575 
-      <provider selected="true" editor-type-id="text-editor">
576 
-        <state relative-caret-position="351">
577 
-          <caret line="21" column="17" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
578 
-        </state>
579 
-      </provider>
580 
-    </entry>
581 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/resources/mapper/BillStatementMapper.xml">
582 
-      <provider selected="true" editor-type-id="text-editor" />
583 
-    </entry>
584 
-    <entry file="file://$PROJECT_DIR$/../smart-community/property-api/target/classes/com/community/huiju/dao/MessageMapper.class">
585 
-      <provider selected="true" editor-type-id="text-editor">
586 
-        <state>
587 
-          <folding>
588 
-            <element signature="e#0#725#0" expanded="true" />
589 
-          </folding>
590 
-        </state>
591 
-      </provider>
592 
-    </entry>
593 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpBillStatementMapper.xml">
594 
-      <provider selected="true" editor-type-id="text-editor">
595 
-        <state relative-caret-position="297">
596 
-          <caret line="95" column="39" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="39" />
597 
-        </state>
598 
-      </provider>
599 
-    </entry>
600 756 
     <entry file="jar://F:/maven3.5/maven/serverRepository/com/alibaba/fastjson/1.2.56/fastjson-1.2.56-sources.jar!/com/alibaba/fastjson/JSONObject.java">
601 757 
       <provider selected="true" editor-type-id="text-editor">
602 758 
         <state relative-caret-position="228">
 
@@ -798,13 +954,6 @@
798 954 
         </state>
799 955 
       </provider>
800 956 
     </entry>
801 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
802 
-      <provider selected="true" editor-type-id="text-editor">
803 
-        <state relative-caret-position="453">
804 
-          <caret line="321" column="51" selection-start-line="321" selection-start-column="47" selection-end-line="321" selection-end-column="64" />
805 
-        </state>
806 
-      </provider>
807 
-    </entry>
808 957 
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/controller/TransactionController.java">
809 958 
       <provider selected="true" editor-type-id="text-editor">
810 959 
         <state relative-caret-position="324">
 
@@ -826,17 +975,6 @@
826 975 
         </state>
827 976 
       </provider>
828 977 
     </entry>
829 
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
830 
-      <provider selected="true" editor-type-id="text-editor">
831 
-        <state relative-caret-position="406">
832 
-          <caret line="721" column="5" lean-forward="true" selection-start-line="721" selection-start-column="5" selection-end-line="721" selection-end-column="5" />
833 
-          <folding>
834 
-            <element signature="e#19092#19093#0" expanded="true" />
835 
-            <element signature="e#19153#19154#0" expanded="true" />
836 
-          </folding>
837 
-        </state>
838 
-      </provider>
839 
-    </entry>
840 978 
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/MessageMapper.java">
841 979 
       <provider selected="true" editor-type-id="text-editor">
842 980 
         <state relative-caret-position="315">
 
@@ -941,6 +1079,93 @@
941 1079 
         </state>
942 1080 
       </provider>
943 1081 
     </entry>
1082 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java">
1083 
+      <provider selected="true" editor-type-id="text-editor">
1084 
+        <state relative-caret-position="629">
1085 
+          <caret line="195" column="25" selection-start-line="195" selection-start-column="17" selection-end-line="195" selection-end-column="36" />
1086 
+        </state>
1087 
+      </provider>
1088 
+    </entry>
1089 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java">
1090 
+      <provider selected="true" editor-type-id="text-editor">
1091 
+        <state relative-caret-position="512">
1092 
+          <caret line="451" column="62" selection-start-line="451" selection-start-column="62" selection-end-line="451" selection-end-column="62" />
1093 
+        </state>
1094 
+      </provider>
1095 
+    </entry>
1096 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java">
1097 
+      <provider selected="true" editor-type-id="text-editor">
1098 
+        <state relative-caret-position="647">
1099 
+          <caret line="43" column="21" selection-start-line="43" selection-start-column="21" selection-end-line="43" selection-end-column="21" />
1100 
+          <folding>
1101 
+            <element signature="imports" expanded="true" />
1102 
+          </folding>
1103 
+        </state>
1104 
+      </provider>
1105 
+    </entry>
1106 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTransactionLikeMapper.xml">
1107 
+      <provider selected="true" editor-type-id="text-editor">
1108 
+        <state relative-caret-position="242">
1109 
+          <caret line="125" column="44" selection-start-line="125" selection-start-column="44" selection-end-line="125" selection-end-column="44" />
1110 
+        </state>
1111 
+      </provider>
1112 
+    </entry>
1113 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionLike.java">
1114 
+      <provider selected="true" editor-type-id="text-editor">
1115 
+        <state relative-caret-position="513">
1116 
+          <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
1117 
+          <folding>
1118 
+            <element signature="e#537#538#0" expanded="true" />
1119 
+            <element signature="e#563#564#0" expanded="true" />
1120 
+            <element signature="e#602#603#0" expanded="true" />
1121 
+            <element signature="e#632#633#0" expanded="true" />
1122 
+            <element signature="e#528#529#0" expanded="true" />
1123 
+            <element signature="e#570#571#0" expanded="true" />
1124 
+            <element signature="e#625#626#0" expanded="true" />
1125 
+            <element signature="e#671#672#0" expanded="true" />
1126 
+            <element signature="e#708#709#0" expanded="true" />
1127 
+            <element signature="e#740#741#0" expanded="true" />
1128 
+            <element signature="e#779#780#0" expanded="true" />
1129 
+            <element signature="e#813#814#0" expanded="true" />
1130 
+            <element signature="e#843#844#0" expanded="true" />
1131 
+            <element signature="e#868#869#0" expanded="true" />
1132 
+            <element signature="e#905#906#0" expanded="true" />
1133 
+            <element signature="e#933#934#0" expanded="true" />
1134 
+            <element signature="e#972#973#0" expanded="true" />
1135 
+            <element signature="e#1006#1007#0" expanded="true" />
1136 
+            <element signature="e#1061#1062#0" expanded="true" />
1137 
+            <element signature="e#1107#1108#0" expanded="true" />
1138 
+            <element signature="e#1143#1144#0" expanded="true" />
1139 
+            <element signature="e#1174#1175#0" expanded="true" />
1140 
+            <element signature="e#1223#1224#0" expanded="true" />
1141 
+            <element signature="e#1263#1264#0" expanded="true" />
1142 
+            <element signature="e#1304#1305#0" expanded="true" />
1143 
+            <element signature="e#1340#1341#0" expanded="true" />
1144 
+            <element signature="e#1399#1400#0" expanded="true" />
1145 
+            <element signature="e#1449#1450#0" expanded="true" />
1146 
+            <element signature="e#1486#1487#0" expanded="true" />
1147 
+            <element signature="e#1519#1520#0" expanded="true" />
1148 
+            <element signature="e#1571#1572#0" expanded="true" />
1149 
+            <element signature="e#1650#1651#0" expanded="true" />
1150 
+            <element signature="e#1685#1686#0" expanded="true" />
1151 
+            <element signature="e#1718#1719#0" expanded="true" />
1152 
+            <element signature="e#1768#1769#0" expanded="true" />
1153 
+            <element signature="e#1812#1813#0" expanded="true" />
1154 
+            <element signature="e#1847#1848#0" expanded="true" />
1155 
+            <element signature="e#1880#1881#0" expanded="true" />
1156 
+            <element signature="e#1930#1931#0" expanded="true" />
1157 
+            <element signature="e#1974#1975#0" expanded="true" />
1158 
+          </folding>
1159 
+        </state>
1160 
+      </provider>
1161 
+    </entry>
1162 
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java">
1163 
+      <provider selected="true" editor-type-id="text-editor">
1164 
+        <state relative-caret-position="701">
1165 
+          <caret line="623" column="23" selection-start-line="623" selection-start-column="23" selection-end-line="623" selection-end-column="23" />
1166 
+        </state>
1167 
+      </provider>
1168 
+    </entry>
944 1169 
   </component>
945 1170 
   <component name="masterDetails">
946 1171 
     <states>

+ 45
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionLikeMapper.java Ver fichero 

@@ -0,0 +1,45 @@
1 
+package com.community.huiju.dao;
2 
+
3 
+import com.community.huiju.model.TpTransactionLike;
4 
+import org.apache.ibatis.annotations.Param;
5 
+
6 
+public interface TpTransactionLikeMapper {
7 
+    int deleteByPrimaryKey(Integer id);
8 
+
9 
+    int insert(TpTransactionLike record);
10 
+
11 
+    int insertSelective(TpTransactionLike record);
12 
+
13 
+    TpTransactionLike selectByPrimaryKey(Integer id);
14 
+
15 
+    int updateByPrimaryKeySelective(TpTransactionLike record);
16 
+
17 
+    int updateByPrimaryKey(TpTransactionLike record);
18 
+
19 
+    /**
20 
+     * 点赞
21 
+     * @param invitationId
22 
+     * @param communityId
23 
+     * @param userId
24 
+     * @return
25 
+     */
26 
+    Integer likeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId, @Param("userId") Integer userId);
27 
+
28 
+    /**
29 
+     * 踩
30 
+     * @param invitationId
31 
+     * @param communityId
32 
+     * @param userId
33 
+     * @return
34 
+     */
35 
+    Integer nolikeCount(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId, @Param("userId") Integer userId);
36 
+
37 
+    /**
38 
+     * 查询当前人是否存在数据
39 
+     * @param invitationId
40 
+     * @param communityId
41 
+     * @param userId
42 
+     * @return
43 
+     */
44 
+    TpTransactionLike getinvitationId(@Param("invitationId") Integer invitationId, @Param("communityId") Integer communityId, @Param("userId") Integer userId);
45 
+}

+ 114
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransactionLike.java Ver fichero 

@@ -0,0 +1,114 @@
1 
+package com.community.huiju.model;
2 
+
3 
+import java.util.Date;
4 
+
5 
+public class TpTransactionLike {
6 
+    private Integer id;
7 
+
8 
+    private Integer communityId;
9 
+
10 
+    private Integer taUserId;
11 
+
12 
+    private Integer transactionId;
13 
+
14 
+    private String likeStatus;
15 
+
16 
+    private Date createDate;
17 
+
18 
+    private Date updateDate;
19 
+    /**
20 
+     * 点赞次数
21 
+     */
22 
+    private Integer likeCount;
23 
+
24 
+    /**
25 
+     * 踩的次数
26 
+     */
27 
+    private Integer noLikeCount;
28 
+
29 
+    /**
30 
+     * 帖子是否被自己评价或踩
31 
+     * @param likeCount
32 
+     */
33 
+    Boolean bel;
34 
+
35 
+    public Boolean getBel() {
36 
+        return bel;
37 
+    }
38 
+
39 
+    public void setBel(Boolean bel) {
40 
+        this.bel = bel;
41 
+    }
42 
+
43 
+    public void setLikeCount(Integer likeCount) {
44 
+        this.likeCount = likeCount;
45 
+    }
46 
+
47 
+    public void setNoLikeCount(Integer noLikeCount) {
48 
+        this.noLikeCount = noLikeCount;
49 
+    }
50 
+
51 
+    public Integer getLikeCount() {
52 
+        return likeCount;
53 
+    }
54 
+
55 
+    public Integer getNoLikeCount() {
56 
+        return noLikeCount;
57 
+    }
58 
+
59 
+    public Integer getId() {
60 
+        return id;
61 
+    }
62 
+
63 
+    public void setId(Integer id) {
64 
+        this.id = id;
65 
+    }
66 
+
67 
+    public Integer getCommunityId() {
68 
+        return communityId;
69 
+    }
70 
+
71 
+    public void setCommunityId(Integer communityId) {
72 
+        this.communityId = communityId;
73 
+    }
74 
+
75 
+    public Integer getTaUserId() {
76 
+        return taUserId;
77 
+    }
78 
+
79 
+    public void setTaUserId(Integer taUserId) {
80 
+        this.taUserId = taUserId;
81 
+    }
82 
+
83 
+    public Integer getTransactionId() {
84 
+        return transactionId;
85 
+    }
86 
+
87 
+    public void setTransactionId(Integer transactionId) {
88 
+        this.transactionId = transactionId;
89 
+    }
90 
+
91 
+    public String getLikeStatus() {
92 
+        return likeStatus;
93 
+    }
94 
+
95 
+    public void setLikeStatus(String likeStatus) {
96 
+        this.likeStatus = likeStatus == null ? null : likeStatus.trim();
97 
+    }
98 
+
99 
+    public Date getCreateDate() {
100 
+        return createDate;
101 
+    }
102 
+
103 
+    public void setCreateDate(Date createDate) {
104 
+        this.createDate = createDate;
105 
+    }
106 
+
107 
+    public Date getUpdateDate() {
108 
+        return updateDate;
109 
+    }
110 
+
111 
+    public void setUpdateDate(Date updateDate) {
112 
+        this.updateDate = updateDate;
113 
+    }
114 
+}

+ 20
- 3
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java Ver fichero 

@@ -88,6 +88,9 @@ public class SocialServiceImpl implements SocialServiceI {
88 88 
     @Autowired
89 89 
     private TpTransactionReplyMapper tpTransactionReplyMapper;
90 90
91 
+    @Autowired
92 
+    private  TpTransactionLikeMapper tpTransactionLikeMapper;
93 
+
91 94 
     @Override
92 95 
     @Transactional
93 96 
     public TpAnnouncement findAnnouncementDetail(Integer id, Integer communityId, Integer userId) {
 
@@ -602,9 +605,23 @@ public class SocialServiceImpl implements SocialServiceI {
602 605 
     }
603 606
604 607 
     @Override
605 
-    public ResponseBean transactionLikeList(Integer id, UserElement userElement) {
606 
-
607 
-        return null;
608 
+    public ResponseBean transactionLikeList(Integer invitationId, UserElement userElement) {
609 
+        ResponseBean response= new ResponseBean();
610 
+        TpTransactionLike tpTransactionLike= new TpTransactionLike();
611 
+        //统计点赞人数的次数
612 
+        Integer likeCount= tpTransactionLikeMapper.likeCount(invitationId,userElement.getCommunityId(),userElement.getId());
613 
+        //不喜欢的人数
614 
+        Integer noLikeCount= tpTransactionLikeMapper.nolikeCount(invitationId,userElement.getCommunityId(),userElement.getId());
615 
+
616 
+        tpTransactionLike.setLikeCount(likeCount);
617 
+        tpTransactionLike.setNoLikeCount(noLikeCount);
618 
+        // 查看点前用户是否点赞或踩
619 
+        TpTransactionLike isUser= tpTransactionLikeMapper.getinvitationId(invitationId,userElement.getCommunityId(),userElement.getId());
620 
+        if (null!=isUser){
621 
+            tpTransactionLike.setBel(false);
622 
+        }
623 
+        response.addSuccess(tpTransactionLike);
624 
+        return response;
608 625 
     }
609 626
610 627

+ 2
- 1
CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml Ver fichero 

@@ -233,7 +233,8 @@
233 233 
           b.bill_name AS billName,
234 234 
           b.bill_explain AS billExplain,
235 235 
           b.end_date AS endDate,
236 
-          b.create_date AS createDate
236 
+          b.create_date AS createDate,
237 
+          i.out_trade_no AS outTradeNo
237 238 
       FROM
238 239 
           tp_bill_invoice i
239 240 
           LEFT JOIN tp_bill b ON b.id = i.bill_id

+ 142
- 0
CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionLikeMapper.xml Ver fichero 

@@ -0,0 +1,142 @@
1 
+<?xml version="1.0" encoding="UTF-8" ?>
2 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3 
+<mapper namespace="com.community.huiju.dao.TpTransactionLikeMapper" >
4 
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpTransactionLike" >
5 
+    <id column="id" property="id" jdbcType="INTEGER" />
6 
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
7 
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
8 
+    <result column="transaction_id" property="transactionId" jdbcType="INTEGER" />
9 
+    <result column="like_status" property="likeStatus" jdbcType="VARCHAR" />
10 
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
11 
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
12 
+  </resultMap>
13 
+  <sql id="Base_Column_List" >
14 
+    id, community_id, ta_user_id, transaction_id, like_status, create_date, update_date
15 
+  </sql>
16 
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
17 
+    select
18 
+    <include refid="Base_Column_List" />
19 
+    from tp_transaction_like
20 
+    where id = #{id,jdbcType=INTEGER}
21 
+  </select>
22 
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
23 
+    delete from tp_transaction_like
24 
+    where id = #{id,jdbcType=INTEGER}
25 
+  </delete>
26 
+  <insert id="insert" parameterType="com.community.huiju.model.TpTransactionLike" >
27 
+    insert into tp_transaction_like (id, community_id, ta_user_id,
28 
+      transaction_id, like_status, create_date,
29 
+      update_date)
30 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
31 
+      #{transactionId,jdbcType=INTEGER}, #{likeStatus,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
32 
+      #{updateDate,jdbcType=TIMESTAMP})
33 
+  </insert>
34 
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTransactionLike" >
35 
+    insert into tp_transaction_like
36 
+    <trim prefix="(" suffix=")" suffixOverrides="," >
37 
+      <if test="id != null" >
38 
+        id,
39 
+      </if>
40 
+      <if test="communityId != null" >
41 
+        community_id,
42 
+      </if>
43 
+      <if test="taUserId != null" >
44 
+        ta_user_id,
45 
+      </if>
46 
+      <if test="transactionId != null" >
47 
+        transaction_id,
48 
+      </if>
49 
+      <if test="likeStatus != null" >
50 
+        like_status,
51 
+      </if>
52 
+      <if test="createDate != null" >
53 
+        create_date,
54 
+      </if>
55 
+      <if test="updateDate != null" >
56 
+        update_date,
57 
+      </if>
58 
+    </trim>
59 
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
60 
+      <if test="id != null" >
61 
+        #{id,jdbcType=INTEGER},
62 
+      </if>
63 
+      <if test="communityId != null" >
64 
+        #{communityId,jdbcType=INTEGER},
65 
+      </if>
66 
+      <if test="taUserId != null" >
67 
+        #{taUserId,jdbcType=INTEGER},
68 
+      </if>
69 
+      <if test="transactionId != null" >
70 
+        #{transactionId,jdbcType=INTEGER},
71 
+      </if>
72 
+      <if test="likeStatus != null" >
73 
+        #{likeStatus,jdbcType=VARCHAR},
74 
+      </if>
75 
+      <if test="createDate != null" >
76 
+        #{createDate,jdbcType=TIMESTAMP},
77 
+      </if>
78 
+      <if test="updateDate != null" >
79 
+        #{updateDate,jdbcType=TIMESTAMP},
80 
+      </if>
81 
+    </trim>
82 
+  </insert>
83 
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransactionLike" >
84 
+    update tp_transaction_like
85 
+    <set >
86 
+      <if test="communityId != null" >
87 
+        community_id = #{communityId,jdbcType=INTEGER},
88 
+      </if>
89 
+      <if test="taUserId != null" >
90 
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
91 
+      </if>
92 
+      <if test="transactionId != null" >
93 
+        transaction_id = #{transactionId,jdbcType=INTEGER},
94 
+      </if>
95 
+      <if test="likeStatus != null" >
96 
+        like_status = #{likeStatus,jdbcType=VARCHAR},
97 
+      </if>
98 
+      <if test="createDate != null" >
99 
+        create_date = #{createDate,jdbcType=TIMESTAMP},
100 
+      </if>
101 
+      <if test="updateDate != null" >
102 
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
103 
+      </if>
104 
+    </set>
105 
+    where id = #{id,jdbcType=INTEGER}
106 
+  </update>
107 
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpTransactionLike" >
108 
+    update tp_transaction_like
109 
+    set community_id = #{communityId,jdbcType=INTEGER},
110 
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
111 
+      transaction_id = #{transactionId,jdbcType=INTEGER},
112 
+      like_status = #{likeStatus,jdbcType=VARCHAR},
113 
+      create_date = #{createDate,jdbcType=TIMESTAMP},
114 
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
115 
+    where id = #{id,jdbcType=INTEGER}
116 
+  </update>
117 
+  <select id="likeCount" resultType="int">
118 
+    SELECT COUNT(transaction_id) FROM
119 
+    tp_transaction_like
120 
+    WHERE like_status = 1
121 
+    and   community_id = #{communityId,jdbcType=INTEGER},
122 
+    and   ta_user_id = #{userId,jdbcType=INTEGER},
123 
+    and   transaction_id = #{invitationId,jdbcType=INTEGER}
124 
+  </select>
125 
+
126 
+  <select id="nolikeCount"  resultType="int">
127 
+    SELECT COUNT(transaction_id) FROM
128 
+    tp_transaction_like
129 
+    WHERE like_status = 2
130 
+    and   community_id = #{communityId,jdbcType=INTEGER},
131 
+    and   ta_user_id = #{userId,jdbcType=INTEGER},
132 
+    and   transaction_id = #{invitationId,jdbcType=INTEGER}
133 
+  </select>
134 
+
135 
+  <select id="getinvitationId" resultMap="BaseResultMap">
136 
+    SELECT * FROM
137 
+    tp_transaction_like
138 
+    WHERE community_id = #{communityId,jdbcType=INTEGER},
139 
+    and   ta_user_id = #{userId,jdbcType=INTEGER},
140 
+    and   transaction_id = #{invitationId,jdbcType=INTEGER}
141 
+  </select>
142 
+</mapper>

+ 3
- 0
VUECODE/smart-property-manage/src/views/bill/statement/index.vue Ver fichero 

@@ -161,6 +161,9 @@ export default {
161 161 
         case '1':
162 162 
           str = '线下缴费'
163 163 
           break
164 
+        case '2':
165 
+          str = '支付宝缴费'
166 
+          break
164 167 
       }
165 168 
       return str
166 169 
     },

+ 1003
- 832
文档/MYSQL/smartCommunity.pdb
La diferencia del archivo ha sido suprimido porque es demasiado grande
Ver fichero


BIN
文档/计划/V1.6.0/智慧社区V1.6.0.mpp Ver fichero