Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # trash-admin/pom.xml

Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # trash-admin/pom.xml
guzijian
2 parents a0864d74 6e189b6a
Showing 13 changed files with 786 additions and 15 deletions
trash-admin/pom.xml
trash-garbage/src/main/java/com/trash/garbage/interceptor/MyMetaObjectHandler.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/pojo/domain/GarOrderImage.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AddressDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/EvaluateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/LoginDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/UploadDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
@@ -113,15 +113,15 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.1.0</version>
+            <plugin>   
+                <groupId>org.apache.maven.plugins</groupId>   
+                <artifactId>maven-war-plugin</artifactId>   
+                <version>3.1.0</version>   
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>
-            </plugin>
+                </configuration>   
+           </plugin>   
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
@@ -19,7 +19,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
  
     @Override
     public void insertFill(MetaObject metaObject) {
-        log.info("start insert fill ....");
         if (metaObject.hasGetter("garCreateTime")) {
             this.strictInsertFill(metaObject, "garCreateTime", Date.class, new Date());
         }
@@ -36,7 +35,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
  
     @Override
     public void updateFill(MetaObject metaObject) {
-        log.info("start update fill ....");
         if (metaObject.hasGetter("garUpdateTime")) {
             this.strictUpdateFill(metaObject, "garUpdateTime", Date.class, new Date());
         }
@@ -134,4 +134,221 @@ public class GarOrder implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
  
+
+	public String getGarOrderId() {
+		return garOrderId;
+	}
+
+
+	public void setGarOrderId(String garOrderId) {
+		this.garOrderId = garOrderId;
+	}
+
+
+	public String getGarOrderUserId() {
+		return garOrderUserId;
+	}
+
+
+	public void setGarOrderUserId(String garOrderUserId) {
+		this.garOrderUserId = garOrderUserId;
+	}
+
+
+	public String getGarOrderHandlerId() {
+		return garOrderHandlerId;
+	}
+
+
+	public void setGarOrderHandlerId(String garOrderHandlerId) {
+		this.garOrderHandlerId = garOrderHandlerId;
+	}
+
+
+	public String getGarOrderAddress() {
+		return garOrderAddress;
+	}
+
+
+	public void setGarOrderAddress(String garOrderAddress) {
+		this.garOrderAddress = garOrderAddress;
+	}
+
+
+	public String getGarOrderAddressDetails() {
+		return garOrderAddressDetails;
+	}
+
+
+	public void setGarOrderAddressDetails(String garOrderAddressDetails) {
+		this.garOrderAddressDetails = garOrderAddressDetails;
+	}
+
+
+	public String getGarOrderContactName() {
+		return garOrderContactName;
+	}
+
+
+	public void setGarOrderContactName(String garOrderContactName) {
+		this.garOrderContactName = garOrderContactName;
+	}
+
+
+	public String getGarOrderTrashType() {
+		return garOrderTrashType;
+	}
+
+
+	public void setGarOrderTrashType(String garOrderTrashType) {
+		this.garOrderTrashType = garOrderTrashType;
+	}
+
+
+	public String getGarOrderContactTel() {
+		return garOrderContactTel;
+	}
+
+
+	public void setGarOrderContactTel(String garOrderContactTel) {
+		this.garOrderContactTel = garOrderContactTel;
+	}
+
+
+	public String getGarOrderCompanyId() {
+		return garOrderCompanyId;
+	}
+
+
+	public void setGarOrderCompanyId(String garOrderCompanyId) {
+		this.garOrderCompanyId = garOrderCompanyId;
+	}
+
+
+	public String getGarOrderCompanyName() {
+		return garOrderCompanyName;
+	}
+
+
+	public void setGarOrderCompanyName(String garOrderCompanyName) {
+		this.garOrderCompanyName = garOrderCompanyName;
+	}
+
+
+	public String getGarOrderCompanyTel() {
+		return garOrderCompanyTel;
+	}
+
+
+	public void setGarOrderCompanyTel(String garOrderCompanyTel) {
+		this.garOrderCompanyTel = garOrderCompanyTel;
+	}
+
+
+	public Integer getGarOrderHandlerStatus() {
+		return garOrderHandlerStatus;
+	}
+
+
+	public void setGarOrderHandlerStatus(Integer garOrderHandlerStatus) {
+		this.garOrderHandlerStatus = garOrderHandlerStatus;
+	}
+
+
+	public String getGarOrderAgreementTime() {
+		return garOrderAgreementTime;
+	}
+
+
+	public void setGarOrderAgreementTime(String garOrderAgreementTime) {
+		this.garOrderAgreementTime = garOrderAgreementTime;
+	}
+
+
+	public Date getGarCreateTime() {
+		return garCreateTime;
+	}
+
+
+	public void setGarCreateTime(Date garCreateTime) {
+		this.garCreateTime = garCreateTime;
+	}
+
+
+	public Date getGarUpdateTime() {
+		return garUpdateTime;
+	}
+
+
+	public void setGarUpdateTime(Date garUpdateTime) {
+		this.garUpdateTime = garUpdateTime;
+	}
+
+
+	public String getGarCreateBy() {
+		return garCreateBy;
+	}
+
+
+	public void setGarCreateBy(String garCreateBy) {
+		this.garCreateBy = garCreateBy;
+	}
+
+
+	public String getGarUpdateBy() {
+		return garUpdateBy;
+	}
+
+
+	public void setGarUpdateBy(String garUpdateBy) {
+		this.garUpdateBy = garUpdateBy;
+	}
+
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+
+
+	public Integer getGarCancelFlag() {
+		return garCancelFlag;
+	}
+
+
+	public void setGarCancelFlag(Integer garCancelFlag) {
+		this.garCancelFlag = garCancelFlag;
+	}
+
+
+	public Integer getGarEvaluateFlag() {
+		return garEvaluateFlag;
+	}
+
+
+	public void setGarEvaluateFlag(Integer garEvaluateFlag) {
+		this.garEvaluateFlag = garEvaluateFlag;
+	}
+
+
+	public String getGarReason() {
+		return garReason;
+	}
+
+
+	public void setGarReason(String garReason) {
+		this.garReason = garReason;
+	}
+
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+    
+    
+
 }
 \ No newline at end of file
@@ -68,4 +68,90 @@ public class GarOrderEvaluate implements Serializable {
  
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+	public String getGarEvaluateId() {
+		return garEvaluateId;
+	}
+
+	public void setGarEvaluateId(String garEvaluateId) {
+		this.garEvaluateId = garEvaluateId;
+	}
+
+	public String getGarOrderId() {
+		return garOrderId;
+	}
+
+	public void setGarOrderId(String garOrderId) {
+		this.garOrderId = garOrderId;
+	}
+
+	public String getGarCompanyId() {
+		return garCompanyId;
+	}
+
+	public void setGarCompanyId(String garCompanyId) {
+		this.garCompanyId = garCompanyId;
+	}
+
+	public String getGarEvaluateContent() {
+		return garEvaluateContent;
+	}
+
+	public void setGarEvaluateContent(String garEvaluateContent) {
+		this.garEvaluateContent = garEvaluateContent;
+	}
+
+	public Integer getGarEvaluateScore() {
+		return garEvaluateScore;
+	}
+
+	public void setGarEvaluateScore(Integer garEvaluateScore) {
+		this.garEvaluateScore = garEvaluateScore;
+	}
+
+	public String getGarUpdateBy() {
+		return garUpdateBy;
+	}
+
+	public void setGarUpdateBy(String garUpdateBy) {
+		this.garUpdateBy = garUpdateBy;
+	}
+
+	public String getGarCreateBy() {
+		return garCreateBy;
+	}
+
+	public void setGarCreateBy(String garCreateBy) {
+		this.garCreateBy = garCreateBy;
+	}
+
+	public Date getGarUpdateTime() {
+		return garUpdateTime;
+	}
+
+	public void setGarUpdateTime(Date garUpdateTime) {
+		this.garUpdateTime = garUpdateTime;
+	}
+
+	public Date getGarCreateTime() {
+		return garCreateTime;
+	}
+
+	public void setGarCreateTime(Date garCreateTime) {
+		this.garCreateTime = garCreateTime;
+	}
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+    
+    
 }
 \ No newline at end of file
@@ -75,4 +75,82 @@ public class GarOrderImage implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
  
+	public String getGarImageId() {
+		return garImageId;
+	}
+
+	public void setGarImageId(String garImageId) {
+		this.garImageId = garImageId;
+	}
+
+	public String getGarOrderId() {
+		return garOrderId;
+	}
+
+	public void setGarOrderId(String garOrderId) {
+		this.garOrderId = garOrderId;
+	}
+
+	public Integer getGarOrderImageType() {
+		return garOrderImageType;
+	}
+
+	public void setGarOrderImageType(Integer garOrderImageType) {
+		this.garOrderImageType = garOrderImageType;
+	}
+
+	public String getGarOrderImageUrl() {
+		return garOrderImageUrl;
+	}
+
+	public void setGarOrderImageUrl(String garOrderImageUrl) {
+		this.garOrderImageUrl = garOrderImageUrl;
+	}
+
+	public Date getGarCreateTime() {
+		return garCreateTime;
+	}
+
+	public void setGarCreateTime(Date garCreateTime) {
+		this.garCreateTime = garCreateTime;
+	}
+
+	public Date getGarUpdateTime() {
+		return garUpdateTime;
+	}
+
+	public void setGarUpdateTime(Date garUpdateTime) {
+		this.garUpdateTime = garUpdateTime;
+	}
+
+	public String getGarCreateBy() {
+		return garCreateBy;
+	}
+
+	public void setGarCreateBy(String garCreateBy) {
+		this.garCreateBy = garCreateBy;
+	}
+
+	public String getGarUpdateBy() {
+		return garUpdateBy;
+	}
+
+	public void setGarUpdateBy(String garUpdateBy) {
+		this.garUpdateBy = garUpdateBy;
+	}
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+    
+    
+
 }
 \ No newline at end of file
