LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

会员企业消息同步到来款

Browse Source
This commit is contained in:
liangqitao
2021-12-17 18:07:53 +08:00
parent da0851258e
commit 9d66383ec2
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
-6
View File
@@ -301,12 +301,6 @@ public class PayContactsManagementController extends JeroController<PayContactsM
}catch (Exception e){
log.error("手机号、邮箱加密异常！",e);
}
// 变更企业，删除原有用户
// if(!Objects.equals(payContactsManagement.getCompanyId(),payContactsManagementOld.getCompanyId())){
//
// }else{
//
// }
LambdaUpdateWrapper<PayContactsManagement> updatePayContactsManagement = new LambdaUpdateWrapper<>();
updatePayContactsManagement.eq(PayContactsManagement::getId,payContactsManagement.getId());
jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java
+3
View File
@@ -205,6 +205,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl<PayContactsMan
if(!StringUtils.isBlank(payContactsManagement.getRoleCode())){
updatePayContactsManagement.set(PayContactsManagement::getRoleCode,payContactsManagement.getRoleCode());
}
if(!StringUtils.isBlank(payContactsManagement.getMemberNature())){
updatePayContactsManagement.set(PayContactsManagement::getMemberNature,payContactsManagement.getMemberNature());
}
update(updatePayContactsManagement);
// payContactsManagementService.updateById(payContactsManagement);
}
jero-boot-incoming-payment/src/main/java/com/jero/system/controller/MemberMessageSyncController.java
+10 -8
View File
@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* @ClassName MemberMessageSyncController
@@ -95,9 +92,14 @@ public class MemberMessageSyncController {
announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2);
announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
sysAnnouncementService.save(announcement);
String[] s = announcement.getPhone().split(",");
List<String> list = new ArrayList<>();
for (int i = 0; i < s.length; i++) {
list.add(PasswordUtil.encrypt(s[i]));
}
// 2.插入用户通告阅读标记表记录
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getPhone, Arrays.asList(announcement.getPhones().split(",")));
queryPayContactsManagement.in(PayContactsManagement::getPhone, list);
List<PayContactsManagement> listPayContactsManagement = payContactsManagementService.list(queryPayContactsManagement);
String anntId = announcement.getId();
if(!CollectionUtils.isEmpty(listPayContactsManagement)){
@@ -105,15 +107,15 @@ public class MemberMessageSyncController {
listPayContactsManagement.forEach(p->{
SysAnnouncementSend announcementSend = new SysAnnouncementSend();
announcementSend.setAnntId(anntId);
announcementSend.setUserId(PasswordUtil.decrypt(p.getPhone()));
announcementSend.setUserId(p.getId());
announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG);
sysAnnouncementSendService.save(announcementSend);
JSONObject obj = new JSONObject();
obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER);
obj.put(WebsocketConst.MSG_USER_ID, PasswordUtil.decrypt(p.getPhone()));
obj.put(WebsocketConst.MSG_USER_ID, p.getId());
obj.put(WebsocketConst.MSG_ID, announcement.getId());
obj.put(WebsocketConst.MSG_TXT, finalAlert);
webSocket.sendMessage(PasswordUtil.decrypt(p.getPhone()), obj.toJSONString());
webSocket.sendMessage(p.getId(), obj.toJSONString());
});
}else{
log.info("会员同步来款消息发送失败，用户不存在！");
jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java
+1 -1
View File
@@ -153,5 +153,5 @@ public class SysAnnouncement implements Serializable {
* 手机号
*/
@TableField(exist = false)
private String phones;
private String phone;
}