修改评论

platform-admin/src/main/java/com/platform/entity/TbCfItemCommentEntity.java

@@ -8,7 +8,7 @@ import java.util.Date;
  * 表名 tb_cf_item_comment
  *
  * @author lipengjun
- * @date 2019-11-18 14:31:39
+ * @date 2020-01-09 10:17:03
  */
 public class TbCfItemCommentEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -29,6 +29,14 @@ public class TbCfItemCommentEntity implements Serializable {
      * 商品ID
      */
     private String itemId;
+    /**
+     * 类型 0： 只有文本内容 1：带图片
+     */
+    private Integer type;
+    /**
+     * 图片或视频的url
+     */
+    private String urls;
     /**
      * 商品评分
      */
@@ -62,18 +70,41 @@ public class TbCfItemCommentEntity implements Serializable {
      */
     private Date createTime;
     /**
-     * 回复时间
+     * 更新时间
      */
     private Date updateTime;
 
-    private String username;
+    private String userName;
+
+    private String orderNo;
+    private String itemName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
 
-    public String getUsername() {
-        return username;
+    public String getItemName() {
+        return itemName;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
     /**
@@ -89,7 +120,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public String getId() {
         return id;
     }
-
     /**
      * 设置：评论人
      */
@@ -103,7 +133,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public String getUserId() {
         return userId;
     }
-
     /**
      * 设置：订单ID
      */
@@ -117,7 +146,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public String getOrderId() {
         return orderId;
     }
-
     /**
      * 设置：商品ID
      */
@@ -131,7 +159,32 @@ public class TbCfItemCommentEntity implements Serializable {
     public String getItemId() {
         return itemId;
     }
+    /**
+     * 设置：类型 0： 只有文本内容 1：带图片
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
+    /**
+     * 获取：类型 0： 只有文本内容 1：带图片
+     */
+    public Integer getType() {
+        return type;
+    }
+    /**
+     * 设置：图片或视频的url
+     */
+    public void setUrls(String urls) {
+        this.urls = urls;
+    }
+
+    /**
+     * 获取：图片或视频的url
+     */
+    public String getUrls() {
+        return urls;
+    }
     /**
      * 设置：商品评分
      */
@@ -145,7 +198,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public Integer getItemScore() {
         return itemScore;
     }
-
     /**
      * 设置：服务评分
      */
@@ -159,7 +211,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public Integer getServiceScore() {
         return serviceScore;
     }
-
     /**
      * 设置：物流评分
      */
@@ -173,7 +224,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public Integer getLogisticsScore() {
         return logisticsScore;
     }
-
     /**
      * 设置：价格评分
      */
@@ -187,7 +237,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public Integer getPriceScore() {
         return priceScore;
     }
-
     /**
      * 设置：商品评论
      */
@@ -201,7 +250,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public String getItemReview() {
         return itemReview;
     }
-
     /**
      * 设置：点赞人数
      */
@@ -215,7 +263,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public Long getLikeNum() {
         return likeNum;
     }
-
     /**
      * 设置：删除标志 0：正常 1：已删除
      */
@@ -229,7 +276,6 @@ public class TbCfItemCommentEntity implements Serializable {
     public Integer getDelFlag() {
         return delFlag;
     }
-
     /**
      * 设置：创建时间
      */
@@ -243,12 +289,17 @@ public class TbCfItemCommentEntity implements Serializable {
     public Date getCreateTime() {
         return createTime;
     }
+    /**
+     * 设置：更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
 
+    /**
+     * 获取：更新时间
+     */
     public Date getUpdateTime() {
         return updateTime;
     }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

platform-admin/src/main/resources/com/platform/dao/TbCfItemCommentDao.xml

@@ -8,6 +8,8 @@
         <result property="userId" column="user_id"/>
         <result property="orderId" column="order_id"/>
         <result property="itemId" column="item_id"/>
+        <result property="type" column="type"/>
+        <result property="urls" column="urls"/>
         <result property="itemScore" column="item_score"/>
         <result property="serviceScore" column="service_score"/>
         <result property="logisticsScore" column="logistics_score"/>
@@ -26,6 +28,8 @@
 			`user_id`,
 			`order_id`,
 			`item_id`,
+			`type`,
+			`urls`,
 			`item_score`,
 			`service_score`,
 			`logistics_score`,
@@ -40,11 +44,13 @@
 	</select>
 
     <select id="queryList" resultMap="tbCfItemCommentMap">
-        select
+        SELECT
         c.id,
         c.user_id,
         c.order_id,
         c.item_id,
+        c.type,
+        c.urls,
         c.item_score,
         c.service_score,
         c.logistics_score,
@@ -54,9 +60,16 @@
         c.del_flag,
         c.create_time,
         c.update_time,
-        u.nick username
-        from tb_cf_item_comment c left join tb_cf_user_info u on c.user_id=u.user_id
-        where 1=1
+        u.nick userName,
+        o.order_no orderNo,
+        i.item_name itemName
+        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
+        1 =1
         <if test="name != null and name.trim() != ''">
             AND u.nick LIKE concat('%',#{name},'%')
         </if>
@@ -87,6 +100,8 @@
 			`user_id`,
 			`order_id`,
 			`item_id`,
+			`type`,
+			`urls`,
 			`item_score`,
 			`service_score`,
 			`logistics_score`,
@@ -101,6 +116,8 @@
 			#{userId},
 			#{orderId},
 			#{itemId},
+			#{type},
+			#{urls},
 			#{itemScore},
 			#{serviceScore},
 			#{logisticsScore},
@@ -118,6 +135,8 @@
             <if test="userId != null">`user_id` = #{userId},</if>
             <if test="orderId != null">`order_id` = #{orderId},</if>
             <if test="itemId != null">`item_id` = #{itemId},</if>
+            <if test="type != null">`type` = #{type},</if>
+            <if test="urls != null">`urls` = #{urls},</if>
             <if test="itemScore != null">`item_score` = #{itemScore},</if>
             <if test="serviceScore != null">`service_score` = #{serviceScore},</if>
             <if test="logisticsScore != null">`logistics_score` = #{logisticsScore},</if>

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -118,6 +118,10 @@
         <if test="status != null and status.trim() != ''">
             AND enable_flag=#{status}
         </if>
+        <if test="itemCategory != null and itemCategory.trim() != ''">
+            AND item_category=#{itemCategory}
+        </if>
+
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -155,6 +159,9 @@
         <if test="status != null and status.trim() != ''">
             AND enable_flag=#{status}
         </if>
+        <if test="itemCategory != null and itemCategory.trim() != ''">
+            AND item_category=#{itemCategory}
+        </if>
     </select>
 
     <insert id="save" parameterType="com.platform.entity.TbCfStationItemEntity">

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html

@@ -71,7 +71,7 @@
     </style>
 </head>
 <body>
-<div id="rrapp" v-cloak style="width:1700px;
+<div id="rrapp" v-cloak style="width:100%;
     height: -webkit-calc(100% - 15px);
     height: -moz-calc(100% - 15px);
     height: calc(100% - 15px);">

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfstationitem.html

@@ -132,6 +132,7 @@
         .query {
             float: right;
             margin-right: 200px;
+
         }
 
         .default-price {
@@ -169,6 +170,16 @@
                     </span>
                         &nbsp;&nbsp;&nbsp;&nbsp;
                         <span>
+                    一级分类：
+                    <i-select v-model="q.itemCategory" @on-enter="query"
+                              placeholder="一级分类" style="width:160px">
+                        <i-option v-for="(el,i) in Goodstype" :key='i'
+                                  :value="el.goodstypeId">{{el.goodstypeTitle}}
+                                 </i-option>
+                    </i-select>
+                 </span>
+                        &nbsp;&nbsp;&nbsp;&nbsp;
+                        <span>
                     商品状态：
                     <i-select v-model="q.status" @on-enter="query" placeholder="商品状态" style="width:160px">
                         <i-option value="1">在线销售</i-option>

platform-admin/src/main/webapp/js/sys/tbcfitemcomment.js

@@ -3,9 +3,9 @@ $(function () {
         url: '../tbcfitemcomment/list',
         colModel: [
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
-            {label: '评论人', name: 'username', index: 'username', width: 80},
-            {label: '订单ID', name: 'orderId', index: 'order_id', width: 80},
-            {label: '商品ID', name: 'itemId', index: 'item_id', width: 80},
+            {label: '评论人', name: 'userName', index: 'username', width: 80},
+            {label: '订单号', name: 'orderNo', index: 'order_id', width: 80},
+            {label: '商品名称', name: 'itemName', index: 'item_id', width: 80},
             {label: '商品评分', name: 'itemScore', index: 'item_score', width: 80},
             {label: '服务评分', name: 'serviceScore', index: 'service_score', width: 80},
             {label: '物流评分', name: 'logisticsScore', index: 'logistics_score', width: 80},

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -43,12 +43,13 @@ let vm = new Vue({
         q: {
             name: '',
             code: '',
-            status: ''
+            status: '',
+            itemCategory: ''
         },
 
 
         alertShow: false,//警告弹窗
-        serverSkuAttr:[],
+        serverSkuAttr: [],
         attrItem: [{
             categoryName: 'Size',
             option: [],
@@ -220,7 +221,7 @@ let vm = new Vue({
                         })
                         console.log(r)
                     })()
-                    console.log(123321,_this.attrItem)
+                    console.log(123321, _this.attrItem)
                     vm.tbCfStationItem = r.tbCfStationItem.item;
                     vm.uploadList[0] = vm.tbCfStationItem.itemImg;
                     let itemDesc = vm.tbCfStationItem.itemDesc;
@@ -230,28 +231,25 @@ let vm = new Vue({
                     vm.tbCfStationItem.enableFlag === 1 && (() => {
                         _this.putaway = true;
                     })()
-                    try{
+                    try {
                         UE.getEditor('itemDesc').setContent(itemDesc);
 
-                    }catch (e) {
+                    } catch (e) {
 
                     }
-                    setTimeout(()=>{
+                    setTimeout(() => {
                         UE.getEditor('itemDesc').setContent(itemDesc);
-                    },500)
+                    }, 500)
                     if (itemDesc == null || itemDesc == '') {
                         UE.getEditor('itemDesc').setContent("");
                     }
-                    
+
                 }
             });
 
         },
         importExcel: function () {
-            let itemIds = getSelectedRows("#jqGrid");
-            if (itemIds == null) {
-                return;
-            }
+           this.modal=''
 
         },
         exportExcel: function () {
@@ -261,8 +259,9 @@ let vm = new Vue({
                 type: "POST",
                 contentType: "application/json",
                 successCallback: function (resultData) {
-                    // console.log(resultData);
-                    iview.Message.success(resultData.success);
+                    alert('操作成功!导出位置：D:\\Afrishop', function (index) {
+                        vm.reload();
+                    });
                 }
             });
 
@@ -274,7 +273,12 @@ let vm = new Vue({
             vm.showList = true;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
             $("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name.trim(), 'code': vm.q.code.trim(), 'status': vm.q.status.trim()},
+                postData: {
+                    'name': vm.q.name.trim(),
+                    'code': vm.q.code.trim(),
+                    'status': vm.q.status.trim(),
+                    'itemCategory': vm.q.itemCategory.trim()
+                },
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');
@@ -283,7 +287,8 @@ let vm = new Vue({
             vm.q = {
                 name: '',
                 code: '',
-                status: ''
+                status: '',
+                itemCategory: ''
             };
             vm.reload();
         },
@@ -491,10 +496,11 @@ let vm = new Vue({
                 })
             }
         },
-        ok(){
+        ok() {
             this.reloadSearch();
         },
-        cancel(){},
+        cancel() {
+        },
         handleCreateSelect(val) {
             let option = JSON.parse(localStorage.getItem('option'))
             option.push(val)
@@ -523,9 +529,9 @@ let vm = new Vue({
         })
 
         //获取默认规格
-        $.get('../tbcategorytemplate/queryAll',res=>{
+        $.get('../tbcategorytemplate/queryAll', res => {
             let _res = JSON.parse(res)
-            _res.list.forEach(item=>{
+            _res.list.forEach(item => {
                 this.attrItem[0].option.push(item.categoryDesc)
                 this.serverSkuAttr.push(item.categoryDesc)
             })