@@ -22,4 +22,42 @@ public class AddressDto {
     private String contactIphoneNumber;
     @NotNull(message = "defaultFlag不能为空")
     private Boolean defaultFlag;
+	public String getGarAddressId() {
+		return garAddressId;
+	}
+	public void setGarAddressId(String garAddressId) {
+		this.garAddressId = garAddressId;
+	}
+	public String getAddressArea() {
+		return addressArea;
+	}
+	public void setAddressArea(String addressArea) {
+		this.addressArea = addressArea;
+	}
+	public String getAddressDetail() {
+		return addressDetail;
+	}
+	public void setAddressDetail(String addressDetail) {
+		this.addressDetail = addressDetail;
+	}
+	public String getContactPerson() {
+		return contactPerson;
+	}
+	public void setContactPerson(String contactPerson) {
+		this.contactPerson = contactPerson;
+	}
+	public String getContactIphoneNumber() {
+		return contactIphoneNumber;
+	}
+	public void setContactIphoneNumber(String contactIphoneNumber) {
+		this.contactIphoneNumber = contactIphoneNumber;
+	}
+	public Boolean getDefaultFlag() {
+		return defaultFlag;
+	}
+	public void setDefaultFlag(Boolean defaultFlag) {
+		this.defaultFlag = defaultFlag;
+	}
+    
+    
 }
