张延森 3 years ago
parent
commit
f6fbe65653

+ 5
- 0
pom.xml View File

93
 		<!--weixin-miniapp start-->
93
 		<!--weixin-miniapp start-->
94
 
94
 
95
 		<!--weixin-pay start-->
95
 		<!--weixin-pay start-->
96
+		<dependency>
97
+			<groupId>org.jodd</groupId>
98
+			<artifactId>jodd-util</artifactId>
99
+			<version>6.1.0</version>
100
+		</dependency>
96
 		<dependency>
101
 		<dependency>
97
 			<groupId>com.github.binarywang</groupId>
102
 			<groupId>com.github.binarywang</groupId>
98
 			<artifactId>weixin-java-pay</artifactId>
103
 			<artifactId>weixin-java-pay</artifactId>

+ 5
- 0
src/main/java/com/njyunzhi/pet_identity/controller/WxMaController.java View File

8
 import com.njyunzhi.pet_identity.common.*;
8
 import com.njyunzhi.pet_identity.common.*;
9
 import com.njyunzhi.pet_identity.entity.TaPerson;
9
 import com.njyunzhi.pet_identity.entity.TaPerson;
10
 import com.njyunzhi.pet_identity.service.ITaPersonService;
10
 import com.njyunzhi.pet_identity.service.ITaPersonService;
11
+import com.njyunzhi.pet_identity.service.ITaPetIdentityService;
11
 import com.njyunzhi.pet_identity.service.ITaPetService;
12
 import com.njyunzhi.pet_identity.service.ITaPetService;
12
 import com.njyunzhi.pet_identity.vo.MaLogin;
13
 import com.njyunzhi.pet_identity.vo.MaLogin;
13
 import com.njyunzhi.pet_identity.vo.WxMaAuthParam;
14
 import com.njyunzhi.pet_identity.vo.WxMaAuthParam;
34
     @Autowired
35
     @Autowired
35
     ITaPetService iTaPetService;
36
     ITaPetService iTaPetService;
36
 
37
 
38
+    @Autowired
39
+    ITaPetIdentityService iTaPetIdentityService;
40
+
37
     @Autowired
41
     @Autowired
38
     WxUtils wxUtils;
42
     WxUtils wxUtils;
39
 
43
 
75
         Map<String, Object> res = new HashMap<>();
79
         Map<String, Object> res = new HashMap<>();
76
         res.put("person", taPerson);
80
         res.put("person", taPerson);
77
         res.put("pets", iTaPetService.getListBy("person_id", taPerson.getPersonId(), true, true));
81
         res.put("pets", iTaPetService.getListBy("person_id", taPerson.getPersonId(), true, true));
82
+        res.put("cards", iTaPetIdentityService.getListBy("person_id", taPerson.getPersonId(), true, true));
78
         res.put("token", StpUtil.getTokenValue());
83
         res.put("token", StpUtil.getTokenValue());
79
         res.put("sessionKey", sessionKey);
84
         res.put("sessionKey", sessionKey);
80
 
85
 

+ 1
- 1
src/main/resources/application.yml View File

73
     aesKey:
73
     aesKey:
74
     msgDataFormat: JSON
74
     msgDataFormat: JSON
75
   pay:
75
   pay:
76
-    appId: wx94f23e5b285c046d
76
+    appId: wxe44244d1a5ea3364
77
     mchId: 1621038483
77
     mchId: 1621038483
78
     mchKey: #????
78
     mchKey: #????
79
     subAppId: #??????????????ID
79
     subAppId: #??????????????ID