修改站点添加编辑接口，更新订单中心接口

src/main/java/com/sqx/modules/order/controller/OrderController.java

@@ -47,8 +47,8 @@ public class OrderController extends AbstractController {
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
                                       String orderNumber, String indentStatus, String reservationFlag,
                                       @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType,
-                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime) {
-        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime, endTime, payStartTime, payEndTime);
+                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId) {
+        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime, endTime, payStartTime, payEndTime,riderStationId);
     }
 
 //    @GetMapping("excelOrder")

src/main/java/com/sqx/modules/order/dao/AppOrderDao.java

@@ -29,7 +29,7 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
     IPage<TbOrder> selectAllOrderAdmin(Page<TbOrder> pages,@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                @Param("userName") String userName, @Param("orderNumber") String orderNumber,@Param("orderType") Integer orderType,
                                        @Param("shopName")String shopName,@Param("riderPhone") String riderPhone, @Param("indentStatus") String indentStatus, @Param("reservationFlag") String reservationFlag,
-                                       @Param("startTime") String startTime,@Param("endTime") String endTime, @Param("payStartTime") String payStartTime, @Param("payEndTime") String payEndTime);
+                                       @Param("startTime") String startTime,@Param("endTime") String endTime, @Param("payStartTime") String payStartTime, @Param("payEndTime") String payEndTime,@Param("riderStationId") Integer riderStationId);
     @DataSource("dynamic")
     List<TbOrder> excelAllOrderAdmin(@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                        @Param("userName") String userName, @Param("orderNumber") String orderNumber,

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

@@ -274,5 +274,14 @@ public class TbOrder implements Serializable {
     @ApiModelProperty("导出商品总价")
     private Double sumPrice;
 
+    @TableField(exist = false)
+    @ApiModelProperty("站点id")
+    private Integer riderStationId;
+
+    @TableField(exist = false)
+    @ApiModelProperty("站点名称")
+    private String stationName;
+
+
     public TbOrder() {}
 }

src/main/java/com/sqx/modules/order/service/AppOrderService.java

@@ -32,7 +32,7 @@ public interface AppOrderService extends IService<TbOrder> {
     Result selectAllOrder(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName, String orderNumber, Integer orderType,String shopName);
 
     Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
-                               String orderNumber, Integer orderType,String shopName,String riderPhone, String indentStatus, String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime);
+                               String orderNumber, Integer orderType,String shopName,String riderPhone, String indentStatus, String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId);
 
     ExcelData excelAllOrderAdmin(Integer status, String phone, Long shopId,
                                  String userName, String orderNumber, Integer orderType, String shopName,

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

@@ -1284,10 +1284,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
                                       String orderNumber, Integer orderType, String shopName, String riderPhone, String indentStatus,
-                                      String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime) {
+                                      String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId) {
         Page<TbOrder> pages = new Page<>(page, limit);
         IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, status, phone, shopId, userName, orderNumber,
-                orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime,endTime, payStartTime, payEndTime);
+                orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime,endTime, payStartTime, payEndTime,riderStationId);
         for (int i = 0; i < tbOrderIPage.getRecords().size(); i++) {
             List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
                     .eq("order_id", tbOrderIPage.getRecords().get(i).getOrderId()));

src/main/java/com/sqx/modules/riderStation/controller/AdminRiderStationController.java

