From 3b0ddfa0b1c3490fbbf421a84e0431a60fb58387 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 12:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java b/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java
index 3265815..44cb6ee 100644
--- a/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/payment/notice/MachinePaymentNoticeAdapt.java
@@ -152,7 +152,6 @@
feeDto.setFeeId(payFeeDetailPo.getFeeId());
feeDto.setCommunityId(payFeeDetailPo.getCommunityId());
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
Assert.listOnlyOne(feeDtos, "鏈煡璇㈠埌璐圭敤淇℃伅");
//鑾峰彇璐圭敤绫诲瀷
String feeTypeCdName = feeDtos.get(0).getFeeTypeCdName();
@@ -164,6 +163,8 @@
String endTime = DateUtil.dateTimeToDate(payFeeDetailPo.getEndTime());
//鑾峰彇鐢ㄦ埛缂磋垂閲戦
String receivedAmount = payFeeDetailPo.getReceivedAmount();
+ //鑾峰彇璐圭敤绫诲瀷
+ String feeTypeCd = feeDtos.get(0).getFeeTypeCd();
//鑾峰彇绀惧尯鍚嶇О
String name = communityDtos.get(0).getName();
JSONObject paramIn = new JSONObject();
@@ -173,8 +174,15 @@
paramIn.put("receivedAmount", receivedAmount);
paramIn.put("startTime", startTime);
paramIn.put("endTime", endTime);
+ //缁欎笟涓绘帹閫佹秷鎭�
sendMessage(paramIn, communityDtos.get(0), payFeeDetailPo);
- publishMsg(paramIn, communityDtos.get(0), payFeeDetailPo);
+ if (feeTypeCd.equals("888800010012")) {
+ //缁欏鐞嗘姤淇畬缁撳崟鐨勭淮淇笀鍌呮帹閫佹秷鎭�
+ sendMsg(paramIn, communityDtos.get(0), payFeeDetailPo);
+ } else {
+ //缁欏憳宸ユ帹閫佹秷鎭�
+ publishMsg(paramIn, communityDtos.get(0), payFeeDetailPo);
+ }
}
/**
@@ -254,6 +262,77 @@
}
/**
+ * 缁欏畬缁撹鍗曠殑缁翠慨甯堝倕鎺ㄩ�佷俊鎭�
+ *
+ * @param paramIn
+ * @param communityDto
+ * @param payFeeDetailPo
+ */
+ private void sendMsg(JSONObject paramIn, CommunityDto communityDto, PayFeeDetailPo payFeeDetailPo) {
+ //鏌ヨ鍏紬鍙烽厤缃�
+ SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
+ smallWeChatDto.setWeChatType("1100");
+ smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
+ smallWeChatDto.setObjId(communityDto.getCommunityId());
+ List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
+ if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
+ 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_SUCCESS_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;
+ }
+ FeeDto feeDto = new FeeDto();
+ feeDto.setFeeId(payFeeDetailPo.getFeeId());
+ feeDto.setCommunityId(payFeeDetailPo.getCommunityId());
+ List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+ Assert.listOnlyOne(feeDtos, "璐圭敤涓嶅瓨鍦�");
+ //鑾峰彇鍒涘缓鐢ㄦ埛,鍗冲鐞嗙粨鍗曠殑缁翠慨缁翠慨甯堝倕
+ String userId = feeDtos.get(0).getUserId();
+ String url = sendMsgUrl + accessToken;
+ //鏍规嵁 userId 鏌ヨ鍒皁penId
+ try {
+ StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
+ staffAppAuthDto.setStaffId(userId);
+ staffAppAuthDto.setAppType("WECHAT");
+ List<StaffAppAuthDto> staffAppAuthDtos = staffAppAuthInnerServiceSMO.queryStaffAppAuths(staffAppAuthDto);
+ Assert.listOnlyOne(staffAppAuthDtos, "鍛樺伐鏈璇�");
+ 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("payFeeRoom")));
+ data.setKeyword2(new Content(paramIn.getString("feeTypeCdName")));
+ data.setKeyword3(new Content(paramIn.getString("payFeeTime")));
+ data.setKeyword4(new Content(paramIn.getString("receivedAmount") + "鍏�"));
+ data.setRemark(new Content("璇蜂笌瀹㈡湇绠″鏍稿疄璐圭敤"));
+ templateMessage.setData(data);
+ String wechatUrl = MappingCache.getValue("OWNER_WECHAT_URL");
+ templateMessage.setUrl(wechatUrl);
+ logger.info("鍙戦�佹ā鏉挎秷鎭唴瀹�:{}", JSON.toJSONString(templateMessage));
+ ResponseEntity<String> responseEntity = outRestTemplate.postForEntity(url, JSON.toJSONString(templateMessage), String.class);
+ logger.info("寰俊妯℃澘杩斿洖鍐呭:{}", responseEntity);
+ } catch (Exception e) {
+ logger.error("鍙戦�佺即璐逛俊鎭け璐�", e);
+ }
+ }
+
+ /**
* 缁欎笟涓绘帹閫佹秷鎭�
*
* @param paramIn
--
Gitblit v1.8.0