314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

Browse Source
master
elliott 2 years ago
parent 0add812615 b0ea362936
commit 6a847df5ae
5 changed files with 78 additions and 30 deletions
Show Stats Download Patch File Download Diff File

21
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/CtleaveMessageServiceImpl.java
Unescape Escape View File

@ -34,15 +34,18 @@ public class CtleaveMessageServiceImpl implements ICtleaveMeassageService {
public int saveCtleaveMeassage(CtLeaveMessage ctLeaveMessage) {
// 留言成功发送消息
WxScriptMessage wxScriptMessage = wxScriptMessageMapper.selectOneByMessageType(MessageTypeEnum.SUBMIT_MESSAGE.getCode());
WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
wxUserScriptLog.setId(null);
wxUserScriptLog.setWxUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
wxUserScriptLog.setIsCustom(0);
wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
if (wxScriptMessage != null) {
WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
wxUserScriptLog.setId(null);
wxUserScriptLog.setWxUserId(SecurityUtils.getLoginUser().getWxUserMember().getId());
wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
wxUserScriptLog.setIsCustom(0);
wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
}
// 保存消息
CtLeaveMessageEnum ctLeaveMessageEnum = CtLeaveMessageEnum.fromString(ctLeaveMessage.getSource());

24
flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -55,6 +55,7 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
private WxUserScriptLogMapper wxUserScriptLogMapper;
@Override
@Transactional
public LoginUserVo login(String code) throws Exception {
// 1、使用临时凭证 code 获取 appi + appsecret + unionid
String result = MiniProgramUtils.getSessionKeyAndOpenId(code);
@ -80,6 +81,9 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
// 2.2、微信用户表注册
wxUserMemberMapper.insertWxUserMember(wxUserMember);
// 2.3、系统表注册
/**
* TODO: 分布式事务
*/
RegisterBody registerBody = new RegisterBody();
registerBody.setUsername(wxUserMember.getOpenid());
registerBody.setPassword(UserConstants.WX_SYSTEM_USER_PASSWORD);
@ -90,15 +94,17 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
}
// 2.4、用户注册成功发送消息
WxScriptMessage wxScriptMessage = wxScriptMessageMapper.selectOneByMessageType(MessageTypeEnum.USER_REGISTRATION.getCode());
WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
wxUserScriptLog.setId(null);
wxUserScriptLog.setWxUserId(wxUserMember.getId());
wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
wxUserScriptLog.setIsCustom(0);
wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
if (wxScriptMessage != null) {
WxUserScriptLog wxUserScriptLog = new WxUserScriptLog();
BeanUtils.copyProperties(wxScriptMessage, wxUserScriptLog);
wxUserScriptLog.setId(null);
wxUserScriptLog.setWxUserId(wxUserMember.getId());
wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.USER_REGISTRATION.getCode());
wxUserScriptLog.setIsCustom(0);
wxUserScriptLog.setTitile(wxScriptMessage.getMessageTitle());
wxUserScriptLog.setContent(wxScriptMessage.getMessageContent());
wxUserScriptLogMapper.insertWxUserScriptLog(wxUserScriptLog);
}
}
// 3、登录请求，获取 token

12
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserScriptLogController.java
Unescape Escape View File

@ -157,6 +157,9 @@ public class WxUserScriptLogController extends BaseController {
if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) {
return R.fail("请输入视频号id");
}
if(!wxUserScriptReq.getVideoNo().startsWith("sph")){
return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取");
}
if (StringUtils.isBlank(wxUserScriptReq.getFeedId())) {
return R.fail("请输入视频号feedid");
}
@ -166,6 +169,9 @@ public class WxUserScriptLogController extends BaseController {
if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) {
return R.fail("请输入视频号id");
}
if(!wxUserScriptReq.getVideoNo().startsWith("sph")){
return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取");
}
}
}
wxUserScriptLogService.sendScript(wxUserScriptReq);
@ -225,6 +231,9 @@ public class WxUserScriptLogController extends BaseController {
if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) {
return R.fail("请输入视频号id");
}
if(!wxUserScriptReq.getVideoNo().startsWith("sph")){
return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取");
}
if (StringUtils.isBlank(wxUserScriptReq.getFeedId())) {
return R.fail("请输入视频号feedid");
}
@ -234,6 +243,9 @@ public class WxUserScriptLogController extends BaseController {
if (StringUtils.isBlank(wxUserScriptReq.getVideoNo())) {
return R.fail("请输入视频号id");
}
if(!wxUserScriptReq.getVideoNo().startsWith("sph")){
return R.fail("请输入以“sph”开头的视频号id，可在视频号助手获取");
}
}
}

