From fb7c28b255062e99e7ed0b05534fac11cd11c611 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 30 Jun 2023 23:21:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderCreateHandleServiceImpl.java | 6 ++++++ .../service/impl/HighDiscountAgentCodeServiceImpl.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java index 736fd74f..2c9a6ceb 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java @@ -217,6 +217,12 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, response.getString("msg")); } childOrder.setChannelOrderNo(response.getJSONObject("data").getString("rechargeOrderId")); + } else if (coupon.getCouponSource().equals(5)) { + // 重庆中石油业务状态 + SecConfig cqCnpcStatus = secConfigService.findByCodeType("CQ_CNPC_STATUS_" + coupon.getCouponKey()); + if (cqCnpcStatus != null && StringUtils.isNotBlank(cqCnpcStatus.getCodeValue())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, cqCnpcStatus.getCodeValue()); + } } // 校验优惠券是否可用 如果使用优惠券就只能使用卡券的原价 diff --git a/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java index ac863337..96342a80 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountAgentCodeServiceImpl.java @@ -78,6 +78,9 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe @Resource private RedisTemplate redisTemplate; + @Resource + private SecConfigService secConfigService; + @Override public void insertCodeList(List discountAgentCodeList) { highDiscountAgentCodeMapper.insertListCode(discountAgentCodeList); @@ -258,6 +261,11 @@ public class HighDiscountAgentCodeServiceImpl implements HighDiscountAgentCodeSe if (couponList.size() == 0) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "优惠券未配置重庆中石油卡券"); } + // 重庆中石油业务状态 + SecConfig cqCnpcStatus = secConfigService.findByCodeType("CQ_CNPC_STATUS_" + couponList.get(0).getHighCoupon().getCouponKey()); + if (cqCnpcStatus != null && StringUtils.isNotBlank(cqCnpcStatus.getCodeValue())) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, cqCnpcStatus.getCodeValue()); + } String tradeId = discountAgentCode.getId()+""+System.currentTimeMillis()+""; // 预发码 JSONObject preSendCoupon = ChongQingCNPCService.preSendCoupon(couponList.get(0).getHighCoupon().getCouponKey(), tradeId, 1, userModel.getHighUser().getPhone()); From cea4c347191a95058be2a529b38c9f97035b5779 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 4 Jul 2023 09:28:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hai/config/ThirdProductConfig.java | 2 +- .../java/com/hai/service/BsConfigService.java | 5 ++ .../service/BsPushScheduleTaskService.java | 62 +++++++++++++++++++ .../hai/service/impl/BsConfigServiceImpl.java | 51 +++++++++++++++ .../impl/BsPushScheduleTaskServiceImpl.java | 35 +++++++++++ 5 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 hai-service/src/main/java/com/hai/service/BsPushScheduleTaskService.java create mode 100644 hai-service/src/main/java/com/hai/service/impl/BsPushScheduleTaskServiceImpl.java diff --git a/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java b/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java index b8a4877a..c18df8b9 100644 --- a/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java +++ b/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java @@ -120,7 +120,7 @@ public class ThirdProductConfig { } else { object.put("productPayType" , bsConfigService.getProductPayTypeByMap(listMap)); } - + object.put("productPayTypeNew" , bsConfigService.getProductPayTypeNewByMap(listMap)); object.put("productPlatform" , bsConfigService.getProductPlatformByMap(listMap)); return object; diff --git a/hai-service/src/main/java/com/hai/service/BsConfigService.java b/hai-service/src/main/java/com/hai/service/BsConfigService.java index 5c97c2c5..af6f138c 100644 --- a/hai-service/src/main/java/com/hai/service/BsConfigService.java +++ b/hai-service/src/main/java/com/hai/service/BsConfigService.java @@ -1,9 +1,11 @@ package com.hai.service; +import com.alibaba.fastjson.JSONObject; import com.hai.entity.BsProductDiscount; import com.hai.entity.BsProductPayType; import com.hai.entity.BsProductPlatform; +import java.util.List; import java.util.Map; /** @@ -45,4 +47,7 @@ public interface BsConfigService { */ String getProductPayTypeByMap(Map map); + List getProductPayTypeNewByMap(Map map); + + } diff --git a/hai-service/src/main/java/com/hai/service/BsPushScheduleTaskService.java b/hai-service/src/main/java/com/hai/service/BsPushScheduleTaskService.java new file mode 100644 index 00000000..15b84b84 --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/BsPushScheduleTaskService.java @@ -0,0 +1,62 @@ +package com.hai.service; + +import com.hai.entity.BsMsg; +import com.hai.entity.BsPushScheduleTask; +import com.hai.entity.HighUser; + +import java.util.List; +import java.util.Map; + +/** + * @serviceName BsPushScheduleTaskService.java + * @author Sum1Dream + * @version 1.0.0 + * @Description // 定时发布任务功能 + * @createTime 15:41 2023/6/27 + **/ +public interface BsPushScheduleTaskService { + + + /** + * @Author Sum1Dream + * @Name insertPushScheduleTask + * @Description // 新增发布任务 + * @Date 18:06 2023/6/28 + * @Param [bsPushScheduleTask] + * @Return void + */ + void insertPushScheduleTask(BsPushScheduleTask bsPushScheduleTask); + + + /** + * @Author Sum1Dream + * @Name updatePushScheduleTask + * @Description // 更新发布任务 + * @Date 18:07 2023/6/28 + * @Param [bsPushScheduleTask5] + * @Return void + */ + void updatePushScheduleTask(BsPushScheduleTask bsPushScheduleTask5); + + /** + * @Author Sum1Dream + * @Name findPushScheduleTask + * @Description // 查询发布任务详情 + * @Date 18:07 2023/6/28 + * @Param [id] + * @Return com.hai.entity.BsMsg + */ + BsMsg findPushScheduleTask(Long id); + + + /** + * @Author Sum1Dream + * @Name getPushScheduleTaskByList + * @Description // 查询发布任务列表 + * @Date 18:07 2023/6/28 + * @Param [map] + * @Return java.util.List + */ + List getPushScheduleTaskByList(Map map); + +} diff --git a/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java index e4a1b3e7..45ed3f50 100644 --- a/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/BsConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.hai.service.impl; +import com.alibaba.fastjson.JSONObject; import com.hai.dao.BsProductDiscountMapper; import com.hai.dao.BsProductPayTypeMapper; import com.hai.dao.BsProductPlatformMapper; @@ -9,6 +10,7 @@ import org.apache.commons.collections4.MapUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -121,4 +123,53 @@ public class BsConfigServiceImpl implements BsConfigService { } } + + @Override + public List getProductPayTypeNewByMap(Map map) { + + try { + + BsProductPayTypeExample example = new BsProductPayTypeExample(); + BsProductPayTypeExample.Criteria criteria = example.createCriteria(); + + // 获取平台编码 + Integer platformId = MapUtils.getInteger(map , "platformId"); + if (MapUtils.getInteger(map , "productType") != null) { + criteria.andProductTypeEqualTo(MapUtils.getInteger(map , "productType")); + } + + if (MapUtils.getLong(map , "sourceId") != null) { + criteria.andSourceIdEqualTo(MapUtils.getLong(map , "sourceId")); + } + + List list = bsProductPayTypeMapper.selectByExample(example); + + List productPayTypes = new ArrayList<>(); + + // 1：支付宝 2：微信 3：汇联通工会卡 4：银联 5：银联分期 6 嗨森逛油卡 7:嗨森逛车队油卡 8：积分兑换 + for (BsProductPayType productPayType : list) { + // platformId 1：小程序 2：h5 3：银联 + if (platformId != null) { + if (platformId == 1 || platformId == 2) { + if (!(productPayType.getPayTypeId() == 4 || productPayType.getPayTypeId() == 5 )) { + productPayTypes.add(productPayType); + } + } else if (platformId == 3) { + if (productPayType.getPayTypeId() != 2) { + productPayTypes.add(productPayType); + } + } + } + + } + + + return productPayTypes; + } catch (Exception e) { + System.out.println(e); + return null; + } + + } + } diff --git a/hai-service/src/main/java/com/hai/service/impl/BsPushScheduleTaskServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsPushScheduleTaskServiceImpl.java new file mode 100644 index 00000000..a6150a4d --- /dev/null +++ b/hai-service/src/main/java/com/hai/service/impl/BsPushScheduleTaskServiceImpl.java @@ -0,0 +1,35 @@ +package com.hai.service.impl; + +import com.hai.entity.BsMsg; +import com.hai.entity.BsPushScheduleTask; +import com.hai.service.BsPushScheduleTaskService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@Service("bsPushScheduleTaskService") +public class BsPushScheduleTaskServiceImpl implements BsPushScheduleTaskService { + + + @Override + public void insertPushScheduleTask(BsPushScheduleTask bsPushScheduleTask) { + + } + + @Override + public void updatePushScheduleTask(BsPushScheduleTask bsPushScheduleTask5) { + + } + + @Override + public BsMsg findPushScheduleTask(Long id) { + return null; + } + + @Override + public List getPushScheduleTaskByList(Map map) { + return null; + } +} From 544f407cb0e7ceccfcc37e6eef4f5f22a12528c9 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 4 Jul 2023 10:05:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hai/entity/ApiStarbucksProductsExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hai-service/src/main/java/com/hai/entity/ApiStarbucksProductsExample.java b/hai-service/src/main/java/com/hai/entity/ApiStarbucksProductsExample.java index b521617b..b8bb1ebc 100644 --- a/hai-service/src/main/java/com/hai/entity/ApiStarbucksProductsExample.java +++ b/hai-service/src/main/java/com/hai/entity/ApiStarbucksProductsExample.java @@ -1921,4 +1921,4 @@ public class ApiStarbucksProductsExample { this(condition, value, secondValue, null); } } -} \ No newline at end of file +} From b20b5b5ebf895bb08258056704973bc7a8468c82 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 4 Jul 2023 10:05:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hai/entity/ApiIpAddress.java | 177 ++++ .../com/hai/entity/ApiIpAddressExample.java | 753 ++++++++++++++++++ 2 files changed, 930 insertions(+) create mode 100644 hai-service/src/main/java/com/hai/entity/ApiIpAddress.java create mode 100644 hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java diff --git a/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java b/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java new file mode 100644 index 00000000..bd733129 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/ApiIpAddress.java @@ -0,0 +1,177 @@ +package com.hai.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * api_ip_address + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class ApiIpAddress implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * ip地址 + */ + private String ipAddress; + + /** + * 商户号 + */ + private String mchId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * ext_1 + */ + private String ext1; + + /** + * ext_2 + */ + private String ext2; + + /** + * ext_3 + */ + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getIpAddress() { + return ipAddress; + } + + public void setIpAddress(String ipAddress) { + this.ipAddress = ipAddress; + } + + public String getMchId() { + return mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + ApiIpAddress other = (ApiIpAddress) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getIpAddress() == null ? other.getIpAddress() == null : this.getIpAddress().equals(other.getIpAddress())) + && (this.getMchId() == null ? other.getMchId() == null : this.getMchId().equals(other.getMchId())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getIpAddress() == null) ? 0 : getIpAddress().hashCode()); + result = prime * result + ((getMchId() == null) ? 0 : getMchId().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", ipAddress=").append(ipAddress); + sb.append(", mchId=").append(mchId); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} diff --git a/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java b/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java new file mode 100644 index 00000000..6e9a2b4d --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/ApiIpAddressExample.java @@ -0,0 +1,753 @@ +package com.hai.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ApiIpAddressExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public ApiIpAddressExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIpAddressIsNull() { + addCriterion("ip_address is null"); + return (Criteria) this; + } + + public Criteria andIpAddressIsNotNull() { + addCriterion("ip_address is not null"); + return (Criteria) this; + } + + public Criteria andIpAddressEqualTo(String value) { + addCriterion("ip_address =", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotEqualTo(String value) { + addCriterion("ip_address <>", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressGreaterThan(String value) { + addCriterion("ip_address >", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressGreaterThanOrEqualTo(String value) { + addCriterion("ip_address >=", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressLessThan(String value) { + addCriterion("ip_address <", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressLessThanOrEqualTo(String value) { + addCriterion("ip_address <=", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressLike(String value) { + addCriterion("ip_address like", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotLike(String value) { + addCriterion("ip_address not like", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressIn(List values) { + addCriterion("ip_address in", values, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotIn(List values) { + addCriterion("ip_address not in", values, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressBetween(String value1, String value2) { + addCriterion("ip_address between", value1, value2, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotBetween(String value1, String value2) { + addCriterion("ip_address not between", value1, value2, "ipAddress"); + return (Criteria) this; + } + + public Criteria andMchIdIsNull() { + addCriterion("mch_id is null"); + return (Criteria) this; + } + + public Criteria andMchIdIsNotNull() { + addCriterion("mch_id is not null"); + return (Criteria) this; + } + + public Criteria andMchIdEqualTo(String value) { + addCriterion("mch_id =", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdNotEqualTo(String value) { + addCriterion("mch_id <>", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdGreaterThan(String value) { + addCriterion("mch_id >", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdGreaterThanOrEqualTo(String value) { + addCriterion("mch_id >=", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdLessThan(String value) { + addCriterion("mch_id <", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdLessThanOrEqualTo(String value) { + addCriterion("mch_id <=", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdLike(String value) { + addCriterion("mch_id like", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdNotLike(String value) { + addCriterion("mch_id not like", value, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdIn(List values) { + addCriterion("mch_id in", values, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdNotIn(List values) { + addCriterion("mch_id not in", values, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdBetween(String value1, String value2) { + addCriterion("mch_id between", value1, value2, "mchId"); + return (Criteria) this; + } + + public Criteria andMchIdNotBetween(String value1, String value2) { + addCriterion("mch_id not between", value1, value2, "mchId"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +}