diff --git a/mls-bmb/src/main/java/com/mls/bmb/activity/mapper/BusClubActivityMapper.java b/mls-bmb/src/main/java/com/mls/bmb/activity/mapper/BusClubActivityMapper.java index e0cdb98..07ac70a 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/activity/mapper/BusClubActivityMapper.java +++ b/mls-bmb/src/main/java/com/mls/bmb/activity/mapper/BusClubActivityMapper.java @@ -1,6 +1,7 @@ package com.mls.bmb.activity.mapper; import com.mls.bmb.activity.domain.BusClubActivity; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -48,7 +49,7 @@ public interface BusClubActivityMapper * @param busClubActivity 条件 * @return 对象列表 */ - public List selectBusClubActivityByRegisterStart(BusClubActivity busClubActivity); + public List selectBusClubActivityByRegisterStart(@Param("clubId") String clubId); /** * diff --git a/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java b/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java index c326f82..ce2b39d 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java +++ b/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java @@ -150,7 +150,7 @@ public class BusClubActivityServiceImpl implements IBusClubActivityService public List selectBusClubActivityByRegisterStart(String clubId) { BusClubActivity activity = new BusClubActivity(); activity.setClubId(clubId); - List data = busClubActivityMapper.selectBusClubActivityByRegisterStart(activity); + List data = busClubActivityMapper.selectBusClubActivityByRegisterStart(clubId); return CollectionCopyUtils.copyList(data, ActivityBaseVO.class); } diff --git a/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderDetailServiceImpl.java b/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderDetailServiceImpl.java index 7885ae8..b050ec2 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderDetailServiceImpl.java +++ b/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderDetailServiceImpl.java @@ -80,6 +80,7 @@ public class BusOrderDetailServiceImpl implements IBusOrderDetailService ActivityRegisterDetailVO r =busActivityRegisterService.selectBusActivityRegisterBySerial(detail.getRegisterSerial()); detail.setNickname(r.getNickname()); detail.setRealname(r.getRealname()); + detail.setPhone(r.getPhone()); } return result; } diff --git a/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java b/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java index 4a33b0f..a0fce01 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java +++ b/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java @@ -35,6 +35,10 @@ public class OrderDetailVO extends BaseVO { @ApiModelProperty(value = "真实姓名") private String realname; + /** 电话号码 */ + @ApiModelProperty(value = "电话号码") + private String phone; + /** 活动id */ @ApiModelProperty(value = "活动id") private String activityId; @@ -63,6 +67,22 @@ public class OrderDetailVO extends BaseVO { @ApiModelProperty(value = "订单状态 0-订单提交成功,待支付 1-支付成功(或线下支付审核通过),活动待参加 2-订单超时未支付 3-订单已取消 4-线下支付等待审核 5-线下支付审核未通过 L-订单锁定 R-部分退款 F-全部退款 J-活动已参加") private String orderStatus; + public String getPayWay() { + return payWay; + } + + public void setPayWay(String payWay) { + this.payWay = payWay; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + public String getOrderId() { return orderId; } diff --git a/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml b/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml index 4382d32..ceac635 100644 --- a/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml +++ b/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml @@ -152,12 +152,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -267,7 +271,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sms_notify_time, sms_explain, sms_content, is_applet_notify, applet_notify_time, is_join, poster, is_register, a.is_open_team, a.is_recommend, a.check_status, publish_status, a.register_status, sign_status, a.record_status, created_tel, a.REVISION, a.CREATED_BY, a.CREATED_TIME, a.UPDATED_BY, a.UPDATED_TIME, - a.notes, c.club_name, c.is_verify, c.verify_type, CONCAT_WS("~",min(cost),max(cost)) range_price, r.total_register + a.notes, c.club_name, c.is_verify, c.verify_type,max(cost) range_price, r.total_register + from bus_club_activity a LEFT JOIN bus_club_info c on a.club_id = c.club_id and c.record_status = "1" LEFT JOIN bus_activity_cost p on a.activity_id = p.activity_id @@ -301,7 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sms_notify_time, sms_explain, sms_content, is_applet_notify, applet_notify_time, is_join, poster, is_register, a.is_open_team, a.is_recommend, a.check_status, publish_status, register_status, sign_status, a.record_status, created_tel, a.REVISION, a.CREATED_BY, a.CREATED_TIME, a.UPDATED_BY, a.UPDATED_TIME, - a.notes, c.club_name, c.is_verify, c.verify_type, CONCAT_WS("~",min(cost),max(cost)) range_price, r.total_register + a.notes, c.club_name, c.is_verify, c.verify_type,max(cost) range_price, r.total_register from bus_club_activity a LEFT JOIN bus_club_info c on a.club_id = c.club_id and c.record_status = "1" LEFT JOIN bus_activity_cost p on a.activity_id = p.activity_id @@ -338,7 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sms_notify_time, sms_explain, sms_content, is_applet_notify, applet_notify_time, is_join, poster, is_register, a.is_open_team, a.is_recommend, a.check_status, publish_status, register_status, sign_status, a.record_status, created_tel, a.REVISION, a.CREATED_BY, a.CREATED_TIME, a.UPDATED_BY, a.UPDATED_TIME, - a.notes, c.club_name, c.is_verify, c.verify_type, CONCAT_WS("~",min(cost),max(cost)) range_price, r.total_register + a.notes, c.club_name, c.is_verify, c.verify_type, max(cost) range_price, r.total_register from bus_club_activity a LEFT JOIN bus_club_info c on a.club_id = c.club_id and c.record_status = "1" LEFT JOIN bus_activity_cost p on a.activity_id = p.activity_id @@ -537,7 +542,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select a.activity_id, activity_name, activity_logo, cover_first_image, cover_small_image, cover_big_image, a.club_id, activity_content, activity_addr, lon_and_lat, addr_lon, addr_lat, start_register_time, end_register_time, start_time, end_time, is_free, is_help_register, is_limit_select, @@ -562,10 +569,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select activity_id,count(*) total_share from bus_activity_share group by activity_id ) s on a.activity_id = s.activity_id where --- a.activity_id in( --- select DISTINCT activity_id from bus_activity_sign where created_by=#{createdBy} --- ) --- and + a.publish_status = "1" and a.check_status = "1" and now() BETWEEN STR_TO_DATE(a.start_register_time, '%Y-%m-%d %H:%i') and STR_TO_DATE(a.end_register_time, '%Y-%m-%d %H:%i')