27
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserMemberServiceImpl.java
Unescape Escape View File

@ -148,20 +148,31 @@ public class WxUserMemberServiceImpl implements IWxUserMemberService {
WxUserMember wxUserMember = new WxUserMember();
BeanUtils.copyProperties(wxUserMemberReq, wxUserMember);
// 补充 省市区信息
SysRegion province = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getProvinceId());
wxUserMember.setProvince(province.getName());
SysRegion city = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getCityId());
wxUserMember.setCity(city.getName());
SysRegion area = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getAreaId());
wxUserMember.setArea(area.getName());
if (wxUserMemberReq.getProvinceId() != null) {
SysRegion province = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getProvinceId());
wxUserMember.setProvince(province.getName());
}
if (wxUserMemberReq.getCityId() != null) {
SysRegion city = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getCityId());
wxUserMember.setCity(city.getName());
}
if (wxUserMemberReq.getAreaId() != null) {
SysRegion area = sysRegionMapper.selectSysRegionById(wxUserMemberReq.getAreaId());
wxUserMember.setArea(area.getName());
}
// 删除用户与标签的关联关系
wxUserTagMapper.deleteWxUserTagByUserId(wxUserMemberReq.getId());
// 添加用户与小程序标签关联
List<Integer> userIdList = new ArrayList<>();
userIdList.add(wxUserMemberReq.getId().intValue());
batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList);
if (wxUserMemberReq.getMiniProgramTags() != null && wxUserMemberReq.getMiniProgramTags().size() > 0) {
batchAddMiniProgramTag(wxUserMemberReq.getMiniProgramTags(), userIdList);
}
// 添加用户与企微标签关联
batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList);
if (wxUserMemberReq.getWecomTags() != null && wxUserMemberReq.getWecomTags().size() > 0) {
batchAddWecomTag(wxUserMemberReq.getWecomTags(), userIdList);
}
return wxUserMemberMapper.updateWxUserMember(wxUserMember);
}

24
flossom-ui/src/views/system/member/index.vue
Unescape Escape View File

@ -313,7 +313,8 @@
<el-dialog width="30%" title="修改用户备注" :visible.sync="editRemarkVisible" append-to-body>
<el-form ref="form" :model="editRemarkForm" label-width="50px">
<el-form-item label="备注 " prop="content">
<el-input v-model="editRemarkForm.content" placeholder="请输入备注"/>
<el-input v-model="editRemarkForm.content" type="textarea" placeholder="请输入备注" show-word-limit minlength="1"
maxlength="100"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -585,7 +586,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitBatchOperate">确 定</el-button>
<el-button @click="cancelScriptDialog(false)">取 消</el-button>
<el-button @click="cancelScriptDialog(false)">重 置</el-button>
</div>
</el-dialog>
@ -1005,6 +1006,11 @@ export default {
};
},
created() {
// 查询条件创建时间默认为当天
let siteStartTime = this.dateUtil(new Date(new Date().toLocaleDateString()));
let siteEndTime = this.dateUtil(new Date(new Date(new Date().toLocaleDateString()).getTime() + 24 * 60 * 60 * 1000 - 1));
this.dateRange = [siteStartTime, siteEndTime];
// 获取用户统计信息
this.getUserCount();
// 获取表单数据
@ -1027,6 +1033,16 @@ export default {
this.loading = false;
});
},
dateUtil(date){
// 获取年份、月份和日期
const year = date.getFullYear().toString(); // 四位数表示的年份
const months = (date.getMonth() + 1).toString().padStart(2, '0'); // 补零后的两位数表示的月份
const day = date.getDate().toString().padStart(2, '0'); // 补零后的两位数表示的日期
const hours = date.getHours().toString().padStart(2, '0'); // 补全两位数的小时
const minutes = date.getMinutes().toString().padStart(2, '0'); // 补全两位数的分钟
const seconds = date.getSeconds().toString().padStart(2, '0');
return `${year}-${months}-${day} ${hours}:${minutes}:${seconds}`;
},
getUserCount() {
selectUserCount().then(Response => {
this.count.userNum = Response.data[0];
@ -1137,9 +1153,9 @@ export default {
},
// 关闭添加小程序标签窗口
cancelMiniProgramDialog(isClose) {
this.title = null;
this.miniProgramForm.tagIdArray = [];
if (isClose) {
this.title = null;
this.batchMiniProgramVisible = false;
}
},
@ -1392,7 +1408,7 @@ export default {
this.title = "添加小程序标签";
}
if (this.batchOperateValue == 4) {
this.title = "添加小程序标签";
this.title = "删除小程序标签";
}
this.batchMiniProgramVisible = true;
}

Write Preview
Loading…
Cancel
Save