提交修改

hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java

@@ -6,6 +6,8 @@ import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
+import com.hai.common.utils.DateUtil;
+import com.hai.common.utils.IDGenerator;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighOrder;
 import com.hai.entity.OutRechargeOrder;
@@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 @Controller
 @RequestMapping(value = "/outRechargeOrder")
@@ -60,7 +63,7 @@ public class OutRechargeOrderController {
                 log.error("orderToPay error!");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
             }
-
+            String remarks = "";
             // 支付类型 1.微信支付
             outRechargeOrder.setPayType(1);
             // 判断充值模式：1 话费充值 2. 中石化 3. 中石油
@@ -68,8 +71,7 @@ public class OutRechargeOrderController {
                 JSONObject telObject = telApiService.outApiTel(outRechargeOrder.getRechargeContent());
                 JSONObject o = telObject.getObject("result",JSONObject.class);
                 // 拼接内容
-                String remarks = o.get("province").toString() +  o.get("company").toString();
-                outRechargeOrder.setRemarks(remarks);
+                remarks = o.get("province").toString() +  o.get("company").toString() + "充值" + outRechargeOrder.getOrderPrice() + "元";
             } else if (outRechargeOrder.getRechargeModel() == 2) {
                 // 中石油需要姓名和身份证号
                 if (StringUtils.isBlank(outRechargeOrder.getRechargeName()) ||
@@ -78,10 +80,19 @@ public class OutRechargeOrderController {
                     log.error("orderToPay error!");
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
                 }
+                remarks = "中石化充值" + outRechargeOrder.getOrderPrice() + "元";
+            } else if (outRechargeOrder.getRechargeModel() == 3) {
+                remarks = "中石油充值" + outRechargeOrder.getOrderPrice() + "元";
             }
-
-            return null;
-
+            outRechargeOrder.setRemarks(remarks);
+            outRechargeOrder.setOrderNo("CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5));
+            outRechargeOrder.setUserId(userInfoModel.getHighUser().getId());
+            outRechargeOrder.setUserName(userInfoModel.getHighUser().getName());
+            outRechargeOrder.setUserPhone(userInfoModel.getHighUser().getPhone());
+            outRechargeOrder.setCreateTimed(new Date());
+            outRechargeOrder.setStatus(1);
+            outRechargeOrderService.insertOrder(outRechargeOrder);
+            return ResponseMsgUtil.success(outRechargeOrder.getId());
 
 
         } catch (Exception e) {

hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java

@@ -266,7 +266,7 @@ public class OrderController {
             payMap.put("unified_order_url",SysConst.getSysConfig().getWxUnifiedOrderUrl());
             SortedMap<Object, Object> sortedMap = wechatPayUtil.goWechatPay(weChatPayReqInfo,payMap);
             return ResponseMsgUtil.success(sortedMap);
-/*
+/*1·
             Map<String,Object> param = new HashMap<>();
             param.put("appid", SysConst.getSysConfig().getWxMchAppId());
             param.put("mchid", SysConst.getSysConfig().getWxSubMchId());

hai-service/src/main/java/com/hai/dao/OutRechargePriceMapper.java

@@ -0,0 +1,97 @@
+package com.hai.dao;
+
+import com.hai.entity.OutRechargePrice;
+import com.hai.entity.OutRechargePriceExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 代码由工具生成,请勿修改!!!
+ * 如果需要扩展请在其父类进行扩展
+ * 
+ **/
+@Repository
+public interface OutRechargePriceMapper extends OutRechargePriceMapperExt {
+    @SelectProvider(type=OutRechargePriceSqlProvider.class, method="countByExample")
+    long countByExample(OutRechargePriceExample example);
+
+    @DeleteProvider(type=OutRechargePriceSqlProvider.class, method="deleteByExample")
+    int deleteByExample(OutRechargePriceExample example);
+
+    @Delete({
+        "delete from out_recharge_price",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int deleteByPrimaryKey(Long id);
+
+    @Insert({
+        "insert into out_recharge_price (`type`, price, ",
+        "real_price, create_time)",
+        "values (#{type,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, ",
+        "#{realPrice,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP})"
+    })
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insert(OutRechargePrice record);
+
+    @InsertProvider(type=OutRechargePriceSqlProvider.class, method="insertSelective")
+    @Options(useGeneratedKeys=true,keyProperty="id")
+    int insertSelective(OutRechargePrice record);
+
+    @SelectProvider(type=OutRechargePriceSqlProvider.class, method="selectByExample")
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
+        @Result(column="real_price", property="realPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP)
+    })
+    List<OutRechargePrice> selectByExample(OutRechargePriceExample example);
+
+    @Select({
+        "select",
+        "id, `type`, price, real_price, create_time",
+        "from out_recharge_price",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    @Results({
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
+        @Result(column="real_price", property="realPrice", jdbcType=JdbcType.DECIMAL),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP)
+    })
+    OutRechargePrice selectByPrimaryKey(Long id);
+
+    @UpdateProvider(type=OutRechargePriceSqlProvider.class, method="updateByExampleSelective")
+    int updateByExampleSelective(@Param("record") OutRechargePrice record, @Param("example") OutRechargePriceExample example);
+
+    @UpdateProvider(type=OutRechargePriceSqlProvider.class, method="updateByExample")
+    int updateByExample(@Param("record") OutRechargePrice record, @Param("example") OutRechargePriceExample example);
+
+    @UpdateProvider(type=OutRechargePriceSqlProvider.class, method="updateByPrimaryKeySelective")
+    int updateByPrimaryKeySelective(OutRechargePrice record);
+
+    @Update({
+        "update out_recharge_price",
+        "set `type` = #{type,jdbcType=INTEGER},",
+          "price = #{price,jdbcType=DECIMAL},",
+          "real_price = #{realPrice,jdbcType=DECIMAL},",
+          "create_time = #{createTime,jdbcType=TIMESTAMP}",
+        "where id = #{id,jdbcType=BIGINT}"
+    })
+    int updateByPrimaryKey(OutRechargePrice record);
+}

hai-service/src/main/java/com/hai/dao/OutRechargePriceMapperExt.java

@@ -0,0 +1,7 @@
+package com.hai.dao;
+
+/**
+ * mapper扩展类
+ */
+public interface OutRechargePriceMapperExt {
+}

hai-service/src/main/java/com/hai/dao/OutRechargePriceSqlProvider.java

@@ -0,0 +1,234 @@
+package com.hai.dao;
+
+import com.hai.entity.OutRechargePrice;
+import com.hai.entity.OutRechargePriceExample.Criteria;
+import com.hai.entity.OutRechargePriceExample.Criterion;
+import com.hai.entity.OutRechargePriceExample;
+import java.util.List;
+import java.util.Map;
+import org.apache.ibatis.jdbc.SQL;
+
+public class OutRechargePriceSqlProvider {
+
+    public String countByExample(OutRechargePriceExample example) {
+        SQL sql = new SQL();
+        sql.SELECT("count(*)").FROM("out_recharge_price");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String deleteByExample(OutRechargePriceExample example) {
+        SQL sql = new SQL();
+        sql.DELETE_FROM("out_recharge_price");
+        applyWhere(sql, example, false);
+        return sql.toString();
+    }
+
+    public String insertSelective(OutRechargePrice record) {
+        SQL sql = new SQL();
+        sql.INSERT_INTO("out_recharge_price");
+        
+        if (record.getType() != null) {
+            sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPrice() != null) {
+            sql.VALUES("price", "#{price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getRealPrice() != null) {
+            sql.VALUES("real_price", "#{realPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        return sql.toString();
+    }
+
+    public String selectByExample(OutRechargePriceExample example) {
+        SQL sql = new SQL();
+        if (example != null && example.isDistinct()) {
+            sql.SELECT_DISTINCT("id");
+        } else {
+            sql.SELECT("id");
+        }
+        sql.SELECT("`type`");
+        sql.SELECT("price");
+        sql.SELECT("real_price");
+        sql.SELECT("create_time");
+        sql.FROM("out_recharge_price");
+        applyWhere(sql, example, false);
+        
+        if (example != null && example.getOrderByClause() != null) {
+            sql.ORDER_BY(example.getOrderByClause());
+        }
+        
+        return sql.toString();
+    }
+
+    public String updateByExampleSelective(Map<String, Object> parameter) {
+        OutRechargePrice record = (OutRechargePrice) parameter.get("record");
+        OutRechargePriceExample example = (OutRechargePriceExample) parameter.get("example");
+        
+        SQL sql = new SQL();
+        sql.UPDATE("out_recharge_price");
+        
+        if (record.getId() != null) {
+            sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        }
+        
+        if (record.getType() != null) {
+            sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPrice() != null) {
+            sql.SET("price = #{record.price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getRealPrice() != null) {
+            sql.SET("real_price = #{record.realPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByExample(Map<String, Object> parameter) {
+        SQL sql = new SQL();
+        sql.UPDATE("out_recharge_price");
+        
+        sql.SET("id = #{record.id,jdbcType=BIGINT}");
+        sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        sql.SET("price = #{record.price,jdbcType=DECIMAL}");
+        sql.SET("real_price = #{record.realPrice,jdbcType=DECIMAL}");
+        sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
+        
+        OutRechargePriceExample example = (OutRechargePriceExample) parameter.get("example");
+        applyWhere(sql, example, true);
+        return sql.toString();
+    }
+
+    public String updateByPrimaryKeySelective(OutRechargePrice record) {
+        SQL sql = new SQL();
+        sql.UPDATE("out_recharge_price");
+        
+        if (record.getType() != null) {
+            sql.SET("`type` = #{type,jdbcType=INTEGER}");
+        }
+        
+        if (record.getPrice() != null) {
+            sql.SET("price = #{price,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getRealPrice() != null) {
+            sql.SET("real_price = #{realPrice,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getCreateTime() != null) {
+            sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
+        }
+        
+        sql.WHERE("id = #{id,jdbcType=BIGINT}");
+        
+        return sql.toString();
+    }
+
+    protected void applyWhere(SQL sql, OutRechargePriceExample example, boolean includeExamplePhrase) {
+        if (example == null) {
+            return;
+        }
+        
+        String parmPhrase1;
+        String parmPhrase1_th;
+        String parmPhrase2;
+        String parmPhrase2_th;
+        String parmPhrase3;
+        String parmPhrase3_th;
+        if (includeExamplePhrase) {
+            parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        } else {
+            parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
+            parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
+            parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
+            parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
+            parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
+            parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
+        }
+        
+        StringBuilder sb = new StringBuilder();
+        List<Criteria> oredCriteria = example.getOredCriteria();
+        boolean firstCriteria = true;
+        for (int i = 0; i < oredCriteria.size(); i++) {
+            Criteria criteria = oredCriteria.get(i);
+            if (criteria.isValid()) {
+                if (firstCriteria) {
+                    firstCriteria = false;
+                } else {
+                    sb.append(" or ");
+                }
+                
+                sb.append('(');
+                List<Criterion> criterions = criteria.getAllCriteria();
+                boolean firstCriterion = true;
+                for (int j = 0; j < criterions.size(); j++) {
+                    Criterion criterion = criterions.get(j);
+                    if (firstCriterion) {
+                        firstCriterion = false;
+                    } else {
+                        sb.append(" and ");
+                    }
+                    
+                    if (criterion.isNoValue()) {
+                        sb.append(criterion.getCondition());
+                    } else if (criterion.isSingleValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isBetweenValue()) {
+                        if (criterion.getTypeHandler() == null) {
+                            sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
+                        } else {
+                            sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
+                        }
+                    } else if (criterion.isListValue()) {
+                        sb.append(criterion.getCondition());
+                        sb.append(" (");
+                        List<?> listItems = (List<?>) criterion.getValue();
+                        boolean comma = false;
+                        for (int k = 0; k < listItems.size(); k++) {
+                            if (comma) {
+                                sb.append(", ");
+                            } else {
+                                comma = true;
+                            }
+                            if (criterion.getTypeHandler() == null) {
+                                sb.append(String.format(parmPhrase3, i, j, k));
+                            } else {
+                                sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
+                            }
+                        }
+                        sb.append(')');
+                    }
+                }
+                sb.append(')');
+            }
+        }
+        
+        if (sb.length() > 0) {
+            sql.WHERE(sb.toString());
+        }
+    }
+}

hai-service/src/main/java/com/hai/entity/OutRechargePrice.java

@@ -0,0 +1,129 @@
+package com.hai.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * out_recharge_price
+ * @author 
+ */
+/**
+ * 
+ * 代码由工具生成
+ * 
+ **/
+public class OutRechargePrice implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 1 话费充值 2. 中石化 3. 中石油
+     */
+    private Integer type;
+
+    /**
+     * 金额
+     */
+    private Long price;
+
+    /**
+     * 实际金额
+     */
+    private Long realPrice;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Long getPrice() {
+        return price;
+    }
+
+    public void setPrice(Long price) {
+        this.price = price;
+    }
+
+    public Long getRealPrice() {
+        return realPrice;
+    }
+
+    public void setRealPrice(Long realPrice) {
+        this.realPrice = realPrice;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        OutRechargePrice other = (OutRechargePrice) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
+            && (this.getRealPrice() == null ? other.getRealPrice() == null : this.getRealPrice().equals(other.getRealPrice()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode());
+        result = prime * result + ((getRealPrice() == null) ? 0 : getRealPrice().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().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(", type=").append(type);
+        sb.append(", price=").append(price);
+        sb.append(", realPrice=").append(realPrice);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

hai-service/src/main/java/com/hai/entity/OutRechargePriceExample.java

@@ -0,0 +1,523 @@
+package com.hai.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OutRechargePriceExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    private Integer limit;
+
+    private Long offset;
+
+    public OutRechargePriceExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> 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<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> 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 andTypeIsNull() {
+            addCriterion("`type` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("`type` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Integer value) {
+            addCriterion("`type` =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Integer value) {
+            addCriterion("`type` <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Integer value) {
+            addCriterion("`type` >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`type` >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Integer value) {
+            addCriterion("`type` <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("`type` <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Integer> values) {
+            addCriterion("`type` in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Integer> values) {
+            addCriterion("`type` not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Integer value1, Integer value2) {
+            addCriterion("`type` between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("`type` not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIsNull() {
+            addCriterion("price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIsNotNull() {
+            addCriterion("price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceEqualTo(Long value) {
+            addCriterion("price =", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotEqualTo(Long value) {
+            addCriterion("price <>", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceGreaterThan(Long value) {
+            addCriterion("price >", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceGreaterThanOrEqualTo(Long value) {
+            addCriterion("price >=", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceLessThan(Long value) {
+            addCriterion("price <", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceLessThanOrEqualTo(Long value) {
+            addCriterion("price <=", value, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceIn(List<Long> values) {
+            addCriterion("price in", values, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotIn(List<Long> values) {
+            addCriterion("price not in", values, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceBetween(Long value1, Long value2) {
+            addCriterion("price between", value1, value2, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andPriceNotBetween(Long value1, Long value2) {
+            addCriterion("price not between", value1, value2, "price");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceIsNull() {
+            addCriterion("real_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceIsNotNull() {
+            addCriterion("real_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceEqualTo(Long value) {
+            addCriterion("real_price =", value, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceNotEqualTo(Long value) {
+            addCriterion("real_price <>", value, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceGreaterThan(Long value) {
+            addCriterion("real_price >", value, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceGreaterThanOrEqualTo(Long value) {
+            addCriterion("real_price >=", value, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceLessThan(Long value) {
+            addCriterion("real_price <", value, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceLessThanOrEqualTo(Long value) {
+            addCriterion("real_price <=", value, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceIn(List<Long> values) {
+            addCriterion("real_price in", values, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceNotIn(List<Long> values) {
+            addCriterion("real_price not in", values, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceBetween(Long value1, Long value2) {
+            addCriterion("real_price between", value1, value2, "realPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andRealPriceNotBetween(Long value1, Long value2) {
+            addCriterion("real_price not between", value1, value2, "realPrice");
+            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<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> 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 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);
+        }
+    }
+}

hai-service/src/main/java/com/hai/service/TelApiService.java

@@ -62,6 +62,13 @@ public interface TelApiService {
     String telApiNotify(Map<String, String> paramsMap) throws Exception;
 
 
+    /**
+     * @Author Sum1Dream
+     * @Description //电话查询接口 Administrator
+     * @Date 7:38 2021/6/12
+     * @Param [tel]
+     * @return com.alibaba.fastjson.JSONObject
+     **/
     JSONObject outApiTel(String tel);