diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index b3330974a..709b1ce76 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -30,7 +30,7 @@ public class WxCouponOrderReservationController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxCouponOrderReservation reservation, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxCouponOrderReservation reservation, Integer pageNum, Integer pageSize) { if (reservation == null) reservation = new WxCouponOrderReservation(); reservation.updateTenantInfo(getTenantInfo()); reservation.setReservationMerchantId(getLoginBUser().getMerchantId()); @@ -65,9 +65,12 @@ public class WxCouponOrderReservationController extends BaseController { if(sortReservation == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); } + if(!getLoginBUser().getMerchantId().equals(sortReservation.getReservationMerchantId())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"查询数据门店不匹配"); + } if(EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(reservation.getStatus())){ if(!EnumCouponOrderReservationStatus.reservation.getCode().equals(sortReservation.getStatus())){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持派单"); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持确认"); } } if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml index f674f51b5..6a419b1b7 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml @@ -38,6 +38,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`coupon_order_id`,`coupon_id`,`coupon_title`, `c_user_id`,`user_name`,`user_phone`,`user_region`,`user_address`, + `reservation_merchant_id`,`reservation_merchant_name`, `start_date`,`end_date`,`describe_str`,`describe_img`,`status`,`remark`, `btenant_id`,`merchant_id`,`buser_id`,`buser_name`,`buser_phone`,`finish_time`, `create_date`,`update_date` @@ -138,7 +139,8 @@