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

2c
2 parents 64bfc273 0f2f6a01
Showing 11 changed files with 165 additions and 11 deletions
trash-admin/src/main/java/com/trash/Application.java
trash-common/src/main/java/com/trash/common/core/redis/RedisCache.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/interceptor/MyMetaObjectHandler.java
trash-garbage/src/main/java/com/trash/garbage/job/OrderJob.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMapper.xml
@@ -3,6 +3,7 @@ package com.trash;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 /**
  * 启动程序
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author trash
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@EnableScheduling
 public class Application
 {
     public static void main(String[] args)
@@ -93,6 +93,10 @@ public class RedisCache
     {
         return redisTemplate.delete(key);
     }
+    public boolean deleteObject(final String key,final String hashKey)
+    {
+        return redisTemplate.opsForHash().delete(key,hashKey) != 0L;
+    }
     /**
      * 删除集合对象
@@ -14,6 +14,10 @@ public class GlobalStatus {
      * 已注销
      */
     public static final int DEL_FLAG_YES = 1;
+    /** 订单超时 */
+    public static final boolean ORDER_TIME_OUT_FLAG_YES = true;
+    /** 订单未超时 */
+    public static final boolean ORDER_TIME_OUT_FLAG_NO = false;
     /**
      * 地址查询类型  当前地址
@@ -88,6 +92,8 @@ public class GlobalStatus {
      * 订单
      */
     public enum GarOrderStatus {
+        ORDER_TIME_OUT_FLAG_YES(1,"已超时"),
+        ORDER_TIME_OUT_FLAG_NO(0,"未超时"),
         NEW_ORDER(0, "新订单"),
         ACTIVE_ORDER(1, "处理中"),
         ALL_ORDER(2, "全部订单"),
@@ -23,13 +23,21 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             this.strictInsertFill(metaObject, "garCreateTime", Date.class, new Date());
         }
         if (metaObject.hasGetter("garCreateBy")) {
-            this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
+            try {
+                this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
+            }catch (Exception e) {
+                log.info("当前操作定时任务");
+            }
         }
         if (metaObject.hasGetter("garUpdateTime")) {
             this.strictInsertFill(metaObject, "garUpdateTime", Date.class, new Date());
         }
         if (metaObject.hasGetter("garUpdateBy")) {
-            this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
+            try {
+                this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
+            }catch (Exception e) {
+                log.info("当前操作定时任务");
+            }
         }
     }
@@ -39,7 +47,11 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             this.strictUpdateFill(metaObject, "garUpdateTime", Date.class, new Date());
         }
         if (metaObject.hasGetter("garUpdateBy")) {
-            this.strictUpdateFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
+            try {
+                this.strictUpdateFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
+            }catch (Exception e) {
+                log.info("当前操作定时任务");
+            }
         }
     }
 }
 \ No newline at end of file
+package com.trash.garbage.job;
+
+import com.trash.common.utils.DateUtils;
+import com.trash.garbage.global.GlobalStatus;
+import com.trash.garbage.pojo.domain.GarOrder;
+import com.trash.garbage.pojo.domain.GarUserOrderMessage;
+import com.trash.garbage.service.GarOrderService;
+import com.trash.garbage.service.GarUserOrderMessageService;
+import com.trash.garbage.utils.SMSUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+public class OrderJob {
+
+    Logger log = LoggerFactory.getLogger(OrderJob.class);
+    @Resource
+    private SMSUtils smsUtils;
+
+    @Autowired
+    private GarOrderService garOrderService;
+    @Autowired
+    private GarUserOrderMessageService orderMessageService;
+
+
+    /**
+     * 超时订单直接完成
+     */
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void computedOrderIsTimeOut() {
+        // 每3分钟遍历一次订单 超时未处理得修改订单状态为完成，并设置订单超时
+        // 查询依据是 新订单，未超时，未取消
+        List<GarOrder> list = garOrderService.queryUnprocessedOrder(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue(), GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue(), GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+        List<GarOrder> timeOutList = new ArrayList<>();
+        Date now = new Date();
+        for (GarOrder order : list) {
+            String agreementTime = order.getGarOrderAgreementTime();
+            // 2024-05-22 10:00-11:00
+            String[] dateSplit = agreementTime.split(" ");
+            String dateStr = dateSplit[0] + " " + dateSplit[1].split("-")[0] + ":00";
+            Date date = DateUtils.dateTime("yyyy-MM-dd HH:mm:ss", dateStr);
+            if (date.compareTo(now) < 0) {
+                timeOutList.add(order);
+            }
+        }
+        log.info("检索订单超时完毕，当前共:{}个订单超时", timeOutList.size());
+        garOrderService.updateTimeOutOrderStatus(timeOutList);
+        // 发送消息
+        List<String> tels = timeOutList.stream().map(GarOrder::getGarOrderContactTel).collect(Collectors.toList());
+        smsUtils.sendMessage(tels, "订单超时，已取消，请及时登录处理。");
+        userOrderMessageSend(timeOutList, "订单超时，已取消。");
+    }
+
+    private void userOrderMessageSend(List<GarOrder> orderList, String message) {
+        for (GarOrder order : orderList) {
+            GarUserOrderMessage guom = new GarUserOrderMessage();
+            guom.setGarMessageState(GlobalStatus.GarUserStatusEnum.ORDER_MESSAGE_UNREAD.getStatus());
+            guom.setGarContent(message);
+            guom.setGarUserId(order.getGarCreateBy());
+            guom.setGarUserTel(order.getGarOrderContactTel());
+            orderMessageService.save(guom);
+        }
+    }
+}
@@ -30,6 +30,9 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     OrderDetailTransportVo queryOrderTransportDetail(@Param("orderId") String id);
+    List<GarOrder> queryUnprocessedOrder(@Param("orderType")Integer orderType,@Param("timeOutFlag")Integer timeOutFlag,@Param("cancelFlag")Integer cancelFlag);
+
+    void updateTimeOutOrderStatus(@Param("list") List<GarOrder> timeOutList, @Param("status")Integer status,@Param("timeOutFlag") Integer timeOutFlag);
 }
