Skip to content

C
chinafrica
提交 f995798b authored 作者: 吴德鹏's avatar 吴德鹏
浏览文件
操作

评论

上级 6ef8050a
隐藏空白字符变更
内嵌 并排
正在显示 包含 29 行增加 和 123 行删除
platform-admin/src/main/java/com/platform/entity/TbCfItemCommentEntity.java
浏览文件 @ f995798b
......@@ -78,7 +78,7 @@ public class TbCfItemCommentEntity implements Serializable {
private String orderNo;
private String itemName;
private Integer real;
private Integer commentType;
private String itemImg;
public String getItemImg() {
......@@ -89,12 +89,12 @@ public class TbCfItemCommentEntity implements Serializable {
this.itemImg = itemImg;
}
public Integer getReal() {
return real;
public Integer getCommentType() {
return commentType;
}
public void setReal(Integer real) {
this.real = real;
public void setCommentType(Integer commentType) {
this.commentType = commentType;
}
public String getUserName() {
......
platform-admin/src/main/java/com/platform/service/impl/TbCfItemCommentServiceImpl.java
浏览文件 @ f995798b
......@@ -65,7 +65,7 @@ public class TbCfItemCommentServiceImpl implements TbCfItemCommentService {
// }
// tbCfItemComment.setUserId(userId);
tbCfItemComment.setId(IdUtil.createIdbyUUID());
tbCfItemComment.setReal(0);
tbCfItemComment.setCommentType(0);
tbCfItemComment.setCreateTime(new Date());
tbCfItemComment.setUpdateTime(new Date());
tbCfItemComment.setDelFlag(1);
......
platform-admin/src/main/resources/com/platform/dao/TbCfItemCommentDao.xml
浏览文件 @ f995798b
......@@ -19,7 +19,7 @@
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="real" column="real"/>
<result property="commentType" column="comment_type"/>
<result property="itemImg" column="item_img"/>
<!-- <result property="username" column="nick"></result>-->
<!-- <result property="orderNo" column="order_no"></result>-->
......@@ -39,7 +39,7 @@
`logistics_score`,
`price_score`,
`item_review`,
`real`,
`comment_type`,
`del_flag`,
`create_time`,
`update_time`
......@@ -60,15 +60,17 @@
c.logistics_score,
c.price_score,
c.item_review,
c.real,
c.comment_type,
c.del_flag,
c.create_time,
c.update_time,
u.nick userName,
o.order_no,
i.item_name,
i.item_img
FROM
tb_cf_item_comment c
LEFT JOIN tb_cf_user_info u ON c.user_id = u.user_id
left join tb_cf_order o on c.order_id=o.order_id
left join tb_cf_station_item i on c.item_id=i.item_id
WHERE
......@@ -114,7 +116,7 @@
AND u.nick LIKE concat('%',#{name},'%')
</if>
<if test="real != null and real.trim()!=''">
AND c.real=#{real}
AND c.comment_type=#{real}
</if>
<if test="startTime != null and startTime.trim() != '' and endTime!=null and endTime!=''">
AND c.create_time between #{startTime} and #{endTime}
......@@ -140,7 +142,7 @@
`logistics_score`,
`price_score`,
`item_review`,
`real`,
`comment_type`,
`del_flag`,
`create_time`,
`update_time`)
......@@ -156,7 +158,7 @@
#{logisticsScore},
#{priceScore},
#{itemReview},
#{real},
#{commentType},
#{delFlag},
#{createTime},
#{updateTime})
......
platform-admin/src/main/resources/com/platform/dao/TbCfUserInfoDao.xml
浏览文件 @ f995798b
......@@ -26,6 +26,7 @@
<result property="enableFlag" column="enable_flag"/>
<result property="emailFlag" column="email_flag"/>
<result property="country" column="country"/>
<result property="real" column="real"/>
</resultMap>
<select id="queryObject" resultType="com.platform.entity.TbCfUserInfoEntity">
......@@ -170,7 +171,7 @@
) o ON u.user_id = o.user_id
LEFT JOIN ( SELECT o.user_id, count( o.coupon_id ) num FROM tb_cf_order o GROUP BY o.user_id ) c ON u.user_id =
c.user_id
WHERE 1=1
WHERE 1=1 and `real`=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
......@@ -199,7 +200,7 @@
<select id="queryTotal" resultType="int">
select count(*) from tb_cf_user_info
WHERE 1=1
WHERE 1=1 and `real`=1
<if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%')
</if>
......@@ -299,5 +300,15 @@
select count(account) from tb_cf_user_info
</select>
<select id="queryVirtualUser" resultType="com.platform.entity.VirtualUserEntity">
select
`user_id`,
`account`,
`avatar`,
nick,
`create_time`
from tb_cf_user_info
where `real`=0
</select>
</mapper>
platform-admin/src/main/resources/com/platform/dao/VirtualUserDao.xml deleted 100644 → 0
浏览文件 @ 6ef8050a
<?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.platform.dao.VirtualUserDao">
<resultMap type="com.platform.entity.VirtualUserEntity" id="virtualUserMap">
<result property="id" column="id"/>
<result property="account" column="account"/>
<result property="nick" column="nick"/>
<result property="avatar" column="avatar"/>
<result property="status" column="status"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="queryObject" resultType="com.platform.entity.VirtualUserEntity">
select
`id`,
`account`,
`nick`,
`avatar`,
`status`,
`create_time`,
`update_time`
from virtual_user
where id = #{id}
</select>
<select id="queryList" resultType="com.platform.entity.VirtualUserEntity">
select
`id`,
`account`,
`nick`,
`avatar`,
`status`,
`create_time`,
`update_time`
from virtual_user
WHERE 1=1 and status=1
<if test="name != null and name.trim() != ''">
AND nick LIKE concat('%',#{name},'%') or account LIKE concat('%',#{name},'%')
</if>
<choose>
<when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order}
</when>
<otherwise>
order by id desc
</otherwise>
</choose>
<if test="offset != null and limit != null">
limit #{offset}, #{limit}
</if>
</select>
<select id="queryTotal" resultType="int">
select count(*) from virtual_user
WHERE 1=1 and status=1
<if test="name != null and name.trim() != ''">
AND nick LIKE concat('%',#{name},'%') or account LIKE concat('%',#{name},'%')
</if>
</select>
<insert id="save" parameterType="com.platform.entity.VirtualUserEntity">
insert into virtual_user(
`id`,
`account`,
`nick`,
`avatar`,
`status`,
`create_time`,
`update_time`)
values(
#{id},
#{account},
#{nick},
#{avatar},
#{status},
#{createTime},
#{updateTime})
</insert>
<update id="update" parameterType="com.platform.entity.VirtualUserEntity">
update virtual_user
<set>
<if test="account != null">`account` = #{account},</if>
<if test="nick != null">`nick` = #{nick},</if>
<if test="avatar != null">`avatar` = #{avatar},</if>
<if test="status != null">`status` = #{status},</if>
<if test="createTime != null">`create_time` = #{createTime},</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
where id = #{id}
</update>
<delete id="delete">
delete from virtual_user where id = #{value}
</delete>
<delete id="deleteBatch">
delete from virtual_user where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
platform-admin/src/main/webapp/js/sys/tbcfitemcomment.js
浏览文件 @ f995798b
......@@ -15,8 +15,8 @@ $(function () {
{label: '状态', name: 'delFlag', index: 'del_flag', width: 80, formatter: statusFormat},
{label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
{
label: '评论类型', name: 'real', index: 'real', width: 80, formatter: function (value, options, row) {
if (value) {
label: '评论类型', name: 'commentType', index: 'comment_type', width: 80, formatter: function (value, options, row) {
if (value==1) {
return '<span class="label label-primary">真实评论</span>'
}
return '<span class="label label-warning">虚拟评论</span>'
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论