@@ -17,4 +17,30 @@ public class EvaluateDto {
     @NotNull
     private Integer score;
     private List<String> imageUrls;
+	public String getOrderId() {
+		return orderId;
+	}
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+	public String getContent() {
+		return content;
+	}
+	public void setContent(String content) {
+		this.content = content;
+	}
+	public Integer getScore() {
+		return score;
+	}
+	public void setScore(Integer score) {
+		this.score = score;
+	}
+	public List<String> getImageUrls() {
+		return imageUrls;
+	}
+	public void setImageUrls(List<String> imageUrls) {
+		this.imageUrls = imageUrls;
+	}
+    
+    
 }
@@ -14,4 +14,48 @@ public class LoginDto {
     private Integer loginType;
     private String encryptedData;
     private String iv;
+	public String getTel() {
+		return tel;
+	}
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+	public String getWxCode() {
+		return wxCode;
+	}
+	public void setWxCode(String wxCode) {
+		this.wxCode = wxCode;
+	}
+	public Integer getLoginType() {
+		return loginType;
+	}
+	public void setLoginType(Integer loginType) {
+		this.loginType = loginType;
+	}
+	public String getEncryptedData() {
+		return encryptedData;
+	}
+	public void setEncryptedData(String encryptedData) {
+		this.encryptedData = encryptedData;
+	}
+	public String getIv() {
+		return iv;
+	}
+	public void setIv(String iv) {
+		this.iv = iv;
+	}
+    
+    
 }