@@ -20,8 +20,7 @@ public class AdminRiderStationController {
     @ApiOperation("添加站点")
     @PostMapping(value = "/saveStation")
     public Result saveStation(@RequestBody RiderStation riderStation){
-        riderStationService.save(riderStation);
-        return Result.success();
+        return riderStationService.saveStation(riderStation);
     }
 
     @ApiOperation("查询站点")
@@ -33,8 +32,7 @@ public class AdminRiderStationController {
     @ApiOperation("修改站点")
     @PostMapping(value = "/updateStation")
     public Result updateStation(@RequestBody RiderStation riderStation){
-        riderStationService.updateById(riderStation);
-        return Result.success();
+        return riderStationService.updateStation(riderStation);
     }
 
     @ApiOperation("删除站点")
@@ -54,6 +52,7 @@ public class AdminRiderStationController {
     @ApiOperation("骑手所在站点")
     @GetMapping(value = "/getRiderStationName")
     public Result getRiderStationName(Integer userId){
+        System.out.println("userId = " + userId);
         return riderStationService.getRiderStationName(userId);
     }
 }

src/main/java/com/sqx/modules/riderStation/service/RiderStationService.java

@@ -7,9 +7,14 @@ import com.sqx.modules.riderStation.entity.RiderStation;
 import com.sqx.modules.shop.entity.SearchHistory;
 
 public interface RiderStationService extends IService<RiderStation> {
+
+    Result saveStation(RiderStation riderStation);
+
     Result selectStationList(Integer page, Integer size);
 
     Result stationList();
 
     Result getRiderStationName(Integer userId);
+
+    Result updateStation(RiderStation riderStation);
 }

src/main/java/com/sqx/modules/riderStation/service/impl/RiderStationServiceImpl.java

@@ -1,5 +1,7 @@
 package com.sqx.modules.riderStation.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.api.R;
@@ -24,6 +26,19 @@ public class RiderStationServiceImpl extends ServiceImpl<RiderStationDao, RiderS
     private UserDao userDao;
 
     @Override
+    public Result saveStation(RiderStation riderStation) {
+        String stationName = riderStation.getStationName();
+        LambdaQueryWrapper<RiderStation> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(RiderStation::getStationName,stationName);
+        RiderStation station = this.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(station)) {
+            return Result.error("该站点已存在");
+        }
+        this.save(riderStation);
+        return Result.success();
+    }
+
+    @Override
     public Result selectStationList(Integer page, Integer size) {
         IPage<RiderStation> riderStationIPage = this.page(new Page<RiderStation>(page, size));
         PageUtils pageUtils = new PageUtils(riderStationIPage);
@@ -49,4 +64,24 @@ public class RiderStationServiceImpl extends ServiceImpl<RiderStationDao, RiderS
         return Result.success().put("data",riderStation);
     }
 
+    @Override
+    public Result updateStation(RiderStation riderStation) {
+        Long id = riderStation.getId();
+        String stationName = riderStation.getStationName();
+
+        LambdaQueryWrapper<RiderStation> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(RiderStation::getStationName,stationName);
+        RiderStation station = this.getOne(wrapper);
+
+        if (ObjectUtils.isNotEmpty(station)) {
+            Long id1 = station.getId();
+            if (!id.equals(id1)) {
+                return Result.error("所修改的站点已存在");
+            }
+        }
+        this.updateById(riderStation);
+
+        return Result.success();
+    }
+
 }

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

@@ -86,7 +86,7 @@
         shopPhone,
         tiu.user_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
         ti.rider_user_id as riderUserId, tcu.money as couponMoney,
-        apr.discount_amount as activityDiscountAmount, ai.title activityTitle
+        apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,rs.station_name as stationName
         from tb_order tor
         left join tb_user tu on tor.user_id = tu.user_id
         left join goods_shop gs on tor.shop_id = gs.shop_id
@@ -95,6 +95,7 @@
         left join tb_coupon_user tcu on tor.coupon_id = tcu.id
         left join activity_part_record apr on apr.order_id = tor.order_id
         left join activity ai on ai.id = apr.activity_id
+        left join rider_station rs on tiu.rider_station_id = rs.id
         where 1 = 1
         <if test="riderPhone!=null and riderPhone!=''">
             and tiu.phone =#{riderPhone}
@@ -141,6 +142,9 @@
         <if test="payEndTime != null and payEndTime != '' ">
             and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{payEndTime},'%Y-%m-%d')
         </if>
+        <if test="riderStationId!=null and riderStationId!=''">
+            and tiu.rider_station_id=#{riderStationId}
+        </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>