From a40c2eb885bcdb697c2e16dae4f43cb6cd718973 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 一月 2024 11:28:03 +0800
Subject: [PATCH] 优化小区数据
---
service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeAdapt.java | 65 ++++++--------------------------
1 files changed, 13 insertions(+), 52 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeAdapt.java b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeAdapt.java
index 31ca63c..98d0d8c 100644
--- a/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeAdapt.java
@@ -4,20 +4,20 @@
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.privilege.BasePrivilegeDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.dto.smallWeChat.SmallWeChatDto;
-import com.java110.dto.smallWechatAttr.SmallWechatAttrDto;
-import com.java110.dto.staffAppAuth.StaffAppAuthDto;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.dto.wechat.SmallWechatAttrDto;
+import com.java110.dto.user.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;
-import com.java110.entity.wechat.PropertyFeeTemplateMessage;
+import com.java110.dto.system.Business;
+import com.java110.dto.wechat.Content;
+import com.java110.dto.wechat.Data;
+import com.java110.dto.wechat.PropertyFeeTemplateMessage;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.order.IPrivilegeInnerServiceSMO;
@@ -28,6 +28,7 @@
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
+import com.java110.job.msgNotify.MsgNotifyFactory;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.util.Assert;
@@ -80,6 +81,7 @@
@Autowired
private RestTemplate outRestTemplate;
+
private static Logger logger = LoggerFactory.getLogger(ReturnPayFeeAdapt.class);
//妯℃澘淇℃伅鎺ㄩ�佸湴鍧�
@@ -118,7 +120,7 @@
ownerId = ownerRoomRelDtos.get(0).getOwnerId();
} else if (!StringUtil.isEmpty(payerObjType) && payerObjType.equals("6666")) {
OwnerCarDto ownerCarDto = new OwnerCarDto();
- ownerCarDto.setCarId(payerObjId);
+ ownerCarDto.setMemberId(payerObjId);
ownerCarDto.setCarTypeCd("1001"); //涓氫富杞﹁締
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
Assert.listOnlyOne(ownerCarDtos, "鏌ヨ涓氫富杞﹁締閿欒锛�");
@@ -155,54 +157,13 @@
logger.info("鏈厤缃井淇″叕浼楀彿淇℃伅,瀹氭椂浠诲姟鎵ц缁撴潫");
return;
}
- SmallWeChatDto weChatDto = smallWeChatDtos.get(0);
- SmallWechatAttrDto smallWechatAttrDto = new SmallWechatAttrDto();
- smallWechatAttrDto.setCommunityId(communityDto.getCommunityId());
- smallWechatAttrDto.setWechatId(weChatDto.getWeChatId());
- smallWechatAttrDto.setSpecCd(SmallWechatAttrDto.SPEC_CD_WECHAT_PROCESS_TEMPLATE);
- List<SmallWechatAttrDto> smallWechatAttrDtos = smallWechatAttrInnerServiceSMOImpl.querySmallWechatAttrs(smallWechatAttrDto);
- if (smallWechatAttrDtos == null || smallWechatAttrDtos.size() <= 0) {
- logger.info("鏈厤缃井淇″叕浼楀彿娑堟伅妯℃澘");
- return;
- }
- String templateId = smallWechatAttrDtos.get(0).getValue();
- String accessToken = WechatFactory.getAccessToken(weChatDto.getAppId(), weChatDto.getAppSecret());
- if (StringUtil.isEmpty(accessToken)) {
- logger.info("鎺ㄩ�佸井淇℃ā鏉�,鑾峰彇accessToken澶辫触:{}", accessToken);
- return;
- }
+
// 鏍规嵁鐗瑰畾鏉冮檺鏌ヨ 鏈夎鏉冮檺鐨� 鍛樺伐
BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
basePrivilegeDto.setResource("/admin.html#/pages/property/returnPayFeeManage");
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);
- if (staffAppAuthDtos != null && staffAppAuthDtos.size() > 0) {
- String openId = staffAppAuthDtos.get(0).getOpenId();
- Data data = new Data();
- PropertyFeeTemplateMessage templateMessage = new PropertyFeeTemplateMessage();
- templateMessage.setTemplate_id(templateId);
- templateMessage.setTouser(openId);
- data.setFirst(new Content("鎮ㄦ湁鏂扮殑閫�璐圭敵璇凤紝鐢宠淇℃伅濡備笅锛�"));
- data.setKeyword1(new Content(paramIn.getString("detailId")));
- data.setKeyword2(new Content("閫�璐圭敵璇�"));
- data.setKeyword3(new Content(paramIn.getString("name")));
- data.setKeyword4(new Content(paramIn.getString("name") + "鎻愪氦鐨勯��璐圭敵璇烽渶瀹℃壒"));
- data.setKeyword5(new Content("鐢宠閫�璐�"));
- data.setRemark(new Content("璇峰強鏃跺鐞嗭紒"));
- templateMessage.setData(data);
- //鑾峰彇鍛樺伐鍏紬鍙峰湴鍧�
- String wechatUrl = MappingCache.getValue(MappingConstant.URL_DOMAIN,"STAFF_WECHAT_URL");
- templateMessage.setUrl(wechatUrl);
- logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
- ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
- logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
- }
+ MsgNotifyFactory.sendApplyReturnFeeMsg(communityDto.getCommunityId(), userDto.getUserId(), paramIn);
}
}
--
Gitblit v1.8.0