Commit f5667b95e0ec38a2844f3d5ad3c8dc48ae389855
1 parent
364ad35913
Exists in
master
and in
6 other branches
bug
xiufu
Showing 1 changed file with 4 additions and 40 deletions
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
View file @
f5667b9
| ... | ... | @@ -152,17 +152,8 @@ |
| 152 | 152 | and a.create_date >= #{startDate} |
| 153 | 153 | </if> |
| 154 | 154 | <if test="endDate != null"> |
| 155 | - and a.create_date <![CDATA[ <= ]]> #{endDate} | |
| 155 | + and a.create_date <![CDATA[ < ]]> #{endDate} | |
| 156 | 156 | </if> |
| 157 | - <if test="provinceId != null and provinceId != ''"> | |
| 158 | - and d.province_id = #{provinceId} | |
| 159 | - </if> | |
| 160 | - <if test="cityId != null and cityId != '' "> | |
| 161 | - and d.city_id = #{cityId} | |
| 162 | - </if> | |
| 163 | - <if test="areaId != null and areaId != ''"> | |
| 164 | - and d.area_id = #{areaId} | |
| 165 | - </if> | |
| 166 | 157 | <if test="tempId != null and tempId != ''"> |
| 167 | 158 | and e.coupon_template_group_id = #{tempId} |
| 168 | 159 | </if> |
| 169 | 160 | |
| ... | ... | @@ -199,17 +190,8 @@ |
| 199 | 190 | and a.create_date >= #{startDate} |
| 200 | 191 | </if> |
| 201 | 192 | <if test="endDate != null"> |
| 202 | - and a.create_date <![CDATA[ <= ]]> #{endDate} | |
| 193 | + and a.create_date <![CDATA[ < ]]> #{endDate} | |
| 203 | 194 | </if> |
| 204 | - <if test="provinceId != null and provinceId != ''"> | |
| 205 | - and d.province_id = #{provinceId} | |
| 206 | - </if> | |
| 207 | - <if test="cityId != null and cityId != '' "> | |
| 208 | - and d.city_id = #{cityId} | |
| 209 | - </if> | |
| 210 | - <if test="areaId != null and areaId != ''"> | |
| 211 | - and d.area_id = #{areaId} | |
| 212 | - </if> | |
| 213 | 195 | <if test="tempId != null and tempId != ''"> |
| 214 | 196 | and e.coupon_template_group_id = #{tempId} |
| 215 | 197 | </if> |
| 216 | 198 | |
| ... | ... | @@ -289,17 +271,8 @@ |
| 289 | 271 | and a.create_date >= #{startDate} |
| 290 | 272 | </if> |
| 291 | 273 | <if test="endDate != null"> |
| 292 | - and a.create_date <![CDATA[ <= ]]> #{endDate} | |
| 274 | + and a.create_date <![CDATA[ < ]]> #{endDate} | |
| 293 | 275 | </if> |
| 294 | - <if test="provinceId != null and provinceId != ''"> | |
| 295 | - and e.province_id = #{provinceId} | |
| 296 | - </if> | |
| 297 | - <if test="cityId != null and cityId != '' "> | |
| 298 | - and e.city_id = #{cityId} | |
| 299 | - </if> | |
| 300 | - <if test="areaId != null and areaId != ''"> | |
| 301 | - and e.area_id = #{areaId} | |
| 302 | - </if> | |
| 303 | 276 | <if test="tempId != null and tempId != ''"> |
| 304 | 277 | and f.coupon_template_group_id = #{tempId} |
| 305 | 278 | </if> |
| ... | ... | @@ -319,16 +292,7 @@ |
| 319 | 292 | and a.create_date >= #{startDate} |
| 320 | 293 | </if> |
| 321 | 294 | <if test="endDate != null"> |
| 322 | - and a.create_date <![CDATA[ <= ]]> #{endDate} | |
| 323 | - </if> | |
| 324 | - <if test="provinceId != null and provinceId != ''"> | |
| 325 | - and e.province_id = #{provinceId} | |
| 326 | - </if> | |
| 327 | - <if test="cityId != null and cityId != '' "> | |
| 328 | - and e.city_id = #{cityId} | |
| 329 | - </if> | |
| 330 | - <if test="areaId != null and areaId != ''"> | |
| 331 | - and e.area_id = #{areaId} | |
| 295 | + and a.create_date <![CDATA[ < ]]> #{endDate} | |
| 332 | 296 | </if> |
| 333 | 297 | <if test="tempId != null and tempId != ''"> |
| 334 | 298 | and f.coupon_template_group_id = #{tempId} |