双十一活动

mec-biz/src/main/java/com/ym/mec/biz/dal/page/DoubleEleven2021QueryInfo.java

@@ -20,28 +20,8 @@ public class DoubleEleven2021QueryInfo extends QueryInfo {
 
     private Date endTime;
 
-    private String giveMemberStartTime;
-
-    private String giveMemberEndTime;
-
     private Boolean giveMemberFlag;
 
-    public String getGiveMemberStartTime() {
-        return giveMemberStartTime;
-    }
-
-    public void setGiveMemberStartTime(String giveMemberStartTime) {
-        this.giveMemberStartTime = giveMemberStartTime;
-    }
-
-    public String getGiveMemberEndTime() {
-        return giveMemberEndTime;
-    }
-
-    public void setGiveMemberEndTime(String giveMemberEndTime) {
-        this.giveMemberEndTime = giveMemberEndTime;
-    }
-
     public String getOrganId() {
         return organId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupActivityServiceImpl.java

@@ -367,10 +367,6 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 
 	@Override
 	public PageInfo<DoubleEleven2021OrderDetailDto> doubleEleven2021OrderDetail(DoubleEleven2021QueryInfo queryInfo) {
-		String startTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_start_time");
-		String endTime = sysConfigDao.findConfigValue("2021_double_eleven_give_member_end_time");
-		queryInfo.setGiveMemberStartTime(startTime);
-		queryInfo.setGiveMemberEndTime(endTime);
 		PageInfo<DoubleEleven2021OrderDetailDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -410,16 +410,16 @@
 		<if test="startTime != null">
 			AND spo.pay_time_ >= #{startTime}
 		</if>
-		<if test="emdTime != null">
+		<if test="endTime != null">
 			AND spo.pay_time_ &lt;= #{endTime}
 		</if>
 		<if test="type != null">
 			AND FIND_IN_SET(#{type},spo.activity_id_)
 		</if>
-		<if test="giveMemberFlag != null and giveMemberFlag == 'true'">
+		<if test="giveMemberFlag != null and giveMemberFlag == 1">
 			AND cto.id_ IS NOT NULL
 		</if>
-		<if test="giveMemberFlag != null and giveMemberFlag == 'false'">
+		<if test="giveMemberFlag != null and giveMemberFlag == 0">
 			AND cto.id_ IS NULL
 		</if>
 	</sql>