按需修改用户评价

liujun001
1 parent 9b39ddcf
Showing 8 changed files with 98 additions and 7 deletions
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderEvaluateMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderEvaluate.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderEvaluateService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderEvaluateServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderEvaluateMapper.xml
@@ -4,6 +4,7 @@ import com.trash.garbage.pojo.domain.GarOrderEvaluate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
  
+import java.util.Collection;
 import java.util.List;
  
 /**
@@ -15,6 +16,8 @@ import java.util.List;
 public interface GarOrderEvaluateMapper extends BaseMapper<GarOrderEvaluate> {
  
     List<GarOrderEvaluate> queryEvaluateByEnterpriseIds(@Param("list") List<Long> enterpriseIds, @Param("type") Integer value);
+
+    List<GarOrderEvaluate>  countIdGroupByOrderId(@Param("list") Collection<String> orderIds,@Param("type")  Integer type);
 }
  
  
 package com.trash.garbage.pojo.domain;
  
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
  
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 建筑垃圾—订单表
  * @TableName gar_order
@@ -167,8 +169,18 @@ public class GarOrder implements Serializable {
  
 	private Integer garTimeOutFlag;
  
+	/**
+	 * 是否有用户的评价，默认值是0，默认没有
+	 *
+	 * @author liujun
+	 * @date 2024/6/20 14:39
+	 */
+	@TableField(exist = false)
+	private Integer haveEvaluateOfClient = 0;
+
+
  
-    @TableField(exist = false)
+	@TableField(exist = false)
     private static final long serialVersionUID = 1L;
  
  
@@ -450,4 +462,13 @@ public class GarOrder implements Serializable {
 	public void setGarTimeOutFlag(Integer garTimeOutFlag) {
 		this.garTimeOutFlag = garTimeOutFlag;
 	}
+
+
+	public Integer getHaveEvaluateOfClient() {
+		return haveEvaluateOfClient;
+	}
+
+	public void setHaveEvaluateOfClient(Integer haveEvaluateOfClient) {
+		this.haveEvaluateOfClient = haveEvaluateOfClient;
+	}
 }
 \ No newline at end of file
@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
  
 /**
  * 建筑垃圾-订单评分
@@ -76,6 +77,9 @@ public class GarOrderEvaluate implements Serializable {
      */
     private String garRemark;
  
+	@TableField(exist = false)
+	private Integer countTheNumber;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
  
@@ -3,6 +3,7 @@ package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
  
+import java.util.Collection;
 import java.util.List;
  
 /**
@@ -15,4 +16,13 @@ public interface GarOrderEvaluateService extends IService&lt;GarOrderEvaluate&gt; {
     List<GarOrderEvaluate> queryEvaluateByEnterpriseIds( List<Long> enterpriseIds, Integer value);
  
     Integer countId(GarOrderEvaluate evaluate);
+    /***
+     *
+     *  根据订单 Id分组查询评价条数，
+     * @author liujun
+     * @date 2024/6/21 9:11
+     * @param orderIds
+     * @return java.util.List<com.trash.garbage.pojo.domain.GarOrderEvaluate>
+     */
+    List<GarOrderEvaluate> countIdGroupByOrderId(Collection<String> orderIds,Integer type);
 }
@@ -9,6 +9,8 @@ import com.trash.garbage.service.GarOrderEvaluateService;
 import org.springframework.stereotype.Service;
  
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
  
 /**
@@ -35,6 +37,15 @@ public class GarOrderEvaluateServiceImpl extends ServiceImpl&lt;GarOrderEvaluateMap
         return count(wrapper);
     }
  
+    @Override
+    public List<GarOrderEvaluate> countIdGroupByOrderId(Collection<String> orderIds,Integer type) {
+        if(CollectionUtil.isEmpty(orderIds)){
+            return Collections.emptyList();
+        }
+
+        return baseMapper.countIdGroupByOrderId(orderIds,type);
+    }
+
  
 }
  
@@ -329,12 +329,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                             .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
                 }
                 List<GarOrder> orderList = list(qw);
+                orderList=queryHaveEvaluateOfClient(orderList,GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
                 List<GarOrder> orderList = baseMapper.selectList(qw);
+                orderList =queryHaveEvaluateOfClient(orderList,GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
@@ -352,6 +354,34 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return null;
     }
  
+    /***
+     * 查询有无评价信息
+     *
+     * @author liujun
+     * @date 2024/6/21 9:08
+     * @param orders 订单数据
+     */
+    private List<GarOrder> queryHaveEvaluateOfClient(List<GarOrder> orders, Integer type) {
+        if (CollectionUtils.isEmpty(orders)) {
+            return orders;
+        }
+        Set<String> orderIds = orders.stream().map(GarOrder::getGarOrderId).collect(Collectors.toSet());
+        List<GarOrderEvaluate> garOrderEvaluates = garOrderEvaluateService.countIdGroupByOrderId(orderIds, type);
+        if (CollectionUtils.isEmpty(garOrderEvaluates)) {
+            return orders;
+        }
+
+        return orders.stream().map(o -> {
+            if(Objects.nonNull(o)){
+                Optional<GarOrderEvaluate>  optional = garOrderEvaluates.stream().filter(go->Objects.equals(go.getGarOrderId(),o.getGarOrderId())).findFirst();
+                if(optional.isPresent()){
+                    o.setHaveEvaluateOfClient(optional.get().getCountTheNumber()>0?1:0);
+                }
+            }
+            return o;
+        }).collect(Collectors.toList());
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String updateOrder(OrderUpdateDto dto) {
@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
  
 import com.trash.disposalSite.domain.DisposalSite;
 import com.trash.disposalSite.service.IDisposalSiteService;
+import com.trash.garbage.utils.SMSUtils;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -73,6 +74,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Resource
     private WxConfig wxConfig;
  
+    @Resource
+    private SMSUtils smsUtils;
+
     @Autowired
     private GarAddressService garAddressService;
  
@@ -36,4 +36,12 @@
             #{item}
         </foreach>
     </select>
+    <select id="countIdGroupByOrderId" resultType="com.trash.garbage.pojo.domain.GarOrderEvaluate">
+        select count(gar_order_id) countTheNumber,gar_order_id from  gar_order_evaluate WHERE
+         gar_order_id IN
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        AND gar_evaluate_target = #{type} GROUP BY gar_order_id
+    </select>
 </mapper>