@@ -72,4 +72,94 @@ public class OrderDto {
      */
     private String garRemark;
  
+	public String getGarOrderAddress() {
+		return garOrderAddress;
+	}
+
+	public void setGarOrderAddress(String garOrderAddress) {
+		this.garOrderAddress = garOrderAddress;
+	}
+
+	public List<String> getImageUrls() {
+		return imageUrls;
+	}
+
+	public void setImageUrls(List<String> imageUrls) {
+		this.imageUrls = imageUrls;
+	}
+
+	public String getGarOrderAddressDetails() {
+		return garOrderAddressDetails;
+	}
+
+	public void setGarOrderAddressDetails(String garOrderAddressDetails) {
+		this.garOrderAddressDetails = garOrderAddressDetails;
+	}
+
+	public String getGarOrderContactName() {
+		return garOrderContactName;
+	}
+
+	public void setGarOrderContactName(String garOrderContactName) {
+		this.garOrderContactName = garOrderContactName;
+	}
+
+	public String getGarOrderTrashType() {
+		return garOrderTrashType;
+	}
+
+	public void setGarOrderTrashType(String garOrderTrashType) {
+		this.garOrderTrashType = garOrderTrashType;
+	}
+
+	public String getGarOrderContactTel() {
+		return garOrderContactTel;
+	}
+
+	public void setGarOrderContactTel(String garOrderContactTel) {
+		this.garOrderContactTel = garOrderContactTel;
+	}
+
+	public String getGarOrderCompanyId() {
+		return garOrderCompanyId;
+	}
+
+	public void setGarOrderCompanyId(String garOrderCompanyId) {
+		this.garOrderCompanyId = garOrderCompanyId;
+	}
+
+	public String getGarOrderCompanyName() {
+		return garOrderCompanyName;
+	}
+
+	public void setGarOrderCompanyName(String garOrderCompanyName) {
+		this.garOrderCompanyName = garOrderCompanyName;
+	}
+
+	public String getGarOrderCompanyTel() {
+		return garOrderCompanyTel;
+	}
+
+	public void setGarOrderCompanyTel(String garOrderCompanyTel) {
+		this.garOrderCompanyTel = garOrderCompanyTel;
+	}
+
+	public String getGarOrderAgreementTime() {
+		return garOrderAgreementTime;
+	}
+
+	public void setGarOrderAgreementTime(String garOrderAgreementTime) {
+		this.garOrderAgreementTime = garOrderAgreementTime;
+	}
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+    
+    
+
 }
@@ -24,4 +24,30 @@ public class OrderUpdateDto {
      * 照片url
       */
     private List<String> imageUrls;
+
+	public String getGarOrderId() {
+		return garOrderId;
+	}
+
+	public void setGarOrderId(String garOrderId) {
+		this.garOrderId = garOrderId;
+	}
+
+	public Integer getHandleType() {
+		return handleType;
+	}
+
+	public void setHandleType(Integer handleType) {
+		this.handleType = handleType;
+	}
+
+	public List<String> getImageUrls() {
+		return imageUrls;
+	}
+
+	public void setImageUrls(List<String> imageUrls) {
+		this.imageUrls = imageUrls;
+	}
+    
+    
 }
