diff --git a/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordMapper.java new file mode 100644 index 0000000..63b4a41 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordMapper.java @@ -0,0 +1,122 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsOrderAfterSalesAddressRecord; +import com.hfkj.entity.BsOrderAfterSalesAddressRecordExample; +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 BsOrderAfterSalesAddressRecordMapper extends BsOrderAfterSalesAddressRecordMapperExt { + @SelectProvider(type=BsOrderAfterSalesAddressRecordSqlProvider.class, method="countByExample") + long countByExample(BsOrderAfterSalesAddressRecordExample example); + + @DeleteProvider(type=BsOrderAfterSalesAddressRecordSqlProvider.class, method="deleteByExample") + int deleteByExample(BsOrderAfterSalesAddressRecordExample example); + + @Delete({ + "delete from bs_order_after_sales_address_record", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into bs_order_after_sales_address_record (apply_no, `type`, ", + "address_id, address, ", + "create_time, update_time, ", + "`status`, ext_1, ext_2, ", + "ext_3)", + "values (#{applyNo,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, ", + "#{addressId,jdbcType=BIGINT}, #{address,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{status,jdbcType=BIGINT}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", + "#{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(BsOrderAfterSalesAddressRecord record); + + @InsertProvider(type=BsOrderAfterSalesAddressRecordSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(BsOrderAfterSalesAddressRecord record); + + @SelectProvider(type=BsOrderAfterSalesAddressRecordSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="apply_no", property="applyNo", jdbcType=JdbcType.VARCHAR), + @Result(column="type", property="type", jdbcType=JdbcType.VARCHAR), + @Result(column="address_id", property="addressId", jdbcType=JdbcType.BIGINT), + @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="status", property="status", jdbcType=JdbcType.BIGINT), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(BsOrderAfterSalesAddressRecordExample example); + + @Select({ + "select", + "id, apply_no, `type`, address_id, address, create_time, update_time, `status`, ", + "ext_1, ext_2, ext_3", + "from bs_order_after_sales_address_record", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="apply_no", property="applyNo", jdbcType=JdbcType.VARCHAR), + @Result(column="type", property="type", jdbcType=JdbcType.VARCHAR), + @Result(column="address_id", property="addressId", jdbcType=JdbcType.BIGINT), + @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="status", property="status", jdbcType=JdbcType.BIGINT), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + BsOrderAfterSalesAddressRecord selectByPrimaryKey(Long id); + + @UpdateProvider(type=BsOrderAfterSalesAddressRecordSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") BsOrderAfterSalesAddressRecord record, @Param("example") BsOrderAfterSalesAddressRecordExample example); + + @UpdateProvider(type=BsOrderAfterSalesAddressRecordSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") BsOrderAfterSalesAddressRecord record, @Param("example") BsOrderAfterSalesAddressRecordExample example); + + @UpdateProvider(type=BsOrderAfterSalesAddressRecordSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(BsOrderAfterSalesAddressRecord record); + + @Update({ + "update bs_order_after_sales_address_record", + "set apply_no = #{applyNo,jdbcType=VARCHAR},", + "`type` = #{type,jdbcType=VARCHAR},", + "address_id = #{addressId,jdbcType=BIGINT},", + "address = #{address,jdbcType=VARCHAR},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "`status` = #{status,jdbcType=BIGINT},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(BsOrderAfterSalesAddressRecord record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordMapperExt.java b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordMapperExt.java new file mode 100644 index 0000000..09cc883 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface BsOrderAfterSalesAddressRecordMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordSqlProvider.java new file mode 100644 index 0000000..6f93d61 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesAddressRecordSqlProvider.java @@ -0,0 +1,318 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsOrderAfterSalesAddressRecord; +import com.hfkj.entity.BsOrderAfterSalesAddressRecordExample.Criteria; +import com.hfkj.entity.BsOrderAfterSalesAddressRecordExample.Criterion; +import com.hfkj.entity.BsOrderAfterSalesAddressRecordExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class BsOrderAfterSalesAddressRecordSqlProvider { + + public String countByExample(BsOrderAfterSalesAddressRecordExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("bs_order_after_sales_address_record"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(BsOrderAfterSalesAddressRecordExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("bs_order_after_sales_address_record"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(BsOrderAfterSalesAddressRecord record) { + SQL sql = new SQL(); + sql.INSERT_INTO("bs_order_after_sales_address_record"); + + if (record.getApplyNo() != null) { + sql.VALUES("apply_no", "#{applyNo,jdbcType=VARCHAR}"); + } + + if (record.getType() != null) { + sql.VALUES("`type`", "#{type,jdbcType=VARCHAR}"); + } + + if (record.getAddressId() != null) { + sql.VALUES("address_id", "#{addressId,jdbcType=BIGINT}"); + } + + if (record.getAddress() != null) { + sql.VALUES("address", "#{address,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getStatus() != null) { + sql.VALUES("`status`", "#{status,jdbcType=BIGINT}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(BsOrderAfterSalesAddressRecordExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("apply_no"); + sql.SELECT("`type`"); + sql.SELECT("address_id"); + sql.SELECT("address"); + sql.SELECT("create_time"); + sql.SELECT("update_time"); + sql.SELECT("`status`"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("bs_order_after_sales_address_record"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + BsOrderAfterSalesAddressRecord record = (BsOrderAfterSalesAddressRecord) parameter.get("record"); + BsOrderAfterSalesAddressRecordExample example = (BsOrderAfterSalesAddressRecordExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("bs_order_after_sales_address_record"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getApplyNo() != null) { + sql.SET("apply_no = #{record.applyNo,jdbcType=VARCHAR}"); + } + + if (record.getType() != null) { + sql.SET("`type` = #{record.type,jdbcType=VARCHAR}"); + } + + if (record.getAddressId() != null) { + sql.SET("address_id = #{record.addressId,jdbcType=BIGINT}"); + } + + if (record.getAddress() != null) { + sql.SET("address = #{record.address,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{record.status,jdbcType=BIGINT}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("bs_order_after_sales_address_record"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("apply_no = #{record.applyNo,jdbcType=VARCHAR}"); + sql.SET("`type` = #{record.type,jdbcType=VARCHAR}"); + sql.SET("address_id = #{record.addressId,jdbcType=BIGINT}"); + sql.SET("address = #{record.address,jdbcType=VARCHAR}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + sql.SET("`status` = #{record.status,jdbcType=BIGINT}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + BsOrderAfterSalesAddressRecordExample example = (BsOrderAfterSalesAddressRecordExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(BsOrderAfterSalesAddressRecord record) { + SQL sql = new SQL(); + sql.UPDATE("bs_order_after_sales_address_record"); + + if (record.getApplyNo() != null) { + sql.SET("apply_no = #{applyNo,jdbcType=VARCHAR}"); + } + + if (record.getType() != null) { + sql.SET("`type` = #{type,jdbcType=VARCHAR}"); + } + + if (record.getAddressId() != null) { + sql.SET("address_id = #{addressId,jdbcType=BIGINT}"); + } + + if (record.getAddress() != null) { + sql.SET("address = #{address,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + } + + if (record.getStatus() != null) { + sql.SET("`status` = #{status,jdbcType=BIGINT}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, BsOrderAfterSalesAddressRecordExample 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 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 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()); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplyMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplyMapper.java index 07a1249..6750bbb 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplyMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplyMapper.java @@ -49,6 +49,7 @@ public interface BsOrderAfterSalesApplyMapper extends BsOrderAfterSalesApplyMapp "remarks, send_express_no, ", "refund_order_no, refund_price, ", "refund_integral, `status`, ", + "jd_status, audit_msg, ", "audit_remarks, create_time, ", "audit_time, send_express_time, ", "finish_time, update_time, ", @@ -63,6 +64,7 @@ public interface BsOrderAfterSalesApplyMapper extends BsOrderAfterSalesApplyMapp "#{remarks,jdbcType=VARCHAR}, #{sendExpressNo,jdbcType=VARCHAR}, ", "#{refundOrderNo,jdbcType=VARCHAR}, #{refundPrice,jdbcType=DECIMAL}, ", "#{refundIntegral,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, ", + "#{jdStatus,jdbcType=INTEGER}, #{auditMsg,jdbcType=VARCHAR}, ", "#{auditRemarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", "#{auditTime,jdbcType=TIMESTAMP}, #{sendExpressTime,jdbcType=TIMESTAMP}, ", "#{finishTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", @@ -99,6 +101,8 @@ public interface BsOrderAfterSalesApplyMapper extends BsOrderAfterSalesApplyMapp @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_integral", property="refundIntegral", jdbcType=JdbcType.BIGINT), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="jd_status", property="jdStatus", jdbcType=JdbcType.INTEGER), + @Result(column="audit_msg", property="auditMsg", jdbcType=JdbcType.VARCHAR), @Result(column="audit_remarks", property="auditRemarks", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="audit_time", property="auditTime", jdbcType=JdbcType.TIMESTAMP), @@ -116,8 +120,8 @@ public interface BsOrderAfterSalesApplyMapper extends BsOrderAfterSalesApplyMapp "id, user_id, user_phone, mer_id, apply_no, `type`, order_no, child_order_no, ", "product_type, product_id, product_name, product_img, product_spec_id, product_spec_name, ", "product_count, photo, remarks, send_express_no, refund_order_no, refund_price, ", - "refund_integral, `status`, audit_remarks, create_time, audit_time, send_express_time, ", - "finish_time, update_time, ext_1, ext_2, ext_3", + "refund_integral, `status`, jd_status, audit_msg, audit_remarks, create_time, ", + "audit_time, send_express_time, finish_time, update_time, ext_1, ext_2, ext_3", "from bs_order_after_sales_apply", "where id = #{id,jdbcType=BIGINT}" }) @@ -144,6 +148,8 @@ public interface BsOrderAfterSalesApplyMapper extends BsOrderAfterSalesApplyMapp @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_integral", property="refundIntegral", jdbcType=JdbcType.BIGINT), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="jd_status", property="jdStatus", jdbcType=JdbcType.INTEGER), + @Result(column="audit_msg", property="auditMsg", jdbcType=JdbcType.VARCHAR), @Result(column="audit_remarks", property="auditRemarks", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="audit_time", property="auditTime", jdbcType=JdbcType.TIMESTAMP), @@ -188,6 +194,8 @@ public interface BsOrderAfterSalesApplyMapper extends BsOrderAfterSalesApplyMapp "refund_price = #{refundPrice,jdbcType=DECIMAL},", "refund_integral = #{refundIntegral,jdbcType=BIGINT},", "`status` = #{status,jdbcType=INTEGER},", + "jd_status = #{jdStatus,jdbcType=INTEGER},", + "audit_msg = #{auditMsg,jdbcType=VARCHAR},", "audit_remarks = #{auditRemarks,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "audit_time = #{auditTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplySqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplySqlProvider.java index 956df16..54f77aa 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplySqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderAfterSalesApplySqlProvider.java @@ -112,6 +112,14 @@ public class BsOrderAfterSalesApplySqlProvider { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } + if (record.getJdStatus() != null) { + sql.VALUES("jd_status", "#{jdStatus,jdbcType=INTEGER}"); + } + + if (record.getAuditMsg() != null) { + sql.VALUES("audit_msg", "#{auditMsg,jdbcType=VARCHAR}"); + } + if (record.getAuditRemarks() != null) { sql.VALUES("audit_remarks", "#{auditRemarks,jdbcType=VARCHAR}"); } @@ -179,6 +187,8 @@ public class BsOrderAfterSalesApplySqlProvider { sql.SELECT("refund_price"); sql.SELECT("refund_integral"); sql.SELECT("`status`"); + sql.SELECT("jd_status"); + sql.SELECT("audit_msg"); sql.SELECT("audit_remarks"); sql.SELECT("create_time"); sql.SELECT("audit_time"); @@ -293,6 +303,14 @@ public class BsOrderAfterSalesApplySqlProvider { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } + if (record.getJdStatus() != null) { + sql.SET("jd_status = #{record.jdStatus,jdbcType=INTEGER}"); + } + + if (record.getAuditMsg() != null) { + sql.SET("audit_msg = #{record.auditMsg,jdbcType=VARCHAR}"); + } + if (record.getAuditRemarks() != null) { sql.SET("audit_remarks = #{record.auditRemarks,jdbcType=VARCHAR}"); } @@ -359,6 +377,8 @@ public class BsOrderAfterSalesApplySqlProvider { sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}"); sql.SET("refund_integral = #{record.refundIntegral,jdbcType=BIGINT}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("jd_status = #{record.jdStatus,jdbcType=INTEGER}"); + sql.SET("audit_msg = #{record.auditMsg,jdbcType=VARCHAR}"); sql.SET("audit_remarks = #{record.auditRemarks,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("audit_time = #{record.auditTime,jdbcType=TIMESTAMP}"); @@ -462,6 +482,14 @@ public class BsOrderAfterSalesApplySqlProvider { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } + if (record.getJdStatus() != null) { + sql.SET("jd_status = #{jdStatus,jdbcType=INTEGER}"); + } + + if (record.getAuditMsg() != null) { + sql.SET("audit_msg = #{auditMsg,jdbcType=VARCHAR}"); + } + if (record.getAuditRemarks() != null) { sql.SET("audit_remarks = #{auditRemarks,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesAddressRecord.java b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesAddressRecord.java new file mode 100644 index 0000000..8a95a35 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesAddressRecord.java @@ -0,0 +1,160 @@ +package com.hfkj.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * bs_order_after_sales_address_record + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class BsOrderAfterSalesAddressRecord implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 申请单号 + */ + private String applyNo; + + /** + * 类型:1:上门取件地址 2:寄回地址 + */ + private String type; + + /** + * 地址编码 + */ + private Long addressId; + + /** + * 地址内容 + */ + private String address; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 状态 + */ + private Long status; + + /** + * 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 getApplyNo() { + return applyNo; + } + + public void setApplyNo(String applyNo) { + this.applyNo = applyNo; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Long getAddressId() { + return addressId; + } + + public void setAddressId(Long addressId) { + this.addressId = addressId; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + 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 Long getStatus() { + return status; + } + + public void setStatus(Long status) { + this.status = status; + } + + 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; + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesAddressRecordExample.java b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesAddressRecordExample.java new file mode 100644 index 0000000..88c4e32 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesAddressRecordExample.java @@ -0,0 +1,943 @@ +package com.hfkj.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BsOrderAfterSalesAddressRecordExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public BsOrderAfterSalesAddressRecordExample() { + 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 andApplyNoIsNull() { + addCriterion("apply_no is null"); + return (Criteria) this; + } + + public Criteria andApplyNoIsNotNull() { + addCriterion("apply_no is not null"); + return (Criteria) this; + } + + public Criteria andApplyNoEqualTo(String value) { + addCriterion("apply_no =", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoNotEqualTo(String value) { + addCriterion("apply_no <>", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoGreaterThan(String value) { + addCriterion("apply_no >", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoGreaterThanOrEqualTo(String value) { + addCriterion("apply_no >=", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoLessThan(String value) { + addCriterion("apply_no <", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoLessThanOrEqualTo(String value) { + addCriterion("apply_no <=", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoLike(String value) { + addCriterion("apply_no like", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoNotLike(String value) { + addCriterion("apply_no not like", value, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoIn(List values) { + addCriterion("apply_no in", values, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoNotIn(List values) { + addCriterion("apply_no not in", values, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoBetween(String value1, String value2) { + addCriterion("apply_no between", value1, value2, "applyNo"); + return (Criteria) this; + } + + public Criteria andApplyNoNotBetween(String value1, String value2) { + addCriterion("apply_no not between", value1, value2, "applyNo"); + 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(String value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(String value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(String value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(String value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(String value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(String value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLike(String value) { + addCriterion("`type` like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("`type` not like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(String value1, String value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(String value1, String value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andAddressIdIsNull() { + addCriterion("address_id is null"); + return (Criteria) this; + } + + public Criteria andAddressIdIsNotNull() { + addCriterion("address_id is not null"); + return (Criteria) this; + } + + public Criteria andAddressIdEqualTo(Long value) { + addCriterion("address_id =", value, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdNotEqualTo(Long value) { + addCriterion("address_id <>", value, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdGreaterThan(Long value) { + addCriterion("address_id >", value, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdGreaterThanOrEqualTo(Long value) { + addCriterion("address_id >=", value, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdLessThan(Long value) { + addCriterion("address_id <", value, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdLessThanOrEqualTo(Long value) { + addCriterion("address_id <=", value, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdIn(List values) { + addCriterion("address_id in", values, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdNotIn(List values) { + addCriterion("address_id not in", values, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdBetween(Long value1, Long value2) { + addCriterion("address_id between", value1, value2, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIdNotBetween(Long value1, Long value2) { + addCriterion("address_id not between", value1, value2, "addressId"); + return (Criteria) this; + } + + public Criteria andAddressIsNull() { + addCriterion("address is null"); + return (Criteria) this; + } + + public Criteria andAddressIsNotNull() { + addCriterion("address is not null"); + return (Criteria) this; + } + + public Criteria andAddressEqualTo(String value) { + addCriterion("address =", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotEqualTo(String value) { + addCriterion("address <>", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThan(String value) { + addCriterion("address >", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThanOrEqualTo(String value) { + addCriterion("address >=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThan(String value) { + addCriterion("address <", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThanOrEqualTo(String value) { + addCriterion("address <=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLike(String value) { + addCriterion("address like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotLike(String value) { + addCriterion("address not like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressIn(List values) { + addCriterion("address in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotIn(List values) { + addCriterion("address not in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressBetween(String value1, String value2) { + addCriterion("address between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotBetween(String value1, String value2) { + addCriterion("address not between", value1, value2, "address"); + 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 andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Long value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Long value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Long value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Long value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Long value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Long value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Long value1, Long value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Long value1, Long value2) { + addCriterion("`status` not between", value1, value2, "status"); + 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); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApply.java b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApply.java index 0dad2eb..3f1032c 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApply.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApply.java @@ -124,6 +124,16 @@ public class BsOrderAfterSalesApply implements Serializable { */ private Integer status; + /** + * 售后类型。10退货,20换货,30维修 + */ + private Integer jdStatus; + + /** + * 三方申请售后信息 + */ + private String auditMsg; + /** * 审核备注 */ @@ -338,6 +348,22 @@ public class BsOrderAfterSalesApply implements Serializable { this.status = status; } + public Integer getJdStatus() { + return jdStatus; + } + + public void setJdStatus(Integer jdStatus) { + this.jdStatus = jdStatus; + } + + public String getAuditMsg() { + return auditMsg; + } + + public void setAuditMsg(String auditMsg) { + this.auditMsg = auditMsg; + } + public String getAuditRemarks() { return auditRemarks; } @@ -409,129 +435,4 @@ public class BsOrderAfterSalesApply implements Serializable { 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; - } - BsOrderAfterSalesApply other = (BsOrderAfterSalesApply) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) - && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) - && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) - && (this.getApplyNo() == null ? other.getApplyNo() == null : this.getApplyNo().equals(other.getApplyNo())) - && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) - && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) - && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) - && (this.getProductType() == null ? other.getProductType() == null : this.getProductType().equals(other.getProductType())) - && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId())) - && (this.getProductName() == null ? other.getProductName() == null : this.getProductName().equals(other.getProductName())) - && (this.getProductImg() == null ? other.getProductImg() == null : this.getProductImg().equals(other.getProductImg())) - && (this.getProductSpecId() == null ? other.getProductSpecId() == null : this.getProductSpecId().equals(other.getProductSpecId())) - && (this.getProductSpecName() == null ? other.getProductSpecName() == null : this.getProductSpecName().equals(other.getProductSpecName())) - && (this.getProductCount() == null ? other.getProductCount() == null : this.getProductCount().equals(other.getProductCount())) - && (this.getPhoto() == null ? other.getPhoto() == null : this.getPhoto().equals(other.getPhoto())) - && (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())) - && (this.getSendExpressNo() == null ? other.getSendExpressNo() == null : this.getSendExpressNo().equals(other.getSendExpressNo())) - && (this.getRefundOrderNo() == null ? other.getRefundOrderNo() == null : this.getRefundOrderNo().equals(other.getRefundOrderNo())) - && (this.getRefundPrice() == null ? other.getRefundPrice() == null : this.getRefundPrice().equals(other.getRefundPrice())) - && (this.getRefundIntegral() == null ? other.getRefundIntegral() == null : this.getRefundIntegral().equals(other.getRefundIntegral())) - && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) - && (this.getAuditRemarks() == null ? other.getAuditRemarks() == null : this.getAuditRemarks().equals(other.getAuditRemarks())) - && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getAuditTime() == null ? other.getAuditTime() == null : this.getAuditTime().equals(other.getAuditTime())) - && (this.getSendExpressTime() == null ? other.getSendExpressTime() == null : this.getSendExpressTime().equals(other.getSendExpressTime())) - && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) - && (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 + ((getUserId() == null) ? 0 : getUserId().hashCode()); - result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); - result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); - result = prime * result + ((getApplyNo() == null) ? 0 : getApplyNo().hashCode()); - result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); - result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); - result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); - result = prime * result + ((getProductType() == null) ? 0 : getProductType().hashCode()); - result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode()); - result = prime * result + ((getProductName() == null) ? 0 : getProductName().hashCode()); - result = prime * result + ((getProductImg() == null) ? 0 : getProductImg().hashCode()); - result = prime * result + ((getProductSpecId() == null) ? 0 : getProductSpecId().hashCode()); - result = prime * result + ((getProductSpecName() == null) ? 0 : getProductSpecName().hashCode()); - result = prime * result + ((getProductCount() == null) ? 0 : getProductCount().hashCode()); - result = prime * result + ((getPhoto() == null) ? 0 : getPhoto().hashCode()); - result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode()); - result = prime * result + ((getSendExpressNo() == null) ? 0 : getSendExpressNo().hashCode()); - result = prime * result + ((getRefundOrderNo() == null) ? 0 : getRefundOrderNo().hashCode()); - result = prime * result + ((getRefundPrice() == null) ? 0 : getRefundPrice().hashCode()); - result = prime * result + ((getRefundIntegral() == null) ? 0 : getRefundIntegral().hashCode()); - result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); - result = prime * result + ((getAuditRemarks() == null) ? 0 : getAuditRemarks().hashCode()); - result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getAuditTime() == null) ? 0 : getAuditTime().hashCode()); - result = prime * result + ((getSendExpressTime() == null) ? 0 : getSendExpressTime().hashCode()); - result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().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(", userId=").append(userId); - sb.append(", userPhone=").append(userPhone); - sb.append(", merId=").append(merId); - sb.append(", applyNo=").append(applyNo); - sb.append(", type=").append(type); - sb.append(", orderNo=").append(orderNo); - sb.append(", childOrderNo=").append(childOrderNo); - sb.append(", productType=").append(productType); - sb.append(", productId=").append(productId); - sb.append(", productName=").append(productName); - sb.append(", productImg=").append(productImg); - sb.append(", productSpecId=").append(productSpecId); - sb.append(", productSpecName=").append(productSpecName); - sb.append(", productCount=").append(productCount); - sb.append(", photo=").append(photo); - sb.append(", remarks=").append(remarks); - sb.append(", sendExpressNo=").append(sendExpressNo); - sb.append(", refundOrderNo=").append(refundOrderNo); - sb.append(", refundPrice=").append(refundPrice); - sb.append(", refundIntegral=").append(refundIntegral); - sb.append(", status=").append(status); - sb.append(", auditRemarks=").append(auditRemarks); - sb.append(", createTime=").append(createTime); - sb.append(", auditTime=").append(auditTime); - sb.append(", sendExpressTime=").append(sendExpressTime); - sb.append(", finishTime=").append(finishTime); - 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(); - } } \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApplyExample.java b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApplyExample.java index 995f13e..9c8ce3c 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApplyExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderAfterSalesApplyExample.java @@ -1556,6 +1556,136 @@ public class BsOrderAfterSalesApplyExample { return (Criteria) this; } + public Criteria andJdStatusIsNull() { + addCriterion("jd_status is null"); + return (Criteria) this; + } + + public Criteria andJdStatusIsNotNull() { + addCriterion("jd_status is not null"); + return (Criteria) this; + } + + public Criteria andJdStatusEqualTo(Integer value) { + addCriterion("jd_status =", value, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusNotEqualTo(Integer value) { + addCriterion("jd_status <>", value, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusGreaterThan(Integer value) { + addCriterion("jd_status >", value, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("jd_status >=", value, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusLessThan(Integer value) { + addCriterion("jd_status <", value, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusLessThanOrEqualTo(Integer value) { + addCriterion("jd_status <=", value, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusIn(List values) { + addCriterion("jd_status in", values, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusNotIn(List values) { + addCriterion("jd_status not in", values, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusBetween(Integer value1, Integer value2) { + addCriterion("jd_status between", value1, value2, "jdStatus"); + return (Criteria) this; + } + + public Criteria andJdStatusNotBetween(Integer value1, Integer value2) { + addCriterion("jd_status not between", value1, value2, "jdStatus"); + return (Criteria) this; + } + + public Criteria andAuditMsgIsNull() { + addCriterion("audit_msg is null"); + return (Criteria) this; + } + + public Criteria andAuditMsgIsNotNull() { + addCriterion("audit_msg is not null"); + return (Criteria) this; + } + + public Criteria andAuditMsgEqualTo(String value) { + addCriterion("audit_msg =", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgNotEqualTo(String value) { + addCriterion("audit_msg <>", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgGreaterThan(String value) { + addCriterion("audit_msg >", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgGreaterThanOrEqualTo(String value) { + addCriterion("audit_msg >=", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgLessThan(String value) { + addCriterion("audit_msg <", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgLessThanOrEqualTo(String value) { + addCriterion("audit_msg <=", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgLike(String value) { + addCriterion("audit_msg like", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgNotLike(String value) { + addCriterion("audit_msg not like", value, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgIn(List values) { + addCriterion("audit_msg in", values, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgNotIn(List values) { + addCriterion("audit_msg not in", values, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgBetween(String value1, String value2) { + addCriterion("audit_msg between", value1, value2, "auditMsg"); + return (Criteria) this; + } + + public Criteria andAuditMsgNotBetween(String value1, String value2) { + addCriterion("audit_msg not between", value1, value2, "auditMsg"); + return (Criteria) this; + } + public Criteria andAuditRemarksIsNull() { addCriterion("audit_remarks is null"); return (Criteria) this;