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

src/main/java/com/sqx/modules/chats/controller/ChatsController.java

@@ -41,31 +41,32 @@ public class ChatsController {
                           @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
                           @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
                           @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
+                          @ApiParam("是否已读（1已读 2 未读 3全部）") @DecryptParam(required = false) String read,
                           @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
-        return service.findAll(storeId, keyWord,type,starTime,endTime);
+        return service.findAll(storeId, keyWord,type,starTime,endTime,read);
     }
 
-    @GetMapping("/listRead")
-    @ApiOperation("商家端已读会话列表")
-    public Result findRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
-                           @ApiParam("用户类型") @DecryptParam(required = false) Long type,
-                           @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
-                           @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
-                           @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
-                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
-        return service.findRead(storeId, keyWord,type,starTime,endTime);
-    }
-
-    @GetMapping("/listUnRead")
-    @ApiOperation("商家端未读会话列表")
-    public Result findUnRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
-                             @ApiParam("用户类型") @DecryptParam(required = false) Long type,
-                             @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
-                             @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
-                             @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
-                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
-        return service.findUnRead(storeId, keyWord,type,starTime,endTime);
-    }
+//    @GetMapping("/listRead")
+//    @ApiOperation("商家端已读会话列表")
+//    public Result findRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
+//                           @ApiParam("用户类型") @DecryptParam(required = false) Long type,
+//                           @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
+//                           @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
+//                           @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
+//                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
+//        return service.findRead(storeId, keyWord,type,starTime,endTime);
+//    }
+//
+//    @GetMapping("/listUnRead")
+//    @ApiOperation("商家端未读会话列表")
+//    public Result findUnRead(@ApiParam("店铺id(总后台商户传0)") @DecryptParam Long storeId,
+//                             @ApiParam("用户类型") @DecryptParam(required = false) Long type,
+//                             @ApiParam("关键字") @DecryptParam(required = false) String keyWord,
+//                             @ApiParam("开始时间") @DecryptParam(required = false) String starTime,
+//                             @ApiParam("结束时间") @DecryptParam(required = false) String endTime,
+//                          @ApiParam("用户昵称") @DecryptParam(required = false) String userName) {
+//        return service.findUnRead(storeId, keyWord,type,starTime,endTime);
+//    }
 
     @GetMapping("/userList")
     @ApiOperation("用户端会话列表")

src/main/java/com/sqx/modules/chats/respository/ChatsMapper.java

@@ -85,7 +85,7 @@ public interface ChatsMapper extends BaseMapper<Chats> {
             " <if test='userName != null and userName != \"\" '>"+
             "and (tu.phone like '%${userName}%' or c.user_name like '%${userName}%') " +
             " </if>"+
-            "and store_id =#{storeId}  and (c.store_count ！=0 or c.store_count is null)" +
+            "and store_id =#{storeId}  and (c.store_count !=0 or c.store_count is null)" +
             "order by c.create_time desc" +
             "</script>"})
     List<Chats> findUnRead(Long storeId, String userName, Long type, String starTime, String endTime);

src/main/java/com/sqx/modules/chats/service/ChatsService.java

@@ -19,7 +19,7 @@ public interface ChatsService {
      * @param storeId
      * @return
      */
-    Result findAll(Long storeId, String userName,Long type,String starTime,String endTime);
+    Result findAll(Long storeId, String userName,Long type,String starTime,String endTime,String read);
     Result findRead(Long storeId, String userName,Long type,String starTime,String endTime);
     Result findUnRead(Long storeId, String userName,Long type,String starTime,String endTime);
 

src/main/java/com/sqx/modules/chats/service/ChatsServiceImpl.java

@@ -49,7 +49,7 @@ public class ChatsServiceImpl implements ChatsService {
      * @return
      */
     @Override
-    public Result findAll(Long storeId, String userName,Long type,String starTime,String endTime) {
+    public Result findAll(Long storeId, String userName,Long type,String starTime,String endTime,String read/*受否已读*/) {
         //构造自定义查询条件
 //        Specification<Chats> queryCondition = new Specification<Chats>() {
 //            @Override
@@ -71,7 +71,15 @@ public class ChatsServiceImpl implements ChatsService {
 //                return criteriaBuilder.and(predicateList.toArray(new Predicate[predicateList.size()]));
 //            }
 //        };
-        List<Chats> list = chatsMapper.findAll(storeId,userName,type,starTime,endTime);
+        List<Chats> list=new ArrayList<>();
+        if ("1".equals(read)){
+            list = chatsMapper.findRead(storeId,userName,type,starTime,endTime);
+        }else if("2".equals(read)){
+            list = chatsMapper.findUnRead(storeId,userName,type,starTime,endTime);
+        }else{
+            list = chatsMapper.findAll(storeId,userName,type,starTime,endTime);
+        }
+
         //最新一条消息展示
         List<ChatsContent> allContent = chatContentRepository.findAll();
         for (Chats c : list) {

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);
@@ -1461,6 +1465,11 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             TbCouponUser tbCouponUser = tbCouponUserDao.selectById(tbOrder.getCouponId());
             tbOrder.setCouponMoney(tbCouponUser.getMoney());
         }
+        GoodsShop goodsShop=goodsShopDao.selectById(tbOrder.getShopId());
+        if(goodsShop!=null){
+            tbOrder.setShopName(goodsShop.getShopName());
+            tbOrder.setShopPhone(goodsShop.getPhone());
+        }
         List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>().eq("order_id", tbOrder.getOrderId()));
         tbOrder.setOrderGoodsList(orderGoodsList);
         return Result.success().put("data", tbOrder);

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,13 +267,14 @@
 
     <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,
+        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
         left join tb_user tu on tor.user_id = tu.user_id
         left join tb_indent ti on tor.order_id = ti.order_id
         left join goods_shop gs on tor.shop_id = gs.shop_id
+        left join tb_user tu1 on ti.rider_user_id = tu1.user_id
         where tor.user_id = #{userId}
         and order_type = #{orderType}
         <if test="status!=null and status!=5">