Merge remote-tracking branch 'origin/main'

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopMessage.java

@@ -0,0 +1,97 @@
+package edu.travel.commodity.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 商城消息表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "shop_message")
+public class ShopMessage {
+    /**
+     * 商品规格ID
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 消息类型
+     */
+    @TableField(value = "message_type")
+    private String messageType;
+
+    /**
+     * 消息内容
+     */
+    @TableField(value = "message")
+    private String message;
+
+    /**
+     * 发送人ID
+     */
+    @TableField(value = "send_user_id")
+    private String sendUserId;
+
+    /**
+     * 接收人ID
+     */
+    @TableField(value = "to_user_id")
+    private String toUserId;
+
+    /**
+     * 是否已读 0 否 1是
+     */
+    @TableField(value = "is_read")
+    private Integer isRead;
+
+    /**
+     * 删除消息的用户
+     */
+    @TableField(value = "deleted_by_users")
+    private String deletedByUsers;
+
+    /**
+     * 系统标识
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_user_id")
+    private String createUserId;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新人id
+     */
+    @TableField(value = "update_user_id")
+    private String updateUserId;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/entity/ShopUserSession.java

@@ -0,0 +1,70 @@
+package edu.travel.commodity.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 用户客服关联
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "shop_user_session")
+public class ShopUserSession {
+    /**
+     * 会话ID
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @TableField(value = "user_id")
+    private Long userId;
+
+    /**
+     * 客服ID
+     */
+    @TableField(value = "customer_id")
+    private Long customerId;
+
+    /**
+     * 系统标识
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_user_id")
+    private String createUserId;
+
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 更新人id
+     */
+    @TableField(value = "update_user_id")
+    private String updateUserId;
+
+    /**
+     * 删除标记 0正常 1删除
+     */
+    @TableField(value = "delete_flag")
+    private Integer deleteFlag;
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/mapper/ShopMessageMapper.java

@@ -0,0 +1,7 @@
+package edu.travel.commodity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.commodity.entity.ShopMessage;
+
+public interface ShopMessageMapper extends BaseMapper<ShopMessage> {
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/mapper/ShopUserSessionMapper.java

@@ -0,0 +1,7 @@
+package edu.travel.commodity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import edu.travel.commodity.entity.ShopUserSession;
+
+public interface ShopUserSessionMapper extends BaseMapper<ShopUserSession> {
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/ShopMessageService.java

@@ -0,0 +1,8 @@
+package edu.travel.commodity.service;
+
+import edu.travel.commodity.entity.ShopMessage;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface ShopMessageService extends IService<ShopMessage>{
+
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/ShopUserSessionService.java

@@ -0,0 +1,8 @@
+package edu.travel.commodity.service;
+
+import edu.travel.commodity.entity.ShopUserSession;
+import com.baomidou.mybatisplus.extension.service.IService;
+public interface ShopUserSessionService extends IService<ShopUserSession>{
+
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopMessageServiceImpl.java

@@ -0,0 +1,12 @@
+package edu.travel.commodity.service.impl;
+
+import edu.travel.commodity.service.ShopMessageService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import edu.travel.commodity.mapper.ShopMessageMapper;
+import edu.travel.commodity.entity.ShopMessage;
+
+@Service
+public class ShopMessageServiceImpl extends ServiceImpl<ShopMessageMapper, ShopMessage> implements ShopMessageService {
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/service/impl/ShopUserSessionServiceImpl.java

@@ -0,0 +1,12 @@
+package edu.travel.commodity.service.impl;
+
+import edu.travel.commodity.service.ShopUserSessionService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import edu.travel.commodity.mapper.ShopUserSessionMapper;
+import edu.travel.commodity.entity.ShopUserSession;
+
+@Service
+public class ShopUserSessionServiceImpl extends ServiceImpl<ShopUserSessionMapper, ShopUserSession> implements ShopUserSessionService {
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopMessageController.java

@@ -0,0 +1,23 @@
+package edu.travel.commodity.web;
+import edu.travel.commodity.entity.ShopMessage;
+import edu.travel.commodity.service.impl.ShopMessageServiceImpl;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+* 商城消息表(shop_message)表控制层
+*
+* @author xxxxx
+*/
+@RestController
+@RequestMapping("/shop_message")
+public class ShopMessageController {
+/**
+* 服务对象
+*/
+    @Autowired
+    private ShopMessageServiceImpl shopMessageServiceImpl;
+
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/java/edu/travel/commodity/web/ShopUserSessionController.java

@@ -0,0 +1,23 @@
+package edu.travel.commodity.web;
+import edu.travel.commodity.entity.ShopUserSession;
+import edu.travel.commodity.service.impl.ShopUserSessionServiceImpl;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+* 用户客服关联(shop_user_session)表控制层
+*
+* @author xxxxx
+*/
+@RestController
+@RequestMapping("/shop_user_session")
+public class ShopUserSessionController {
+/**
+* 服务对象
+*/
+    @Autowired
+    private ShopUserSessionServiceImpl shopUserSessionServiceImpl;
+
+
+}

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopMessageMapper.xml

@@ -0,0 +1,26 @@
+<?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="edu.travel.commodity.mapper.ShopMessageMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.commodity.entity.ShopMessage">
+    <!--@mbg.generated-->
+    <!--@Table shop_message-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="message_type" jdbcType="VARCHAR" property="messageType" />
+    <result column="message" jdbcType="VARCHAR" property="message" />
+    <result column="send_user_id" jdbcType="VARCHAR" property="sendUserId" />
+    <result column="to_user_id" jdbcType="VARCHAR" property="toUserId" />
+    <result column="is_read" jdbcType="INTEGER" property="isRead" />
+    <result column="deleted_by_users" jdbcType="VARCHAR" property="deletedByUsers" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, message_type, message, send_user_id, to_user_id, is_read, deleted_by_users, project, 
+    create_time, create_user_id, update_time, update_user_id, delete_flag
+  </sql>
+</mapper>

edu-travel-service/edu-travel-service-commodity/src/main/resources/mapper/ShopUserSessionMapper.xml

@@ -0,0 +1,22 @@
+<?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="edu.travel.commodity.mapper.ShopUserSessionMapper">
+  <resultMap id="BaseResultMap" type="edu.travel.commodity.entity.ShopUserSession">
+    <!--@mbg.generated-->
+    <!--@Table shop_user_session-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="customer_id" jdbcType="BIGINT" property="customerId" />
+    <result column="project" jdbcType="VARCHAR" property="project" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, user_id, customer_id, project, create_time, create_user_id, update_time, update_user_id, 
+    delete_flag
+  </sql>
+</mapper>