Commit 82c5ce21 authored by unset's avatar unset

添加通知信息

parent 7c5c0974
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 通知信息
*
* @author zjw
* @email jiaoruizhen@126.com
* @date 2020-12-28 14:12:25
*/
@Data
@Table(name = "notice_info")
public class NoticeInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Integer id;
/**
* 消息
*/
@Column(name = "message")
@ApiModelProperty(value = "消息")
private String message;
/**
* 类型
*/
@Column(name = "type")
@ApiModelProperty(value = "类型")
private Integer type;
/**
* 是否已读:1、未读,2、已读
*/
@Column(name = "read")
@ApiModelProperty(value = "是否已读:1、未读,2、已读")
private Integer read;
/**
* 是否删除:0、否,1、是
*/
@Column(name = "is_del")
@ApiModelProperty(value = "是否删除:0、否,1、是")
private Integer isDel;
/**
* 用户ID
*/
@Column(name = "user_id")
@ApiModelProperty(value = "用户ID")
private Integer userId;
/**
*
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "", hidden = true )
private Date crtTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "", hidden = true )
private Date updTime;
/**
* 关联ID
*/
private String relationId;
}
package com.upyuns.platform.rs.website.type;
/**
* @ClassName : NoticeTypeEnum
* @Description : 通知类型
* @Author : jiaoruizhen
* @Date: 2020-12-24 14:32
*/
public enum NoticeTypeEnum {
ORDER_INFO(1, "订单信息"),
SYSTEM_INFO(2, "系统信息"),
OTHER_INFO(3, "其他信息");
private Integer type;
private String msg;
NoticeTypeEnum(Integer type, String msg) {
this.type = type;
this.msg = msg;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public static <T extends NoticeTypeEnum> String getType(Integer code, Class<T> t) {
for (T item : t.getEnumConstants()) {
if (item.getType().equals(code)) {
return item.getMsg();
}
}
return "";
}
public static NoticeTypeEnum getByCode(Integer code) {
for (NoticeTypeEnum v : values()) {
if (v.getType() == code) {
return v;
}
}
return null;
}
public static String getProductStatusEnum(Integer code) {
return getType(code, NoticeTypeEnum.class);
}
}
package com.upyuns.platform.rs.website.biz;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.NoticeInfo;
import com.upyuns.platform.rs.website.mapper.NoticeInfoMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import java.util.Date;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/**
* 通知信息
*
* @author zjw
* @email jiaoruizhen@126.com
* @date 2020-12-28 14:12:25
*/
@Service
public class NoticeInfoBiz extends BaseBiz<NoticeInfoMapper,NoticeInfo> {
public void addObj(String message, Integer type, Integer userId, String relationId) {
insertSelectiveRe(new NoticeInfo(){{setMessage(message); setType(type); setUserId(userId); setRelationId(relationId); setCrtTime(new Date());setUpdTime(new Date());}});
}
}
\ No newline at end of file
......@@ -28,6 +28,7 @@ import com.upyuns.platform.rs.website.type.*;
import com.upyuns.platform.rs.website.vo.ItemInfoVo;
import org.apache.commons.lang3.StringUtils;
import org.apache.regexp.RE;
import org.joda.time.DateTime;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -89,6 +90,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
@Autowired
CustomFormBiz customFormBiz;
@Autowired
NoticeInfoBiz noticeInfoBiz;
/**
* 添加订单
*
......@@ -424,6 +428,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderItemBiz.insertSelective(orderItem);
}
});
//添加通知信息
noticeInfoBiz.addObj("订单" + orderInfo.getOrderNo() + "已创建,待支付", NoticeTypeEnum.ORDER_INFO.getType(), appUserDTO.getUserid(), String.valueOf(orderInfo.getOrderId()));
return ObjectRestResponse.succ();
}
......@@ -470,6 +476,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderInfo.setTrackingNumber(confirmReceivedDto.getTrackingNumber());
orderInfo.setTrackingImg(confirmReceivedDto.getTrackingImg());
updateSelectiveByIdRe(orderInfo);
//添加通知信息
noticeInfoBiz.addObj("订单" + orderInfo.getOrderNo() + "已发货", NoticeTypeEnum.ORDER_INFO.getType(), orderInfo.getUserId(), String.valueOf(orderInfo.getOrderId()));
return ObjectRestResponse.succ();
}
......@@ -497,6 +505,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderInfo.setInvoiceStatus(OrderInvoiceStatusEnum.INVOICE_OPEN.getType());
updateSelectiveByIdRe(orderInfo);
//添加通知信息
noticeInfoBiz.addObj("订单" + orderInfo.getOrderNo() + "已开票", NoticeTypeEnum.ORDER_INFO.getType(), orderInfo.getUserId(), String.valueOf(orderInfo.getOrderId()));
} else {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "订单未开票");
}
......@@ -532,7 +543,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
orderInfo.setInvoiceStatus(OrderInvoiceStatusEnum.INVOICE_SEND.getType());
updateSelectiveByIdRe(orderInfo);
//添加通知信息
noticeInfoBiz.addObj("订单" + orderInfo.getOrderNo() + "发票已发货", NoticeTypeEnum.ORDER_INFO.getType(), orderInfo.getUserId(), String.valueOf(orderInfo.getOrderId()));
return ObjectRestResponse.succ();
}
......@@ -714,6 +726,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
customForm.setAuditStatus(customFormDto.getAuditStatus());
customForm.setAmount(customFormDto.getAmount());
customFormBiz.updateSelectiveByIdRe(customForm);
//添加通知信息
noticeInfoBiz.addObj(DateTime.now().toString("yyyy-MM-dd") + " 有定制需求已被审核确认,生成订单" + orderInfo.getOrderNo() + ",待支付", NoticeTypeEnum.ORDER_INFO.getType(), appUserDTO.getUserid(), String.valueOf(orderInfo.getOrderId()));
return ObjectRestResponse.succ();
} else {
customForm.setAuditStatus(customFormDto.getAuditStatus());
......@@ -993,6 +1007,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
old.setStatus(orderInfo.getPayStatus());
old.setPayTime(new Date());
updateSelectiveByIdRe(old);
//添加通知信息
noticeInfoBiz.addObj("订单" + orderInfo.getOrderNo() + "已支付,待发货", NoticeTypeEnum.ORDER_INFO.getType(), orderInfo.getUserId(), String.valueOf(orderInfo.getOrderId()));
return ObjectRestResponse.succ();
}
......
......@@ -14,6 +14,7 @@ import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
import com.upyuns.platform.rs.website.dto.CartOrderDto;
import com.upyuns.platform.rs.website.dto.OrderInfoDto;
import com.upyuns.platform.rs.website.entity.*;
import com.upyuns.platform.rs.website.type.NoticeTypeEnum;
import com.upyuns.platform.rs.website.type.OrderTypeEnum;
import com.upyuns.platform.rs.website.vo.ItemInfoVo;
import org.apache.commons.lang3.StringUtils;
......@@ -62,6 +63,9 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
@Autowired
DatacenterFeign datacenterFeign;
@Autowired
NoticeInfoBiz noticeInfoBiz;
/**
* 添加购物车
*
......@@ -140,6 +144,8 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
shoppingCartInfo.setPhone(appUserDTO.getUsername());
shoppingCartInfo.setUserId(appUserDTO.getUserid());
addUpdate(shoppingCartInfo);
//添加通知信息
noticeInfoBiz.addObj("商品" + shoppingCartInfo.getName() + "已添加购物车", NoticeTypeEnum.ORDER_INFO.getType(), shoppingCartInfo.getUserId(), String.valueOf(shoppingCartInfo.getCartId()));
}
} else {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
......@@ -171,6 +177,9 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
shoppingCartInfo.setPhone(appUserDTO.getUsername());
shoppingCartInfo.setUserId(appUserDTO.getUserid());
addUpdate(shoppingCartInfo);
//添加通知信息
noticeInfoBiz.addObj("商品" + shoppingCartInfo.getName() + "已添加购物车", NoticeTypeEnum.ORDER_INFO.getType(), shoppingCartInfo.getUserId(), String.valueOf(shoppingCartInfo.getCartId()));
}
} else {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
......@@ -202,6 +211,9 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
shoppingCartInfo.setPhone(appUserDTO.getUsername());
shoppingCartInfo.setUserId(appUserDTO.getUserid());
addUpdate(shoppingCartInfo);
//添加通知信息
noticeInfoBiz.addObj("商品" + shoppingCartInfo.getName() + "已添加购物车", NoticeTypeEnum.ORDER_INFO.getType(), shoppingCartInfo.getUserId(), String.valueOf(shoppingCartInfo.getCartId()));
}
} else {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
......
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.NoticeInfoBiz;
import com.upyuns.platform.rs.website.entity.NoticeInfo;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("noticeInfo")
public class NoticeInfoController extends BaseController<NoticeInfoBiz,NoticeInfo> {
}
\ No newline at end of file
package com.upyuns.platform.rs.website.controller.web;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.NoticeInfoBiz;
import com.upyuns.platform.rs.website.entity.NoticeInfo;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("noticeInfo/web")
public class NoticeInfoWebController extends BaseController<NoticeInfoBiz,NoticeInfo> {
}
\ No newline at end of file
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.NoticeInfo;
import tk.mybatis.mapper.common.Mapper;
/**
* 通知信息
*
* @author zjw
* @email jiaoruizhen@126.com
* @date 2020-12-28 14:12:25
*/
public interface NoticeInfoMapper extends Mapper<NoticeInfo> {
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.upyuns.platform.rs.website.mapper.NoticeInfoMapper">
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment