Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!224 新增消息中心功能

Browse Source 
Merge pull request !224 from 德仔/xzj
This commit is contained in:
德仔
2021-04-28 13:35:36 +08:00
committed by Gitee
parent 409c1e582f bbbc4f2753
commit fb9d35c753
15 changed files with 747 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserLogController.java
View File

@ -13,6 +13,7 @@ import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.custom.domain.SysWxUserInfo;
import com.stdiet.custom.domain.SysWxUserLog;
import com.stdiet.custom.page.WxLogInfo;
import com.stdiet.custom.service.ISysMessageNoticeService;
import com.stdiet.custom.service.ISysOrderService;
import com.stdiet.custom.service.ISysWxUserInfoService;
import com.stdiet.custom.service.ISysWxUserLogService;
@ -40,8 +41,12 @@ public class SysWxUserLogController extends BaseController {
@Autowired
private ISysWxUserInfoService sysWxUserInfoService;
@Autowired
private ISysOrderService sysOrderService;
@Autowired
private ISysMessageNoticeService sysMessageNoticeService;
/**
* 查询微信用户记录列表
*/
@ -211,6 +216,11 @@ public class SysWxUserLogController extends BaseController {
@PreAuthorize("@ss.hasPermi('custom:wxUserLog:query')")
@PostMapping("/commentPunchContent")
public AjaxResult commentPunchContent(@RequestBody SysWxUserLog sysWxUserLog) {
return toAjax(sysWxUserLogService.updateSysWxUserLog(sysWxUserLog));
int row = sysWxUserLogService.updateSysWxUserLog(sysWxUserLog);
if(row > 0){
SysWxUserLog log = sysWxUserLogService.selectSysWxUserLogById(sysWxUserLog.getId()+"");
sysMessageNoticeService.sendPunchCommentMessage(log);
}
return toAjax(row);
}
}

48
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
View File

@ -14,8 +14,10 @@ import com.stdiet.common.utils.oss.AliyunOSSUtils;
import com.stdiet.common.utils.sign.AesUtils;
import com.stdiet.custom.domain.*;
import com.stdiet.custom.dto.response.CustomerCaseResponse;
import com.stdiet.custom.dto.response.MessageNoticeResponse;
import com.stdiet.custom.page.WxLogInfo;
import com.stdiet.custom.service.*;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -51,6 +53,12 @@ public class WechatAppletController extends BaseController {
@Autowired
private ISysAskNutritionQuestionService sysAskNutritionQuestionService;
@Autowired
private ISysMessageNoticeService sysMessageNoticeService;
@Autowired
private ISysCustomerService sysCustomerService;
/**
* 查询微信小程序中展示的客户案例
*/
@ -89,7 +97,7 @@ public class WechatAppletController extends BaseController {
}
/**
* 同步客户信息，返回订单数量
* 同步客户信息
* @param sysWxUserInfo
* @return
*/
@ -106,7 +114,17 @@ public class WechatAppletController extends BaseController {
}else{
sysWxUserInfoService.insertSysWxUserInfo(sysWxUserInfo);
}
return AjaxResult.success();
Map<String,Object> result = new HashMap<>();
//根据手机号查询返回用户加密ID
SysCustomer customer = sysCustomerService.getCustomerByPhone(sysWxUserInfo.getPhone());
result.put("customerId", customer != null ? AesUtils.encrypt(customer.getId()+"", null) : null);
//查询未读消息数量
SysMessageNotice messageParam = new SysMessageNotice();
messageParam.setReadType(0);
messageParam.setMessageCustomer(customer != null ? customer.getId() : 0);
int unReadNoticeTotal = sysMessageNoticeService.getCustomerMessageCount(messageParam);
result.put("unReadNoticeTotal", unReadNoticeTotal);
return AjaxResult.success(result);
}
/**
@ -309,4 +327,30 @@ public class WechatAppletController extends BaseController {
}
return toAjax(sysAskNutritionQuestionService.insertSysAskNutritionQuestion(sysAskNutritionQuestion));
}
/**
* 获取用户通知消息
*/
@GetMapping(value = "/getCustomerMessage")
public TableDataInfo getCustomerMessage(SysMessageNotice sysMessageNotice) {
startPage();
if(StringUtils.isNotEmpty(sysMessageNotice.getCustomerId())){
sysMessageNotice.setMessageCustomer(Long.parseLong(AesUtils.decrypt(sysMessageNotice.getCustomerId(), null)));
}else{
sysMessageNotice.setMessageCustomer(0L);
}
List<MessageNoticeResponse> list = sysMessageNoticeService.getCustomerMessage(sysMessageNotice);
return getDataTable(list);
}
/**
* 更新用户通知消息已读状态
*/
@GetMapping(value = "/updateMessageReadStatus")
public AjaxResult updateMessageReadStatus(@RequestParam("id")Long id) {
SysMessageNotice sysMessageNotice = new SysMessageNotice();
sysMessageNotice.setReadType(1);
sysMessageNotice.setId(id);
return toAjax(sysMessageNoticeService.updateSysMessageNotice(sysMessageNotice));
}
}