@@ -165,6 +165,8 @@ public class GarOrder implements Serializable {
      */
     private String garReason;
+	private Integer garTimeOutFlag;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -440,4 +442,12 @@ public class GarOrder implements Serializable {
 	public void setGarInCarStore(Boolean garInCarStore) {
 		this.garInCarStore = garInCarStore;
 	}
+
+	public Integer getGarTimeOutFlag() {
+		return garTimeOutFlag;
+	}
+
+	public void setGarTimeOutFlag(Integer garTimeOutFlag) {
+		this.garTimeOutFlag = garTimeOutFlag;
+	}
 }
 \ No newline at end of file
@@ -106,6 +106,8 @@ public class OrderDetailVo {
      */
     private String garOrderContactTel;
+    private Integer garTimeOutFlag;
+
     /**
      * 承接经营单位
      */
@@ -401,4 +403,12 @@ public class OrderDetailVo {
     public void setGarOrderScanHandlerFlag(Integer garOrderScanHandlerFlag) {
         this.garOrderScanHandlerFlag = garOrderScanHandlerFlag;
     }
+
+    public Integer getGarTimeOutFlag() {
+        return garTimeOutFlag;
+    }
+
+    public void setGarTimeOutFlag(Integer garTimeOutFlag) {
+        this.garTimeOutFlag = garTimeOutFlag;
+    }
 }
@@ -95,4 +95,8 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     String readMessage(List<String> messageIds);
     Integer queryOrderMessageCount();
+
+    List<GarOrder> queryUnprocessedOrder(Integer value, Integer orderTimeOutFlagNo, Integer value1);
+
+    void updateTimeOutOrderStatus(List<GarOrder> timeOutList);
 }
@@ -89,6 +89,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         order.setGarOrderScanHandlerFlag(GlobalStatus.GarOrderStatus.SCAN_HANDLER_NO.getValue());
         // 预估车辆等于用户选择得车辆
         order.setGarRealCarCount(dto.getGarCarInfoList().stream().mapToInt(OrderDto.CarInfo::getGarOrderCarNumber).sum());
+        order.setGarTimeOutFlag(GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
         save(order);
         // 保存车辆信息
@@ -215,7 +216,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
                 qw.eq(GarOrder::getGarOrderUserId, userId)
                         .eq(GarOrder::getGarCancelFlag, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue())
-                        .eq(GarOrder::getGarOrderHandlerStatus, type);
+                        .eq(GarOrder::getGarOrderHandlerStatus, type)
+                        .orderByDesc(GarOrder::getGarCreateTime);
                 List<GarOrder> orderList = list(qw);
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
@@ -305,7 +307,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 完成订单
         GarOrder order = getById(dto.getGarOrderId());
         // TODO 发送短信  通知企业和用户 修改订单状态为完成 disposal 和 handler表的状态一起修改
-        String message = "您的清运订单已完成，可前往小程序进行评价，感谢您的使用";
+        String message = "您的清运订单已完成，可前往小程序进行评价，感谢您的使用。";
         smsUtils.sendMessage(order.getGarOrderContactTel(), message);
         smsUtils.sendMessage(order.getGarOrderCompanyTel(), "您的清运订单已完成，详情可在小程序查看。");
         successOrder(order);
@@ -590,6 +592,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
         List<Long> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
+        // 企业id为空说明没有公司
         List<GarOrder> orderList = baseMapper.queryCleanNumberByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
         List<GarOrderEvaluate> evaluateList = garOrderEvaluateService.queryEvaluateByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
         Map<String, List<GarOrderEvaluate>> evaluateMap = new HashMap<>();
@@ -833,9 +836,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 imageList.add(image);
             }
             garOrderImageService.saveBatch(imageList);
+            // TODO 删除验证码
+            redisCache.deleteObject(orderId, dto.getGarOrderHandlerId());
             return "当前趟次记录成功";
         }
