bugfix 陪诊员需求大厅增加城市筛选

pz-accompany/src/main/java/com/pz/accompany/AccompanyController.java

@@ -54,8 +54,8 @@ public class AccompanyController extends BaseController {
      * @return 未分配陪诊员的业务订单
      * @return 未分配陪诊员的业务订单
      */
      */
     @GetMapping("/demands")
     @GetMapping("/demands")
-    public TableDataInfo<AccompanyDemandVo> demandSquareList(PageQuery page) {
-        return totalOrderService.queryUndistributedOrder(page);
+    public TableDataInfo<AccompanyDemandVo> demandSquareList(@RequestHeader("city_id") Integer cityCode, PageQuery page) {
+        return totalOrderService.queryUndistributedOrder(cityCode, page);
     }
     }
 
 
     /**
     /**
@@ -66,7 +66,7 @@ public class AccompanyController extends BaseController {
      */
      */
     @GetMapping("/orderComment")
     @GetMapping("/orderComment")
     public TableDataInfo<AccompanyDemandVo> orderCommentList(@NotNull(message = "陪诊员ID不能为空") Integer emId, PageQuery page) {
     public TableDataInfo<AccompanyDemandVo> orderCommentList(@NotNull(message = "陪诊员ID不能为空") Integer emId, PageQuery page) {
-        return totalOrderService.queryOrderComment(emId,page);
+        return totalOrderService.queryOrderComment(emId, page);
     }
     }
 
 
     /**
     /**

pz-system/src/main/java/com/pz/system/service/ITotalOrderService.java

@@ -113,7 +113,7 @@ public interface ITotalOrderService {
      *
      *
      * @return 待分配陪诊员订单
      * @return 待分配陪诊员订单
      */
      */
-    TableDataInfo<AccompanyDemandVo> queryUndistributedOrder(PageQuery page);
+    TableDataInfo<AccompanyDemandVo> queryUndistributedOrder(Integer cityCode, PageQuery page);
 
 
     /**
     /**
      * 陪诊员端 评价
      * 陪诊员端 评价

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -587,7 +587,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             return this.refundOrder(totalOrderBo);
             return this.refundOrder(totalOrderBo);
         }
         }
 
 
-        //用户未付款 陪诊员为接单 和 用户未付款陪诊员已接单直接取消
+        // 用户未付款 陪诊员为接单 和 用户未付款陪诊员已接单直接取消
         if ((sonOrderSimpleDataByTotalId.getOrderStatus() == 0 && totalOrder.getStatus() == 0) || (sonOrderSimpleDataByTotalId.getOrderStatus() == 1 && totalOrder.getStatus() == 0)) {
         if ((sonOrderSimpleDataByTotalId.getOrderStatus() == 0 && totalOrder.getStatus() == 0) || (sonOrderSimpleDataByTotalId.getOrderStatus() == 1 && totalOrder.getStatus() == 0)) {
             // yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId,totalOrder));
             // yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId,totalOrder));
             totalOrder.setStatus(TotalOrderStatus.CANCEL.getCode());
             totalOrder.setStatus(TotalOrderStatus.CANCEL.getCode());
@@ -728,7 +728,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         // 修改子订单状态
         // 修改子订单状态
         boolean sonOrderFlag = orderService.switchSonOrderStatus(totalOrder.getId(), CommonOrderStatus.REFUND.getCode());
         boolean sonOrderFlag = orderService.switchSonOrderStatus(totalOrder.getId(), CommonOrderStatus.REFUND.getCode());
 
 
-        //除了商城订单和诊前挂号不需要给陪诊员和商户分成
+        // 除了商城订单和诊前挂号不需要给陪诊员和商户分成
         if (totalOrder.getBusinessId() != 0 && totalOrder.getBusinessId() != 6 && totalOrder.getStatus() == 2) {
         if (totalOrder.getBusinessId() != 0 && totalOrder.getBusinessId() != 6 && totalOrder.getStatus() == 2) {
             Services services = servicesMapper.selectById(totalOrder.getServiceId());
             Services services = servicesMapper.selectById(totalOrder.getServiceId());
             if (services.getFenmo() != 0) {
             if (services.getFenmo() != 0) {
@@ -911,12 +911,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
      * @return 待分配陪诊员订单
      * @return 待分配陪诊员订单
      */
      */
     @Override
     @Override
-    public TableDataInfo<AccompanyDemandVo> queryUndistributedOrder(PageQuery page) {
+    public TableDataInfo<AccompanyDemandVo> queryUndistributedOrder(Integer cityCode, PageQuery page) {
         QueryWrapper<TotalOrder> wrapper = Wrappers.query();
         QueryWrapper<TotalOrder> wrapper = Wrappers.query();
         // 筛选未分配订单
         // 筛选未分配订单
         wrapper.apply("total_order.em_id = 0")  // 未分配陪诊员订单
         wrapper.apply("total_order.em_id = 0")  // 未分配陪诊员订单
             .in("total_order.status", 0, 1) // 待支付、已支付
             .in("total_order.status", 0, 1) // 待支付、已支付
             .between("total_order.business_id", 1, 5)
             .between("total_order.business_id", 1, 5)
+            .eq(cityCode != null, "total_order.city_id", cityCode)  // 筛选城市
             .orderByDesc("total_order.id");
             .orderByDesc("total_order.id");
         IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
         IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
         // 装载子订单信息
         // 装载子订单信息