1

service/src/main/java/com/hfkj/dao/BsOrderChildMapper.java

@@ -52,7 +52,7 @@ public interface BsOrderChildMapper extends BsOrderChildMapperExt {
         "settle_account, settle_account_key, ",
         "create_time, update_time, ",
         "finish_time, ext_1, ",
-        "ext_2, ext_3)",
+        "ext_2, ext_3, channel_order_no)",
         "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ",
         "#{merId,jdbcType=BIGINT}, #{productType,jdbcType=INTEGER}, ",
         "#{productId,jdbcType=BIGINT}, #{productName,jdbcType=VARCHAR}, ",
@@ -66,7 +66,7 @@ public interface BsOrderChildMapper extends BsOrderChildMapperExt {
         "#{settleAccount,jdbcType=VARCHAR}, #{settleAccountKey,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
         "#{finishTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{channelOrderNo,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(BsOrderChild record);
@@ -105,7 +105,8 @@ public interface BsOrderChildMapper extends BsOrderChildMapperExt {
         @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
         @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)
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR),
+        @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR)
     })
     List<BsOrderChild> selectByExample(BsOrderChildExample example);
 
@@ -116,7 +117,7 @@ public interface BsOrderChildMapper extends BsOrderChildMapperExt {
         "product_total_price, total_deduction_price, coupon_discount_price, integral_discount_price, ",
         "product_actual_price, surplus_refund_count, surplus_refund_price, surplus_refund_integral, ",
         "`status`, settle_account, settle_account_key, create_time, update_time, finish_time, ",
-        "ext_1, ext_2, ext_3",
+        "ext_1, ext_2, ext_3, channel_order_no",
         "from bs_order_child",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -149,7 +150,8 @@ public interface BsOrderChildMapper extends BsOrderChildMapperExt {
         @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
         @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)
+        @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR),
+        @Result(column="channel_order_no", property="channelOrderNo", jdbcType=JdbcType.VARCHAR)
     })
     BsOrderChild selectByPrimaryKey(Long id);
 
@@ -191,7 +193,8 @@ public interface BsOrderChildMapper extends BsOrderChildMapperExt {
           "finish_time = #{finishTime,jdbcType=TIMESTAMP},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",
           "ext_2 = #{ext2,jdbcType=VARCHAR},",
-          "ext_3 = #{ext3,jdbcType=VARCHAR}",
+          "ext_3 = #{ext3,jdbcType=VARCHAR},",
+          "channel_order_no = #{channelOrderNo,jdbcType=VARCHAR}",
         "where id = #{id,jdbcType=BIGINT}"
     })
     int updateByPrimaryKey(BsOrderChild record);

service/src/main/java/com/hfkj/dao/BsOrderChildSqlProvider.java

@@ -140,6 +140,10 @@ public class BsOrderChildSqlProvider {
             sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
         }
         
+        if (record.getChannelOrderNo() != null) {
+            sql.VALUES("channel_order_no", "#{channelOrderNo,jdbcType=VARCHAR}");
+        }
+        
         return sql.toString();
     }
 
@@ -178,6 +182,7 @@ public class BsOrderChildSqlProvider {
         sql.SELECT("ext_1");
         sql.SELECT("ext_2");
         sql.SELECT("ext_3");
+        sql.SELECT("channel_order_no");
         sql.FROM("bs_order_child");
         applyWhere(sql, example, false);
         
@@ -311,6 +316,10 @@ public class BsOrderChildSqlProvider {
             sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
         }
         
+        if (record.getChannelOrderNo() != null) {
+            sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}");
+        }
+        
         applyWhere(sql, example, true);
         return sql.toString();
     }
@@ -348,6 +357,7 @@ public class BsOrderChildSqlProvider {
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
         sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
         sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
+        sql.SET("channel_order_no = #{record.channelOrderNo,jdbcType=VARCHAR}");
         
         BsOrderChildExample example = (BsOrderChildExample) parameter.get("example");
         applyWhere(sql, example, true);
@@ -470,6 +480,10 @@ public class BsOrderChildSqlProvider {
             sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
         }
         
+        if (record.getChannelOrderNo() != null) {
+            sql.SET("channel_order_no = #{channelOrderNo,jdbcType=VARCHAR}");
+        }
+        
         sql.WHERE("id = #{id,jdbcType=BIGINT}");
         
         return sql.toString();

service/src/main/java/com/hfkj/entity/BsOrderChild.java

@@ -156,6 +156,11 @@ public class BsOrderChild implements Serializable {
 
     private String ext3;
 
+    /**
+     * 渠道订单号
+     */
+    private String channelOrderNo;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -390,6 +395,14 @@ public class BsOrderChild implements Serializable {
         this.ext3 = ext3;
     }
 
+    public String getChannelOrderNo() {
+        return channelOrderNo;
+    }
+
+    public void setChannelOrderNo(String channelOrderNo) {
+        this.channelOrderNo = channelOrderNo;
+    }
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -430,7 +443,8 @@ public class BsOrderChild implements Serializable {
             && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
             && (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()));
+            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()))
+            && (this.getChannelOrderNo() == null ? other.getChannelOrderNo() == null : this.getChannelOrderNo().equals(other.getChannelOrderNo()));
     }
 
     @Override
@@ -466,6 +480,7 @@ public class BsOrderChild implements Serializable {
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
         result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
         result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
+        result = prime * result + ((getChannelOrderNo() == null) ? 0 : getChannelOrderNo().hashCode());
         return result;
     }
 
@@ -504,6 +519,7 @@ public class BsOrderChild implements Serializable {
         sb.append(", ext1=").append(ext1);
         sb.append(", ext2=").append(ext2);
         sb.append(", ext3=").append(ext3);
+        sb.append(", channelOrderNo=").append(channelOrderNo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

service/src/main/java/com/hfkj/entity/BsOrderChildExample.java

@@ -1965,6 +1965,76 @@ public class BsOrderChildExample {
             addCriterion("ext_3 not between", value1, value2, "ext3");
             return (Criteria) this;
         }
+
+        public Criteria andChannelOrderNoIsNull() {
+            addCriterion("channel_order_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoIsNotNull() {
+            addCriterion("channel_order_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoEqualTo(String value) {
+            addCriterion("channel_order_no =", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoNotEqualTo(String value) {
+            addCriterion("channel_order_no <>", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoGreaterThan(String value) {
+            addCriterion("channel_order_no >", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoGreaterThanOrEqualTo(String value) {
+            addCriterion("channel_order_no >=", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoLessThan(String value) {
+            addCriterion("channel_order_no <", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoLessThanOrEqualTo(String value) {
+            addCriterion("channel_order_no <=", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoLike(String value) {
+            addCriterion("channel_order_no like", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoNotLike(String value) {
+            addCriterion("channel_order_no not like", value, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoIn(List<String> values) {
+            addCriterion("channel_order_no in", values, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoNotIn(List<String> values) {
+            addCriterion("channel_order_no not in", values, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoBetween(String value1, String value2) {
+            addCriterion("channel_order_no between", value1, value2, "channelOrderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelOrderNoNotBetween(String value1, String value2) {
+            addCriterion("channel_order_no not between", value1, value2, "channelOrderNo");
+            return (Criteria) this;
+        }
     }
 
     /**