From 22e8a676ee42c0d78b3526bcd9a635abbe8dca03 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 28 六月 2022 11:28:21 +0800
Subject: [PATCH] 优化databus bug
---
service-user/src/main/java/com/java110/user/api/StaffApi.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/StaffApi.java b/service-user/src/main/java/com/java110/user/api/StaffApi.java
old mode 100644
new mode 100755
index fc99215..edc240a
--- a/service-user/src/main/java/com/java110/user/api/StaffApi.java
+++ b/service-user/src/main/java/com/java110/user/api/StaffApi.java
@@ -1,7 +1,10 @@
package com.java110.user.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.staffAppAuth.StaffAppAuthDto;
+import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.po.staffAppAuth.StaffAppAuthPo;
import com.java110.user.bmo.staffAppAuth.IDeleteStaffAppAuthBMO;
import com.java110.user.bmo.staffAppAuth.IGetStaffAppAuthBMO;
@@ -20,6 +23,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
@RestController
@RequestMapping(value = "/staff")
@@ -34,6 +39,9 @@
@Autowired
private IGetStaffAppAuthBMO getStaffAppAuthBMOImpl;
+
+ @Autowired
+ private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -57,18 +65,20 @@
/**
* 寰俊淇敼娑堟伅妯℃澘
*
- * @param reqJson
+ * @param param
* @return
* @serviceCode /staff/updateStaffAppAuth
* @path /app/staff/updateStaffAppAuth
+ * <p>
+ * {"openId":"oxeFbwJzDG8t87dVDcmrlRoPsTfM","appType":"WECHAT","state":"2002","storeId":"402019032924930007","staffId":"30518940136629616640"}
*/
@RequestMapping(value = "/updateStaffAppAuth", method = RequestMethod.POST)
- public ResponseEntity<String> updateStaffAppAuth(@RequestBody JSONObject reqJson) {
-
+ public ResponseEntity<String> updateStaffAppAuth(@RequestBody String param) {
+ JSONObject reqJson = JSONObject.parseObject(param);
Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
Assert.hasKeyAndValue(reqJson, "appType", "璇锋眰鎶ユ枃涓湭鍖呭惈appType");
- Assert.hasKeyAndValue(reqJson, "auId", "auId涓嶈兘涓虹┖");
-
+ Assert.hasKeyAndValue(reqJson, "openId", "璇锋眰鎶ユ枃涓湭鍖呭惈openId");
+ Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
StaffAppAuthPo staffAppAuthPo = BeanConvertUtil.covertBean(reqJson, StaffAppAuthPo.class);
return updateStaffAppAuthBMOImpl.update(staffAppAuthPo);
@@ -126,9 +136,19 @@
public ResponseEntity<String> generatorQrCode(@RequestHeader(value = "store-id") String storeId,
@RequestHeader(value = "user-id") String userId,
@RequestParam(value = "communityId") String communityId) {
+
+ SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
+ smallWeChatDto.setObjId(communityId);
+ smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
+ smallWeChatDto.setWechatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
+ List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL")
+ "/app/staffAuth?storeId=" + storeId + "&staffId=" + userId
- + "&communityId=" + communityId;
+ + "&communityId=" + communityId + "&appId=" + AppDto.WECHAT_OWNER_APP_ID;
+
+ if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
+ ownerUrl += ("&wAppId=" + smallWeChatDtos.get(0).getAppId());
+ }
return ResultVo.createResponseEntity(ownerUrl);
}
}
--
Gitblit v1.8.0