提交新测试环境配置，区分订单状态待骑手接单

src/main/java/com/sqx/modules/order/entity/TbOrder.java

@@ -97,7 +97,7 @@ public class TbOrder implements Serializable {
     @ApiModelProperty("跑腿费达到商家满减要求 商家承担配送费")
     private String errandMoneyIsShop;
 
-    @ApiModelProperty("订单状态 0待结算 1待支付 2直接购买（未支付） 7商家待接单 8商家拒绝接单 6制作中  3待取餐/派送中 4已完成 5已取消")
+    @ApiModelProperty("订单状态 0待结算 1待支付 2直接购买（未支付） 7商家待接单 8商家拒绝接单 6制作中  3待取餐/派送中 4已完成 5已取消 13外卖待接单")
     private Integer status;
 
 

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1441,6 +1441,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
                     .eq("order_id", records.get(i).getOrderId()));
             tbOrderIPage.getRecords().get(i).setOrderGoodsList(orderGoodsList);
+            //判断骑手是否接单 status13为待骑手接单
+            if(records.get(i).getOrderTypeExtra()==2&&"2".equals(records.get(i).getIndentState())){
+                tbOrderIPage.getRecords().get(i).setStatus(13);
+            }
         }
         PageUtils pageUtils = new PageUtils(tbOrderIPage);
         return Result.success().put("data", pageUtils);

src/main/resources/application-dev.yml

@@ -3,10 +3,10 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://103.131.169.54:33007/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
+            url: jdbc:mysql://172.16.20.108:3306/tcwm2.5?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT
             username: root
-            password: chuanghai_2024.
-            initial-size: 10
+            password: chuanghai@2024
+            initial-size: 
             max-active: 100
             min-idle: 10
             max-wait: 60000
@@ -33,9 +33,9 @@ spring:
                     config:
                         multi-statement-allow: true
     redis:
-        host: 103.131.169.54
+        host: 172.16.20.108
         port: 6379
-        password: dev@redis@1234
+        password: chuanghai_2024.
         database: 3
         timeout: 5000
         lettuce:

src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
     allow-circular-references: true
   # 环境 dev|test|prod
   profiles:
-    active: prod
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8

src/main/resources/mapper/order/OrderMapper.xml

@@ -267,7 +267,7 @@
 
     <select id="waitTakeFood" resultType="com.sqx.modules.order.entity.TbOrder">
         select tor.*, tu.avatar as avatar, ti.rider_user_id as riderUserId, gs.shop_name as shopName, gs.shop_cover as
-        shopCover, gs.detailed_address as detailedAddress,tu1.phone as riderPhone,gs.phone as shopPhone,
+        shopCover, gs.detailed_address as detailedAddress,tu1.phone as riderPhone,gs.phone as shopPhone,ti.indent_state as indentState,
         (select count(*) from tb_order where order_type = 1 and status in (6, 3) and pay_time &lt; tor.pay_time
         and shop_id = tor.shop_id) as countOrder
         from tb_order tor