@@ -12,4 +12,24 @@ public class UploadDto {
     private String garOrderId;
     private Integer type;
     private List<String> imageUrls;
+	public String getGarOrderId() {
+		return garOrderId;
+	}
+	public void setGarOrderId(String garOrderId) {
+		this.garOrderId = garOrderId;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	public List<String> getImageUrls() {
+		return imageUrls;
+	}
+	public void setImageUrls(List<String> imageUrls) {
+		this.imageUrls = imageUrls;
+	}
+    
+    
 }
@@ -101,4 +101,150 @@ public class OrderDetailVo {
         this.handleFlag = false;
     }
  
+	public String getGarOrderHandlerId() {
+		return garOrderHandlerId;
+	}
+
+	public void setGarOrderHandlerId(String garOrderHandlerId) {
+		this.garOrderHandlerId = garOrderHandlerId;
+	}
+
+	public Integer getGarEvaluateFlag() {
+		return garEvaluateFlag;
+	}
+
+	public void setGarEvaluateFlag(Integer garEvaluateFlag) {
+		this.garEvaluateFlag = garEvaluateFlag;
+	}
+
+	public String getGarOrderAddress() {
+		return garOrderAddress;
+	}
+
+	public void setGarOrderAddress(String garOrderAddress) {
+		this.garOrderAddress = garOrderAddress;
+	}
+
+	public List<String> getCurrentImages() {
+		return currentImages;
+	}
+
+	public void setCurrentImages(List<String> currentImages) {
+		this.currentImages = currentImages;
+	}
+
+	public List<String> getPutOnImages() {
+		return putOnImages;
+	}
+
+	public void setPutOnImages(List<String> putOnImages) {
+		this.putOnImages = putOnImages;
+	}
+
+	public List<String> getPutDownImages() {
+		return putDownImages;
+	}
+
+	public void setPutDownImages(List<String> putDownImages) {
+		this.putDownImages = putDownImages;
+	}
+
+	public String getGarOrderAddressDetails() {
+		return garOrderAddressDetails;
+	}
+
+	public void setGarOrderAddressDetails(String garOrderAddressDetails) {
+		this.garOrderAddressDetails = garOrderAddressDetails;
+	}
+
+	public String getGarOrderContactName() {
+		return garOrderContactName;
+	}
+
+	public void setGarOrderContactName(String garOrderContactName) {
+		this.garOrderContactName = garOrderContactName;
+	}
+
+	public String getGarOrderTrashType() {
+		return garOrderTrashType;
+	}
+
+	public void setGarOrderTrashType(String garOrderTrashType) {
+		this.garOrderTrashType = garOrderTrashType;
+	}
+
+	public Integer getGarOrderHandlerStatus() {
+		return garOrderHandlerStatus;
+	}
+
+	public void setGarOrderHandlerStatus(Integer garOrderHandlerStatus) {
+		this.garOrderHandlerStatus = garOrderHandlerStatus;
+	}
+
+	public Date getGarCreateTime() {
+		return garCreateTime;
+	}
+
+	public void setGarCreateTime(Date garCreateTime) {
+		this.garCreateTime = garCreateTime;
+	}
+
+	public String getGarOrderContactTel() {
+		return garOrderContactTel;
+	}
+
+	public void setGarOrderContactTel(String garOrderContactTel) {
+		this.garOrderContactTel = garOrderContactTel;
+	}
+
+	public String getGarOrderCompanyId() {
+		return garOrderCompanyId;
+	}
+
+	public void setGarOrderCompanyId(String garOrderCompanyId) {
+		this.garOrderCompanyId = garOrderCompanyId;
+	}
+
+	public String getGarOrderCompanyName() {
+		return garOrderCompanyName;
+	}
+
+	public void setGarOrderCompanyName(String garOrderCompanyName) {
+		this.garOrderCompanyName = garOrderCompanyName;
+	}
+
+	public String getGarOrderCompanyTel() {
+		return garOrderCompanyTel;
+	}
+
+	public void setGarOrderCompanyTel(String garOrderCompanyTel) {
+		this.garOrderCompanyTel = garOrderCompanyTel;
+	}
+
+	public String getGarOrderAgreementTime() {
+		return garOrderAgreementTime;
+	}
+
+	public void setGarOrderAgreementTime(String garOrderAgreementTime) {
+		this.garOrderAgreementTime = garOrderAgreementTime;
+	}
+
+	public String getGarRemark() {
+		return garRemark;
+	}
+
+	public void setGarRemark(String garRemark) {
+		this.garRemark = garRemark;
+	}
+
+	public Boolean getHandleFlag() {
+		return handleFlag;
+	}
+
+	public void setHandleFlag(Boolean handleFlag) {
+		this.handleFlag = handleFlag;
+	}
+    
+    
+
 }
 package com.trash.garbage.service.impl;
  
-import cn.hutool.core.collection.CollectionUtil;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,6 +17,7 @@ import com.trash.common.utils.bean.BeanUtils;
 import com.trash.driver.domain.vo.DriverVo;
 import com.trash.driver.service.IDriverService;
 import com.trash.garbage.global.GlobalStatus;
+import com.trash.garbage.mapper.GarOrderMapper;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
 import com.trash.garbage.pojo.domain.GarOrderImage;
@@ -23,14 +30,9 @@ import com.trash.garbage.pojo.vo.OrderDetailVo;
 import com.trash.garbage.service.GarOrderEvaluateService;
 import com.trash.garbage.service.GarOrderImageService;
 import com.trash.garbage.service.GarOrderService;
-import com.trash.garbage.mapper.GarOrderMapper;
 import com.trash.garbage.service.GarUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
  
-import java.util.ArrayList;
-import java.util.List;
+import cn.hutool.core.collection.CollectionUtil;
  
 /**
  * @author 20412