bugfix:744用户聊天

alien-entity/src/main/java/shop/alien/entity/store/LifeUserDynamics.java

@@ -65,7 +65,6 @@ public class LifeUserDynamics {
      */
     private Integer dianzanCount;
 
-
     @ApiModelProperty(value = "1-动态 2-商家社区 3-官方社区")
     private String type;
 
@@ -115,12 +114,24 @@ public class LifeUserDynamics {
     @TableField("enable_status")
     private Integer enableStatus;
 
+    @ApiModelProperty(value = "订单GMV (达人发布动态使用的)")
+    @TableField("order_gmv")
+    private BigDecimal orderGmv;
+
     @ApiModelProperty(value = "达人id")
     @TableField("expert_id")
     private Integer expertId;
 
-    @ApiModelProperty(value = "启用状态0-启用，1-禁用")
-    @TableField("业务id")
+    @ApiModelProperty(value = "业务id")
+    @TableField("business_id")
     private Integer businessId;
 
+    @ApiModelProperty(value = "根据动态进入店铺详情浏览数")
+    @TableField("store_count")
+    private Integer storeCount;
+
+
+    @ApiModelProperty(value = "转发量")
+    @TableField("transfer_count")
+    private Integer transferCount;
 }

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java

@@ -77,6 +77,8 @@ public class LifeUserOrderVo {
 
     private Integer collectNum;
 
+    private String storeUserTel;
+
     private String storeTel;
     @ApiModelProperty(value = "团购/代金券优惠金额")
     private String offprice;

alien-entity/src/main/resources/mapper/LifeUserOrderMapper.xml

@@ -45,7 +45,6 @@
         <result column="type" property="type"/>
         <result column="store_type" property="storeType"/>
         <result column="store_status" property="storeStatus"/>
-
         <result column="business_type" property="businessType"/>
         <result column="collect_num" property="collectNum"/>
         <result column="business_date" property="businessDate"/>
@@ -55,6 +54,7 @@
         <result column="reservation_rules" property="reservationRules"/>
         <result column="original_price" property="originalPrice"/>
         <result column="order_str" property="orderStr"/>
+        <result column="store_user_tel" property="storeUserTel"/>
 
         <collection property="orderCouponMiddleList" ofType="shop.alien.entity.store.vo.OrderCouponMiddleVo">
             <id column="ocmId" property="id" />
@@ -86,6 +86,7 @@
         lu.user_phone,lu.user_name,lu.id user_id,
         ocm.id ocmId,ocm.status,ocm.coupon_code,ocm.refund_time,ocm.refund_reason,ocm.price refundPrice,
         si.id store_id,si.store_name,si.commission_rate,si.store_address,si.store_tel,si.business_status,si.collect_num,si.business_section store_type,si.store_status,
+        su.phone store_user_tel,
         <if test="position != null and position != ''">
             ROUND(
             ST_Distance_Sphere(
@@ -106,6 +107,7 @@
         left join life_user lu on lu.id = luo.user_id and lu.delete_flag = 0
         left join store_img simg on simg.id = tc.image_id and simg.delete_flag = 0
         left join store_business_info sbi on sbi.store_id = si.id and sbi.delete_flag = 0
+        left join store_user su on su.store_id = si.id and su.delete_flag = 0
         where luo.id = #{orderId}
         order by luo.created_time desc
     </select>