|
|
@@ -8,6 +8,7 @@ import cn.dev33.satoken.stp.StpUtil;
|
|
8
|
8
|
import com.njyunzhi.pet_identity.common.*;
|
|
9
|
9
|
import com.njyunzhi.pet_identity.entity.TaPerson;
|
|
10
|
10
|
import com.njyunzhi.pet_identity.service.ITaPersonService;
|
|
|
11
|
+import com.njyunzhi.pet_identity.service.ITaPetIdentityService;
|
|
11
|
12
|
import com.njyunzhi.pet_identity.service.ITaPetService;
|
|
12
|
13
|
import com.njyunzhi.pet_identity.vo.MaLogin;
|
|
13
|
14
|
import com.njyunzhi.pet_identity.vo.WxMaAuthParam;
|
|
|
@@ -34,6 +35,9 @@ public class WxMaController extends BaseController {
|
|
34
|
35
|
@Autowired
|
|
35
|
36
|
ITaPetService iTaPetService;
|
|
36
|
37
|
|
|
|
38
|
+ @Autowired
|
|
|
39
|
+ ITaPetIdentityService iTaPetIdentityService;
|
|
|
40
|
+
|
|
37
|
41
|
@Autowired
|
|
38
|
42
|
WxUtils wxUtils;
|
|
39
|
43
|
|
|
|
@@ -75,6 +79,7 @@ public class WxMaController extends BaseController {
|
|
75
|
79
|
Map<String, Object> res = new HashMap<>();
|
|
76
|
80
|
res.put("person", taPerson);
|
|
77
|
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
|
83
|
res.put("token", StpUtil.getTokenValue());
|
|
79
|
84
|
res.put("sessionKey", sessionKey);
|
|
80
|
85
|
|
