feat: 短信异步发送

guzijian
1 parent 32468c7e
Showing 4 changed files with 45 additions and 19 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/SMSUtils.java
@@ -150,13 +150,7 @@ public class GarOrder implements Serializable {
  
 	private String garCoordinate;
  
-	public Integer getGarOrderMatchFlag() {
-		return garOrderMatchFlag;
-	}
-
-	public void setGarOrderMatchFlag(Integer garOrderMatchFlag) {
-		this.garOrderMatchFlag = garOrderMatchFlag;
-	}
+	private Boolean garInCarStore;
  
 	/**
      * 评分标识
@@ -167,13 +161,6 @@ public class GarOrder implements Serializable {
 	 */
 	private Integer garHandlerEvaluateFlag;
  
-	public Integer getGarHandlerEvaluateFlag() {
-		return garHandlerEvaluateFlag;
-	}
-
-	public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
-		this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
-	}
  
 	/**
      * 原因
@@ -185,6 +172,23 @@ public class GarOrder implements Serializable {
     private static final long serialVersionUID = 1L;
  
  
+	public Integer getGarHandlerEvaluateFlag() {
+		return garHandlerEvaluateFlag;
+	}
+
+	public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
+		this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
+	}
+
+
+	public Integer getGarOrderMatchFlag() {
+		return garOrderMatchFlag;
+	}
+
+	public void setGarOrderMatchFlag(Integer garOrderMatchFlag) {
+		this.garOrderMatchFlag = garOrderMatchFlag;
+	}
+
 	public String getGarOrderId() {
 		return garOrderId;
 	}
@@ -71,6 +71,9 @@ public class OrderDto {
      */
     private String garOrderCompanyTel;
  
+    private Boolean garInCarStore;
+
+
  
     /**
      * 约定时间
@@ -233,6 +236,13 @@ public class OrderDto {
     public void setGarCoordinate(String garCoordinate) {
         this.garCoordinate = garCoordinate;
     }
+    public Boolean getGarInCarStore() {
+        return garInCarStore;
+    }
+
+    public void setGarInCarStore(Boolean garInCarStore) {
+        this.garInCarStore = garInCarStore;
+    }
  
     @Override
     public String toString() {
@@ -249,6 +259,7 @@ public class OrderDto {
                 ", garOrderCompanyId='" + garOrderCompanyId + '\'' +
                 ", garOrderCompanyName='" + garOrderCompanyName + '\'' +
                 ", garOrderCompanyTel='" + garOrderCompanyTel + '\'' +
+                ", garInCarStore=" + garInCarStore +
                 ", garOrderAgreementTime='" + garOrderAgreementTime + '\'' +
                 ", garRemark='" + garRemark + '\'' +
                 ", garCarInfoList=" + garCarInfoList +
@@ -33,6 +33,8 @@ import com.trash.garbage.mapper.GarOrderMapper;
 import com.trash.garbage.pojo.vo.OrderDetailVo;
 import cn.hutool.core.collection.CollectionUtil;
  
+import javax.annotation.Resource;
+
 /**
  * @author 20412
  * @description 针对表【gar_order(建筑垃圾—订单表)】的数据库操作Service实现
@@ -43,6 +45,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         implements GarOrderService {
  
  
+    @Resource
+    private SMSUtils smsUtils;
+
     @Autowired
     private GarOrderImageService garOrderImageService;
  
@@ -114,7 +119,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
         garOrderImageService.saveBatch(images);
         // TODO 短信提醒 居民下单
-        SMSUtils.sendMessage(order.getGarOrderCompanyTel(), "企业收单:您有新的清运订单，请及时查看并处理。");
+        smsUtils.sendMessage(order.getGarOrderCompanyTel(), "企业收单:您有新的清运订单，请及时查看并处理。");
         return order.getGarOrderId();
     }
  
@@ -337,7 +342,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     order.getGarOrderCompanyTel() : order.getGarOrderContactTel();
             String message = GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType()) ?
                     "居民取消订单：您的清运订单已取消，详情可在小程序查看" : "企业拒单";
-            SMSUtils.sendMessage(tel, message);
+            smsUtils.sendMessage(tel, message);
             return "订单取消成功";
         }
         // 企业负责人
@@ -354,7 +359,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                         .set(GarOrder::getGarOrderHandlerId, user.getGarUserId());
                 update(uw);
                 // TODO 短信提醒
-                SMSUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。");
+                smsUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已接受订单号为 " + order.getGarOrderId() + " 的订单。");
                 return "已接受订单";
             }
             // 企业负责人 清运中 ==》已完成
@@ -368,7 +373,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 update(uw);
             }
             // TODO 短信提醒
-            SMSUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已完成订单号为 " + order.getGarOrderId() + " 的订单。");
+            smsUtils.sendMessage(order.getGarOrderContactTel(), "运输公司已完成订单号为 " + order.getGarOrderId() + " 的订单。");
             return "订单已完成";
         }
     }
@@ -10,6 +10,9 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.trash.common.utils.util.PostSms;
 import com.trash.common.utils.vo.mt.JsonSmsSend;
 import com.trash.common.utils.vo.mt.Mobile;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -17,6 +20,8 @@ import java.util.List;
 /**
  * 短信发送工具类
  */
+@Component
+@EnableAsync
 public class SMSUtils {
  
     /**
@@ -25,7 +30,8 @@ public class SMSUtils {
      * @param tell    手机号
      * @param content 模板
      */
-    public static void sendMessage(String tell, String content) {
+    @Async
+    public void sendMessage(String tell, String content) {
         //发送
         Mobile mobile = new Mobile();
         mobile.setMobile(tell);