-
         throw new BizException(ResultCode.CODE_400, "当前记录无效,已完成所有趟次！");
     }
@@ -950,6 +954,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return count;
     }
+    @Override
+    public List<GarOrder> queryUnprocessedOrder(Integer value, Integer orderTimeOutFlag, Integer value1) {
+        return baseMapper.queryUnprocessedOrder(value, orderTimeOutFlag, value1);
+    }
+
+    @Override
+    public void updateTimeOutOrderStatus(List<GarOrder> timeOutList) {
+        if (CollectionUtil.isNotEmpty(timeOutList)) {
+            baseMapper.updateTimeOutOrderStatus(timeOutList, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue(), GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_YES.getValue());
+        }
+    }
+
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
         Long cleanNumber = 0L;
         for (GarOrder order : orderList) {
@@ -8,6 +8,7 @@
         <id property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
         <result property="garOrderUserId" column="gar_order_user_id" jdbcType="VARCHAR"/>
         <result property="garOrderAddress" column="gar_order_address" jdbcType="VARCHAR"/>
+        <result property="garTimeOutFlag" column="gar_time_out_flag" jdbcType="TINYINT"/>
         <result property="garOrderAddressDetails" column="gar_order_address_details" jdbcType="VARCHAR"/>
         <result property="garOrderContactName" column="gar_order_contact_name" jdbcType="VARCHAR"/>
         <result property="garOrderTrashType" column="gar_order_trash_type" jdbcType="VARCHAR"/>
@@ -64,24 +65,30 @@
         gar_order_address,gar_order_address_details,gar_order_contact_name,
         gar_order_trash_type,gar_order_contact_tel,gar_order_company_id,
         gar_order_company_name,gar_order_company_tel,gar_order_handler_status,
-        gar_order_agreement_time,gar_create_time,gar_update_time,
+        gar_order_agreement_time,gar_create_time,gar_update_time,gar_time_out_flag,
         gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,
         gar_evaluate_flag,gar_handler_evaluate_flag,gar_order_scan_handler_flag,gar_coordinate,gar_longitude,gar_latitude,gar_real_car_count
     </sql>
+    <update id="updateTimeOutOrderStatus">
+        update gar_order set gar_order_handler_status = #{status},gar_time_out_flag = #{timeOutFlag}
+        where gar_order_id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.garOrderId}
+        </foreach>
+    </update>
     <select id="queryCleanNumberByEnterpriseIds" resultType="com.trash.garbage.pojo.domain.GarOrder">
+
+        <if test="list != null and list.size() > 0">
         select gar_order_company_id, count(gar_order_company_id) as count
         from gar_order
         where gar_order_handler_status = #{status}
-        <if test="list != null and list.size() > 0">
             and gar_order_company_id in
             <foreach collection="list" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
             group by gar_order_company_id
         </if>
-        <if test="list == null or list.size() == 0">
-            and 1 = 0
-        </if>
+
     </select>
     <select id="queryDriverOrderListByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
         SELECT
@@ -103,6 +110,7 @@
                 AND `handler`.gar_cancel_flag = #{cancelFlag}
             </if>
         </where>
+        order by desc `order`.gar_order_agreement_time
     </select>
     <select id="queryOrderByTelWithType" resultType="com.trash.garbage.pojo.vo.GarOrderDriverVo">
         SELECT
@@ -159,6 +167,7 @@
                 AND `disposal`.gar_order_disposal_status = #{type}
             </if>
         </where>
+        order by desc  `order`.gar_order_agreement_time
     </select>
     <select id="queryDriverDetailByTelWithOrderId" resultType="com.trash.garbage.pojo.vo.ScanDriverDetailVo">
         SELECT
@@ -207,4 +216,9 @@
                  LEFT JOIN gar_order_match_ask `ask` ON `ask`.gar_order_id = `order`.gar_order_id
         WHERE `order`.gar_order_id = #{orderId}
     </select>
+    <select id="queryUnprocessedOrder" resultType="com.trash.garbage.pojo.domain.GarOrder">
+        select *
+        from gar_order
+        where gar_order.gar_order_handler_status = #{orderType} and gar_order.gar_time_out_flag = #{timeOutFlag} and gar_order.gar_cancel_flag = #{cancelFlag}
+    </select>
 </mapper>