From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java
index 38fcbc6..f14a1c4 100755
--- a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineReturnRepairAdapt.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.WechatFactory;
-import com.java110.dto.basePrivilege.BasePrivilegeDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerRoomRelDto;
@@ -14,7 +13,6 @@
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
import com.java110.dto.staffAppAuth.StaffAppAuthDto;
-import com.java110.dto.user.UserDto;
import com.java110.entity.order.Business;
import com.java110.entity.wechat.Content;
import com.java110.entity.wechat.Data;
@@ -23,7 +21,6 @@
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairSettingInnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
-import com.java110.intf.order.IPrivilegeInnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
import com.java110.intf.user.*;
@@ -75,9 +72,6 @@
@Autowired
private RestTemplate outRestTemplate;
-
- @Autowired
- private IPrivilegeInnerServiceSMO privilegeInnerServiceSMO;
@Autowired
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMO;
@@ -133,11 +127,17 @@
String staffName = repairUserDtos.get(0).getStaffName();
//閫�鍗曞娉�
String returnContext = repairUserDtos.get(0).getContext();
+ //涓婄骇鎿嶄綔浜�
+ String preStaffId = repairUserDtos.get(0).getPreStaffId();
+ //涓婄骇鎿嶄綔浜哄鍚�
+ String preStaffName = repairUserDtos.get(0).getPreStaffName();
paramIn.put("repairTypeName", repairTypeName);
paramIn.put("repairObjName", repairObjName);
paramIn.put("staffName", staffName);
paramIn.put("context", context);
paramIn.put("returnContext", returnContext);
+ paramIn.put("preStaffId", preStaffId);
+ paramIn.put("preStaffName", preStaffName);
sendReturnMessage(paramIn, communityDtos.get(0));
} else if (state.equals("10002")) { //缁撳崟
//鑾峰彇鐢ㄦ埛id
@@ -225,17 +225,13 @@
logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
return;
}
- // 鏍规嵁鐗瑰畾鏉冮檺鏌ヨ 鏈夎鏉冮檺鐨� 鍛樺伐
- BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
- basePrivilegeDto.setResource("/wechatRepairRegistration");
- List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
String url = sendMsgUrl + accessToken;
- for (UserDto userDto : userDtos) {
- //鏍规嵁 userId 鏌ヨ鍒皁penId
- StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
- staffAppAuthDto.setStaffId(userDto.getUserId());
- staffAppAuthDto.setAppType("WECHAT");
- List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
+ //鏍规嵁 userId 鏌ヨ鍒皁penId
+ StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
+ staffAppAuthDto.setStaffId(paramIn.getString("preStaffId"));
+ staffAppAuthDto.setAppType("WECHAT");
+ List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
+ if (staffAppAuthDtos.size() > 0) {
String openId = staffAppAuthDtos.get(0).getOpenId();
Data data = new Data();
PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
@@ -251,7 +247,8 @@
data.setKeyword3(new Content(paramIn.getString("context")));
data.setRemark(new Content(paramIn.getString("returnContext")));
templateMessage.setData(data);
- String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
+ //鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
+ String wechatUrl = MappingCache.getValue("STAFF_WECHAT_URL");
templateMessage.setUrl(wechatUrl);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
@@ -260,7 +257,7 @@
}
/**
- * 缁撳崟缁欑鐞嗗憳鎺ㄩ�佷俊鎭�
+ * 缁撳崟缁欎笟涓绘帹閫佷俊鎭�
*
* @param paramIn
* @param communityDto
@@ -319,6 +316,7 @@
data.setKeyword4(new Content(paramIn.getString("time")));
data.setRemark(new Content("璇风偣鍑绘煡鐪嬭鎯咃紝瀵规垜浠殑宸ヤ綔杩涜璇勪环锛屼互渚挎彁渚涙洿浼樿川鐨勬湇鍔★紝鎰熻阿鎮ㄧ殑閰嶅悎鍜屼娇鐢紝绁濇偍鐢熸椿鎰夊揩锛岄槚瀹舵涔愶紒"));
templateMessage.setData(data);
+ //鑾峰彇涓氫富鍏紬鍙峰湴鍧�
String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
templateMessage.setUrl(wechatUrl);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
@@ -389,6 +387,7 @@
data.setKeyword5(new Content(paramIn.getString("price") + "鍏�"));
data.setRemark(new Content("璇锋偍鍙婃椂缂磋垂锛屾劅璋㈡偍鐨勯厤鍚堝拰浣跨敤锛岀鎮ㄧ敓娲绘剦蹇紝闃栧娆箰锛�"));
templateMessage.setData(data);
+ //鑾峰彇涓氫富鍏紬鍙峰湴鍧�
String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
templateMessage.setUrl(wechatUrl);
logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
--
Gitblit v1.8.0