Browse Source

yuyue

release_toaliyun_real
xhxu 2 years ago
parent
commit
3039458775
2 changed files with 10 additions and 5 deletions
  1. +5
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java
  2. +5
    -3
      mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml

+ 5
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java View File

@@ -30,7 +30,7 @@ public class WxCouponOrderReservationController extends BaseController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", 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(); if (reservation == null) reservation = new WxCouponOrderReservation();
reservation.updateTenantInfo(getTenantInfo()); reservation.updateTenantInfo(getTenantInfo());
reservation.setReservationMerchantId(getLoginBUser().getMerchantId()); reservation.setReservationMerchantId(getLoginBUser().getMerchantId());
@@ -65,9 +65,12 @@ public class WxCouponOrderReservationController extends BaseController {
if(sortReservation == null){ if(sortReservation == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); 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_dispatch.getCode().equals(reservation.getStatus())){
if(!EnumCouponOrderReservationStatus.reservation.getCode().equals(sortReservation.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())){ if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){


+ 5
- 3
mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml View File

@@ -38,6 +38,7 @@
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`coupon_order_id`,`coupon_id`,`coupon_title`, `id`,`tenant_id`,`parent_tenant_id`,`coupon_order_id`,`coupon_id`,`coupon_title`,
`c_user_id`,`user_name`,`user_phone`,`user_region`,`user_address`, `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`, `start_date`,`end_date`,`describe_str`,`describe_img`,`status`,`remark`,
`btenant_id`,`merchant_id`,`buser_id`,`buser_name`,`buser_phone`,`finish_time`, `btenant_id`,`merchant_id`,`buser_id`,`buser_name`,`buser_phone`,`finish_time`,
`create_date`,`update_date` `create_date`,`update_date`
@@ -138,7 +139,8 @@




<select id="findUserReservation" parameterType="com.iformall.domain.po.WxCouponOrderReservation" resultMap="BaseResultMap"> <select id="findUserReservation" parameterType="com.iformall.domain.po.WxCouponOrderReservation" resultMap="BaseResultMap">
select `id`,`tenant_id`,`parent_tenant_id`,`start_date`,`end_date`,`status`
select `id`,`tenant_id`,`parent_tenant_id`,
`reservation_merchant_id`,`reservation_merchant_name`,`start_date`,`end_date`,`status`
from wx_coupon_order_reservation from wx_coupon_order_reservation
where is_del = 0 where is_del = 0
and `tenant_id` = #{tenantId} and `tenant_id` = #{tenantId}
@@ -154,13 +156,13 @@
</select> </select>


<select id="getSortById" parameterType="java.util.HashMap" resultMap="BaseResultMap"> <select id="getSortById" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select `id`,`tenant_id`,`parent_tenant_id`,`status`
select `id`,`tenant_id`,`parent_tenant_id`,`reservation_merchant_id`,`status`
from wx_coupon_order_reservation from wx_coupon_order_reservation
where `id` = #{id} and tenant_id=#{tenantId} where `id` = #{id} and tenant_id=#{tenantId}
</select> </select>


<select id="getSortByCouponOrder" parameterType="java.util.HashMap" resultMap="BaseResultMap"> <select id="getSortByCouponOrder" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select `id`,`tenant_id`,`parent_tenant_id`,`status`
select `id`,`tenant_id`,`parent_tenant_id`,`reservation_merchant_id`,`status`
from wx_coupon_order_reservation from wx_coupon_order_reservation
where `coupon_order_id` = #{couponOrderId} and tenant_id=#{tenantId} where `coupon_order_id` = #{couponOrderId} and tenant_id=#{tenantId}
</select> </select>


Loading…
Cancel
Save