diff --git a/service/src/main/java/com/hfkj/dao/CyymallOrderMapper.java b/service/src/main/java/com/hfkj/dao/CyymallOrderMapper.java index 1950662..7503b3c 100644 --- a/service/src/main/java/com/hfkj/dao/CyymallOrderMapper.java +++ b/service/src/main/java/com/hfkj/dao/CyymallOrderMapper.java @@ -58,9 +58,9 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { "is_cancel, before_update_price, ", "shop_id, discount, ", "user_coupon_id, give_integral, ", - "parent_id_2, parent_id_3, ", + "parent_id_1, parent_id_2, ", "is_sale, version, ", - "express_price_2, is_recycle, ", + "express_price_1, is_recycle, ", "rebate, before_update_express, ", "mch_id, order_union_id, ", "is_transfer, `type`, ", @@ -102,9 +102,9 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { "#{isCancel,jdbcType=SMALLINT}, #{beforeUpdatePrice,jdbcType=DECIMAL}, ", "#{shopId,jdbcType=INTEGER}, #{discount,jdbcType=DECIMAL}, ", "#{userCouponId,jdbcType=INTEGER}, #{giveIntegral,jdbcType=SMALLINT}, ", - "#{parentId2,jdbcType=INTEGER}, #{parentId3,jdbcType=INTEGER}, ", + "#{parentId1,jdbcType=INTEGER}, #{parentId2,jdbcType=INTEGER}, ", "#{isSale,jdbcType=INTEGER}, #{version,jdbcType=VARCHAR}, ", - "#{expressPrice2,jdbcType=DECIMAL}, #{isRecycle,jdbcType=SMALLINT}, ", + "#{expressPrice1,jdbcType=DECIMAL}, #{isRecycle,jdbcType=SMALLINT}, ", "#{rebate,jdbcType=DECIMAL}, #{beforeUpdateExpress,jdbcType=DECIMAL}, ", "#{mchId,jdbcType=INTEGER}, #{orderUnionId,jdbcType=INTEGER}, ", "#{isTransfer,jdbcType=SMALLINT}, #{type,jdbcType=INTEGER}, ", @@ -176,11 +176,11 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { @Result(column="discount", property="discount", jdbcType=JdbcType.DECIMAL), @Result(column="user_coupon_id", property="userCouponId", jdbcType=JdbcType.INTEGER), @Result(column="give_integral", property="giveIntegral", jdbcType=JdbcType.SMALLINT), + @Result(column="parent_id_1", property="parentId1", jdbcType=JdbcType.INTEGER), @Result(column="parent_id_2", property="parentId2", jdbcType=JdbcType.INTEGER), - @Result(column="parent_id_3", property="parentId3", jdbcType=JdbcType.INTEGER), @Result(column="is_sale", property="isSale", jdbcType=JdbcType.INTEGER), @Result(column="version", property="version", jdbcType=JdbcType.VARCHAR), - @Result(column="express_price_2", property="expressPrice2", jdbcType=JdbcType.DECIMAL), + @Result(column="express_price_1", property="expressPrice1", jdbcType=JdbcType.DECIMAL), @Result(column="is_recycle", property="isRecycle", jdbcType=JdbcType.SMALLINT), @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL), @Result(column="before_update_express", property="beforeUpdateExpress", jdbcType=JdbcType.DECIMAL), @@ -273,11 +273,11 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { @Result(column="discount", property="discount", jdbcType=JdbcType.DECIMAL), @Result(column="user_coupon_id", property="userCouponId", jdbcType=JdbcType.INTEGER), @Result(column="give_integral", property="giveIntegral", jdbcType=JdbcType.SMALLINT), + @Result(column="parent_id_1", property="parentId1", jdbcType=JdbcType.INTEGER), @Result(column="parent_id_2", property="parentId2", jdbcType=JdbcType.INTEGER), - @Result(column="parent_id_3", property="parentId3", jdbcType=JdbcType.INTEGER), @Result(column="is_sale", property="isSale", jdbcType=JdbcType.INTEGER), @Result(column="version", property="version", jdbcType=JdbcType.VARCHAR), - @Result(column="express_price_2", property="expressPrice2", jdbcType=JdbcType.DECIMAL), + @Result(column="express_price_1", property="expressPrice1", jdbcType=JdbcType.DECIMAL), @Result(column="is_recycle", property="isRecycle", jdbcType=JdbcType.SMALLINT), @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL), @Result(column="before_update_express", property="beforeUpdateExpress", jdbcType=JdbcType.DECIMAL), @@ -331,7 +331,7 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { "express_no, is_confirm, confirm_time, is_comment, apply_delete, addtime, is_delete, ", "is_price, parent_id, first_price, second_price, third_price, coupon_sub_price, ", "is_offline, clerk_id, is_cancel, before_update_price, shop_id, discount, user_coupon_id, ", - "give_integral, parent_id_2, parent_id_3, is_sale, version, express_price_2, ", + "give_integral, parent_id_1, parent_id_2, is_sale, version, express_price_1, ", "is_recycle, rebate, before_update_express, mch_id, order_union_id, is_transfer, ", "`type`, share_price, is_show, currency, order_origin, delivery_id, delivery_status, ", "fy_status, fyjine, fysingle, mch_fyjine, mch_fysingle, is_fan, is_dada, shop_peisong, ", @@ -382,11 +382,11 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { @Result(column="discount", property="discount", jdbcType=JdbcType.DECIMAL), @Result(column="user_coupon_id", property="userCouponId", jdbcType=JdbcType.INTEGER), @Result(column="give_integral", property="giveIntegral", jdbcType=JdbcType.SMALLINT), + @Result(column="parent_id_1", property="parentId1", jdbcType=JdbcType.INTEGER), @Result(column="parent_id_2", property="parentId2", jdbcType=JdbcType.INTEGER), - @Result(column="parent_id_3", property="parentId3", jdbcType=JdbcType.INTEGER), @Result(column="is_sale", property="isSale", jdbcType=JdbcType.INTEGER), @Result(column="version", property="version", jdbcType=JdbcType.VARCHAR), - @Result(column="express_price_2", property="expressPrice2", jdbcType=JdbcType.DECIMAL), + @Result(column="express_price_1", property="expressPrice1", jdbcType=JdbcType.DECIMAL), @Result(column="is_recycle", property="isRecycle", jdbcType=JdbcType.SMALLINT), @Result(column="rebate", property="rebate", jdbcType=JdbcType.DECIMAL), @Result(column="before_update_express", property="beforeUpdateExpress", jdbcType=JdbcType.DECIMAL), @@ -490,11 +490,11 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { "discount = #{discount,jdbcType=DECIMAL},", "user_coupon_id = #{userCouponId,jdbcType=INTEGER},", "give_integral = #{giveIntegral,jdbcType=SMALLINT},", + "parent_id_1 = #{parentId1,jdbcType=INTEGER},", "parent_id_2 = #{parentId2,jdbcType=INTEGER},", - "parent_id_3 = #{parentId3,jdbcType=INTEGER},", "is_sale = #{isSale,jdbcType=INTEGER},", "version = #{version,jdbcType=VARCHAR},", - "express_price_2 = #{expressPrice2,jdbcType=DECIMAL},", + "express_price_1 = #{expressPrice1,jdbcType=DECIMAL},", "is_recycle = #{isRecycle,jdbcType=SMALLINT},", "rebate = #{rebate,jdbcType=DECIMAL},", "before_update_express = #{beforeUpdateExpress,jdbcType=DECIMAL},", @@ -587,11 +587,11 @@ public interface CyymallOrderMapper extends CyymallOrderMapperExt { "discount = #{discount,jdbcType=DECIMAL},", "user_coupon_id = #{userCouponId,jdbcType=INTEGER},", "give_integral = #{giveIntegral,jdbcType=SMALLINT},", + "parent_id_1 = #{parentId1,jdbcType=INTEGER},", "parent_id_2 = #{parentId2,jdbcType=INTEGER},", - "parent_id_3 = #{parentId3,jdbcType=INTEGER},", "is_sale = #{isSale,jdbcType=INTEGER},", "version = #{version,jdbcType=VARCHAR},", - "express_price_2 = #{expressPrice2,jdbcType=DECIMAL},", + "express_price_1 = #{expressPrice1,jdbcType=DECIMAL},", "is_recycle = #{isRecycle,jdbcType=SMALLINT},", "rebate = #{rebate,jdbcType=DECIMAL},", "before_update_express = #{beforeUpdateExpress,jdbcType=DECIMAL},", diff --git a/service/src/main/java/com/hfkj/dao/CyymallOrderSqlProvider.java b/service/src/main/java/com/hfkj/dao/CyymallOrderSqlProvider.java index 7dce1d5..1bdcf60 100644 --- a/service/src/main/java/com/hfkj/dao/CyymallOrderSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/CyymallOrderSqlProvider.java @@ -176,12 +176,12 @@ public class CyymallOrderSqlProvider { sql.VALUES("give_integral", "#{giveIntegral,jdbcType=SMALLINT}"); } - if (record.getParentId2() != null) { - sql.VALUES("parent_id_2", "#{parentId2,jdbcType=INTEGER}"); + if (record.getParentId1() != null) { + sql.VALUES("parent_id_1", "#{parentId1,jdbcType=INTEGER}"); } - if (record.getParentId3() != null) { - sql.VALUES("parent_id_3", "#{parentId3,jdbcType=INTEGER}"); + if (record.getParentId2() != null) { + sql.VALUES("parent_id_2", "#{parentId2,jdbcType=INTEGER}"); } if (record.getIsSale() != null) { @@ -192,8 +192,8 @@ public class CyymallOrderSqlProvider { sql.VALUES("version", "#{version,jdbcType=VARCHAR}"); } - if (record.getExpressPrice2() != null) { - sql.VALUES("express_price_2", "#{expressPrice2,jdbcType=DECIMAL}"); + if (record.getExpressPrice1() != null) { + sql.VALUES("express_price_1", "#{expressPrice1,jdbcType=DECIMAL}"); } if (record.getIsRecycle() != null) { @@ -439,11 +439,11 @@ public class CyymallOrderSqlProvider { sql.SELECT("discount"); sql.SELECT("user_coupon_id"); sql.SELECT("give_integral"); + sql.SELECT("parent_id_1"); sql.SELECT("parent_id_2"); - sql.SELECT("parent_id_3"); sql.SELECT("is_sale"); sql.SELECT("version"); - sql.SELECT("express_price_2"); + sql.SELECT("express_price_1"); sql.SELECT("is_recycle"); sql.SELECT("rebate"); sql.SELECT("before_update_express"); @@ -547,11 +547,11 @@ public class CyymallOrderSqlProvider { sql.SELECT("discount"); sql.SELECT("user_coupon_id"); sql.SELECT("give_integral"); + sql.SELECT("parent_id_1"); sql.SELECT("parent_id_2"); - sql.SELECT("parent_id_3"); sql.SELECT("is_sale"); sql.SELECT("version"); - sql.SELECT("express_price_2"); + sql.SELECT("express_price_1"); sql.SELECT("is_recycle"); sql.SELECT("rebate"); sql.SELECT("before_update_express"); @@ -764,12 +764,12 @@ public class CyymallOrderSqlProvider { sql.SET("give_integral = #{record.giveIntegral,jdbcType=SMALLINT}"); } - if (record.getParentId2() != null) { - sql.SET("parent_id_2 = #{record.parentId2,jdbcType=INTEGER}"); + if (record.getParentId1() != null) { + sql.SET("parent_id_1 = #{record.parentId1,jdbcType=INTEGER}"); } - if (record.getParentId3() != null) { - sql.SET("parent_id_3 = #{record.parentId3,jdbcType=INTEGER}"); + if (record.getParentId2() != null) { + sql.SET("parent_id_2 = #{record.parentId2,jdbcType=INTEGER}"); } if (record.getIsSale() != null) { @@ -780,8 +780,8 @@ public class CyymallOrderSqlProvider { sql.SET("version = #{record.version,jdbcType=VARCHAR}"); } - if (record.getExpressPrice2() != null) { - sql.SET("express_price_2 = #{record.expressPrice2,jdbcType=DECIMAL}"); + if (record.getExpressPrice1() != null) { + sql.SET("express_price_1 = #{record.expressPrice1,jdbcType=DECIMAL}"); } if (record.getIsRecycle() != null) { @@ -1026,11 +1026,11 @@ public class CyymallOrderSqlProvider { sql.SET("discount = #{record.discount,jdbcType=DECIMAL}"); sql.SET("user_coupon_id = #{record.userCouponId,jdbcType=INTEGER}"); sql.SET("give_integral = #{record.giveIntegral,jdbcType=SMALLINT}"); + sql.SET("parent_id_1 = #{record.parentId1,jdbcType=INTEGER}"); sql.SET("parent_id_2 = #{record.parentId2,jdbcType=INTEGER}"); - sql.SET("parent_id_3 = #{record.parentId3,jdbcType=INTEGER}"); sql.SET("is_sale = #{record.isSale,jdbcType=INTEGER}"); sql.SET("version = #{record.version,jdbcType=VARCHAR}"); - sql.SET("express_price_2 = #{record.expressPrice2,jdbcType=DECIMAL}"); + sql.SET("express_price_1 = #{record.expressPrice1,jdbcType=DECIMAL}"); sql.SET("is_recycle = #{record.isRecycle,jdbcType=SMALLINT}"); sql.SET("rebate = #{record.rebate,jdbcType=DECIMAL}"); sql.SET("before_update_express = #{record.beforeUpdateExpress,jdbcType=DECIMAL}"); @@ -1128,11 +1128,11 @@ public class CyymallOrderSqlProvider { sql.SET("discount = #{record.discount,jdbcType=DECIMAL}"); sql.SET("user_coupon_id = #{record.userCouponId,jdbcType=INTEGER}"); sql.SET("give_integral = #{record.giveIntegral,jdbcType=SMALLINT}"); + sql.SET("parent_id_1 = #{record.parentId1,jdbcType=INTEGER}"); sql.SET("parent_id_2 = #{record.parentId2,jdbcType=INTEGER}"); - sql.SET("parent_id_3 = #{record.parentId3,jdbcType=INTEGER}"); sql.SET("is_sale = #{record.isSale,jdbcType=INTEGER}"); sql.SET("version = #{record.version,jdbcType=VARCHAR}"); - sql.SET("express_price_2 = #{record.expressPrice2,jdbcType=DECIMAL}"); + sql.SET("express_price_1 = #{record.expressPrice1,jdbcType=DECIMAL}"); sql.SET("is_recycle = #{record.isRecycle,jdbcType=SMALLINT}"); sql.SET("rebate = #{record.rebate,jdbcType=DECIMAL}"); sql.SET("before_update_express = #{record.beforeUpdateExpress,jdbcType=DECIMAL}"); @@ -1334,12 +1334,12 @@ public class CyymallOrderSqlProvider { sql.SET("give_integral = #{giveIntegral,jdbcType=SMALLINT}"); } - if (record.getParentId2() != null) { - sql.SET("parent_id_2 = #{parentId2,jdbcType=INTEGER}"); + if (record.getParentId1() != null) { + sql.SET("parent_id_1 = #{parentId1,jdbcType=INTEGER}"); } - if (record.getParentId3() != null) { - sql.SET("parent_id_3 = #{parentId3,jdbcType=INTEGER}"); + if (record.getParentId2() != null) { + sql.SET("parent_id_2 = #{parentId2,jdbcType=INTEGER}"); } if (record.getIsSale() != null) { @@ -1350,8 +1350,8 @@ public class CyymallOrderSqlProvider { sql.SET("version = #{version,jdbcType=VARCHAR}"); } - if (record.getExpressPrice2() != null) { - sql.SET("express_price_2 = #{expressPrice2,jdbcType=DECIMAL}"); + if (record.getExpressPrice1() != null) { + sql.SET("express_price_1 = #{expressPrice1,jdbcType=DECIMAL}"); } if (record.getIsRecycle() != null) { diff --git a/service/src/main/java/com/hfkj/entity/CyymallOrder.java b/service/src/main/java/com/hfkj/entity/CyymallOrder.java index a4dab90..93d5a14 100644 --- a/service/src/main/java/com/hfkj/entity/CyymallOrder.java +++ b/service/src/main/java/com/hfkj/entity/CyymallOrder.java @@ -17,172 +17,412 @@ public class CyymallOrder implements Serializable { private Integer storeId; + /** + * 用户id + */ private Integer userId; + /** + * 订单号 + */ private String orderNo; + /** + * 订单总费用(包含运费） + */ private BigDecimal totalPrice; + /** + * 实际支付总费用(含运费） + */ private BigDecimal payPrice; + /** + * 运费 + */ private BigDecimal expressPrice; + /** + * 收货人姓名 + */ private String name; + /** + * 收货人手机 + */ private String mobile; + /** + * 收货地址 + */ private String address; + /** + * 订单备注 + */ private String remark; + /** + * 支付状态：0=未支付，1=已支付 + */ private Short isPay; + /** + * 支付方式：1=微信支付 + */ private Short payType; + /** + * 支付时间 + */ private Integer payTime; + /** + * 发货状态：0=未发货，1=已发货 + */ private Short isSend; + /** + * 发货时间 + */ private Integer sendTime; + /** + * 物流公司 + */ private String express; private String expressNo; + /** + * 确认收货状态：0=未确认，1=已确认收货 + */ private Short isConfirm; + /** + * 确认收货时间 + */ private Integer confirmTime; + /** + * 是否已评价：0=未评价，1=已评价 + */ private Short isComment; + /** + * 是否申请取消订单：0=否，1=申请取消订单 + */ private Short applyDelete; private Integer addtime; private Short isDelete; + /** + * 是否发放佣金 + */ private Short isPrice; + /** + * 用户上级ID + */ private Integer parentId; + /** + * 一级佣金 + */ private BigDecimal firstPrice; + /** + * 二级佣金 + */ private BigDecimal secondPrice; + /** + * 三级佣金 + */ private BigDecimal thirdPrice; + /** + * 优惠券抵消金额 + */ private BigDecimal couponSubPrice; + /** + * 是否到店自提 0--否 1--是 + */ private Integer isOffline; + /** + * 核销员user_id + */ private Integer clerkId; + /** + * 是否取消 + */ private Short isCancel; + /** + * 修改前的价格 + */ private BigDecimal beforeUpdatePrice; + /** + * 自提门店ID + */ private Integer shopId; + /** + * 会员折扣 + */ private BigDecimal discount; + /** + * 使用的优惠券ID + */ private Integer userCouponId; + /** + * 是否发放积分【1=> 已发放 ， 0=> 未发放】 + */ private Short giveIntegral; - private Integer parentId2; + /** + * 用户上二级ID + */ + private Integer parentId1; - private Integer parentId3; + /** + * 用户上三级ID + */ + private Integer parentId2; + /** + * 是否超过售后时间 + */ private Integer isSale; + /** + * 版本 + */ private String version; - private BigDecimal expressPrice2; + /** + * 减免的运费 + */ + private BigDecimal expressPrice1; private Short isRecycle; + /** + * 自购返利 + */ private BigDecimal rebate; + /** + * 价格修改前的运费 + */ private BigDecimal beforeUpdateExpress; + /** + * 入驻商户id + */ private Integer mchId; + /** + * 合并订单的id + */ private Integer orderUnionId; + /** + * 是否已转入商户账户：0=否，1=是 + */ private Short isTransfer; + /** + * 0:普通订单 1大转盘订单 + */ private Integer type; + /** + * 发放佣金的金额 + */ private BigDecimal sharePrice; + /** + * 是否显示 0--不显示 1--显示 + */ private Short isShow; + /** + * 货币：活力币 + */ private BigDecimal currency; + /** + * 订单来源：1、公众号或网站，2、app，3、小程序 + */ private Boolean orderOrigin; + /** + * 配送员id + */ private Integer deliveryId; + /** + * 配送状态1已分配配送员2配送中3已配送 + */ private Boolean deliveryStatus; + /** + * 返佣状态0未开始1进行中2已完成 + */ private Boolean fyStatus; + /** + * 返佣金额 + */ private BigDecimal fyjine; + /** + * 每日返还 + */ private BigDecimal fysingle; + /** + * 商家返佣金额 + */ private BigDecimal mchFyjine; + /** + * 商家每日返佣 + */ private BigDecimal mchFysingle; + /** + * 0未1已 + */ private Boolean isFan; + /** + * 0否1是 + */ private Boolean isDada; + /** + * 是否已生成团长配送单 + */ private Integer shopPeisong; + /** + * 是否是线下购物车下的订单 + */ private Boolean isOpenOffline; + /** + * 供货商id + */ private Integer supplierId; + /** + * 是否已转入商户账户：0=否，1=是 + */ private Boolean isSupTransfer; + /** + * 商品打包费 + */ private BigDecimal dabaoPrice; + /** + * 结算金额 + */ private BigDecimal settlementAmount; + /** + * 是否结算0-未结算 1- 已结算 + */ private Short isSettlement; + /** + * 结算时间 + */ private Integer settlementTime; + /** + * 是否是入驻商门店, 配合shop_id来判断 + */ private Boolean isMchShop; + /** + * 是否分账 + */ private Boolean isDivideMoney; + /** + * 微信回调交易单号 + */ private String transactionId; + /** + * 实际支付用户id + */ private Integer payUserId; + /** + * 实际支付方式 1=微信支付 2=货到付款 3=余额支付 5=连连支付 + */ private Boolean payTypeTrue; + /** + * 是否是抖品订单：0=否，1=是 + */ private Integer isVgoods; + /** + * 首单减免金额 + */ private BigDecimal reductionPrice; + /** + * 满减优惠 + */ private BigDecimal minusPrice; + /** + * 订单来源 + */ private Integer orderFrom; + /** + * 新满减活动金额 + */ private BigDecimal discountPrice; + /** + * 满折 + */ private BigDecimal discountNum; + /** + * 满赠商品ID + */ private Integer giveGoodsId; + /** + * 世纪恒通券码 + */ private String couponRecordId; + /** + * 身份证证件号 + */ private String idCardNo; + /** + * 退款时间 + */ private Integer refundTime; private static final long serialVersionUID = 1L; @@ -491,20 +731,20 @@ public class CyymallOrder implements Serializable { this.giveIntegral = giveIntegral; } - public Integer getParentId2() { - return parentId2; + public Integer getParentId1() { + return parentId1; } - public void setParentId2(Integer parentId2) { - this.parentId2 = parentId2; + public void setParentId1(Integer parentId1) { + this.parentId1 = parentId1; } - public Integer getParentId3() { - return parentId3; + public Integer getParentId2() { + return parentId2; } - public void setParentId3(Integer parentId3) { - this.parentId3 = parentId3; + public void setParentId2(Integer parentId2) { + this.parentId2 = parentId2; } public Integer getIsSale() { @@ -523,12 +763,12 @@ public class CyymallOrder implements Serializable { this.version = version; } - public BigDecimal getExpressPrice2() { - return expressPrice2; + public BigDecimal getExpressPrice1() { + return expressPrice1; } - public void setExpressPrice2(BigDecimal expressPrice2) { - this.expressPrice2 = expressPrice2; + public void setExpressPrice1(BigDecimal expressPrice1) { + this.expressPrice1 = expressPrice1; } public Short getIsRecycle() { @@ -925,11 +1165,11 @@ public class CyymallOrder implements Serializable { && (this.getDiscount() == null ? other.getDiscount() == null : this.getDiscount().equals(other.getDiscount())) && (this.getUserCouponId() == null ? other.getUserCouponId() == null : this.getUserCouponId().equals(other.getUserCouponId())) && (this.getGiveIntegral() == null ? other.getGiveIntegral() == null : this.getGiveIntegral().equals(other.getGiveIntegral())) + && (this.getParentId1() == null ? other.getParentId1() == null : this.getParentId1().equals(other.getParentId1())) && (this.getParentId2() == null ? other.getParentId2() == null : this.getParentId2().equals(other.getParentId2())) - && (this.getParentId3() == null ? other.getParentId3() == null : this.getParentId3().equals(other.getParentId3())) && (this.getIsSale() == null ? other.getIsSale() == null : this.getIsSale().equals(other.getIsSale())) && (this.getVersion() == null ? other.getVersion() == null : this.getVersion().equals(other.getVersion())) - && (this.getExpressPrice2() == null ? other.getExpressPrice2() == null : this.getExpressPrice2().equals(other.getExpressPrice2())) + && (this.getExpressPrice1() == null ? other.getExpressPrice1() == null : this.getExpressPrice1().equals(other.getExpressPrice1())) && (this.getIsRecycle() == null ? other.getIsRecycle() == null : this.getIsRecycle().equals(other.getIsRecycle())) && (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate())) && (this.getBeforeUpdateExpress() == null ? other.getBeforeUpdateExpress() == null : this.getBeforeUpdateExpress().equals(other.getBeforeUpdateExpress())) @@ -1017,11 +1257,11 @@ public class CyymallOrder implements Serializable { result = prime * result + ((getDiscount() == null) ? 0 : getDiscount().hashCode()); result = prime * result + ((getUserCouponId() == null) ? 0 : getUserCouponId().hashCode()); result = prime * result + ((getGiveIntegral() == null) ? 0 : getGiveIntegral().hashCode()); + result = prime * result + ((getParentId1() == null) ? 0 : getParentId1().hashCode()); result = prime * result + ((getParentId2() == null) ? 0 : getParentId2().hashCode()); - result = prime * result + ((getParentId3() == null) ? 0 : getParentId3().hashCode()); result = prime * result + ((getIsSale() == null) ? 0 : getIsSale().hashCode()); result = prime * result + ((getVersion() == null) ? 0 : getVersion().hashCode()); - result = prime * result + ((getExpressPrice2() == null) ? 0 : getExpressPrice2().hashCode()); + result = prime * result + ((getExpressPrice1() == null) ? 0 : getExpressPrice1().hashCode()); result = prime * result + ((getIsRecycle() == null) ? 0 : getIsRecycle().hashCode()); result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode()); result = prime * result + ((getBeforeUpdateExpress() == null) ? 0 : getBeforeUpdateExpress().hashCode()); @@ -1112,11 +1352,11 @@ public class CyymallOrder implements Serializable { sb.append(", discount=").append(discount); sb.append(", userCouponId=").append(userCouponId); sb.append(", giveIntegral=").append(giveIntegral); + sb.append(", parentId1=").append(parentId1); sb.append(", parentId2=").append(parentId2); - sb.append(", parentId3=").append(parentId3); sb.append(", isSale=").append(isSale); sb.append(", version=").append(version); - sb.append(", expressPrice2=").append(expressPrice2); + sb.append(", expressPrice1=").append(expressPrice1); sb.append(", isRecycle=").append(isRecycle); sb.append(", rebate=").append(rebate); sb.append(", beforeUpdateExpress=").append(beforeUpdateExpress); diff --git a/service/src/main/java/com/hfkj/entity/CyymallOrderExample.java b/service/src/main/java/com/hfkj/entity/CyymallOrderExample.java index 1c42617..fa922ed 100644 --- a/service/src/main/java/com/hfkj/entity/CyymallOrderExample.java +++ b/service/src/main/java/com/hfkj/entity/CyymallOrderExample.java @@ -2475,123 +2475,123 @@ public class CyymallOrderExample { return (Criteria) this; } - public Criteria andParentId2IsNull() { - addCriterion("parent_id_2 is null"); + public Criteria andParentId1IsNull() { + addCriterion("parent_id_1 is null"); return (Criteria) this; } - public Criteria andParentId2IsNotNull() { - addCriterion("parent_id_2 is not null"); + public Criteria andParentId1IsNotNull() { + addCriterion("parent_id_1 is not null"); return (Criteria) this; } - public Criteria andParentId2EqualTo(Integer value) { - addCriterion("parent_id_2 =", value, "parentId2"); + public Criteria andParentId1EqualTo(Integer value) { + addCriterion("parent_id_1 =", value, "parentId1"); return (Criteria) this; } - public Criteria andParentId2NotEqualTo(Integer value) { - addCriterion("parent_id_2 <>", value, "parentId2"); + public Criteria andParentId1NotEqualTo(Integer value) { + addCriterion("parent_id_1 <>", value, "parentId1"); return (Criteria) this; } - public Criteria andParentId2GreaterThan(Integer value) { - addCriterion("parent_id_2 >", value, "parentId2"); + public Criteria andParentId1GreaterThan(Integer value) { + addCriterion("parent_id_1 >", value, "parentId1"); return (Criteria) this; } - public Criteria andParentId2GreaterThanOrEqualTo(Integer value) { - addCriterion("parent_id_2 >=", value, "parentId2"); + public Criteria andParentId1GreaterThanOrEqualTo(Integer value) { + addCriterion("parent_id_1 >=", value, "parentId1"); return (Criteria) this; } - public Criteria andParentId2LessThan(Integer value) { - addCriterion("parent_id_2 <", value, "parentId2"); + public Criteria andParentId1LessThan(Integer value) { + addCriterion("parent_id_1 <", value, "parentId1"); return (Criteria) this; } - public Criteria andParentId2LessThanOrEqualTo(Integer value) { - addCriterion("parent_id_2 <=", value, "parentId2"); + public Criteria andParentId1LessThanOrEqualTo(Integer value) { + addCriterion("parent_id_1 <=", value, "parentId1"); return (Criteria) this; } - public Criteria andParentId2In(List values) { - addCriterion("parent_id_2 in", values, "parentId2"); + public Criteria andParentId1In(List values) { + addCriterion("parent_id_1 in", values, "parentId1"); return (Criteria) this; } - public Criteria andParentId2NotIn(List values) { - addCriterion("parent_id_2 not in", values, "parentId2"); + public Criteria andParentId1NotIn(List values) { + addCriterion("parent_id_1 not in", values, "parentId1"); return (Criteria) this; } - public Criteria andParentId2Between(Integer value1, Integer value2) { - addCriterion("parent_id_2 between", value1, value2, "parentId2"); + public Criteria andParentId1Between(Integer value1, Integer value2) { + addCriterion("parent_id_1 between", value1, value2, "parentId1"); return (Criteria) this; } - public Criteria andParentId2NotBetween(Integer value1, Integer value2) { - addCriterion("parent_id_2 not between", value1, value2, "parentId2"); + public Criteria andParentId1NotBetween(Integer value1, Integer value2) { + addCriterion("parent_id_1 not between", value1, value2, "parentId1"); return (Criteria) this; } - public Criteria andParentId3IsNull() { - addCriterion("parent_id_3 is null"); + public Criteria andParentId2IsNull() { + addCriterion("parent_id_2 is null"); return (Criteria) this; } - public Criteria andParentId3IsNotNull() { - addCriterion("parent_id_3 is not null"); + public Criteria andParentId2IsNotNull() { + addCriterion("parent_id_2 is not null"); return (Criteria) this; } - public Criteria andParentId3EqualTo(Integer value) { - addCriterion("parent_id_3 =", value, "parentId3"); + public Criteria andParentId2EqualTo(Integer value) { + addCriterion("parent_id_2 =", value, "parentId2"); return (Criteria) this; } - public Criteria andParentId3NotEqualTo(Integer value) { - addCriterion("parent_id_3 <>", value, "parentId3"); + public Criteria andParentId2NotEqualTo(Integer value) { + addCriterion("parent_id_2 <>", value, "parentId2"); return (Criteria) this; } - public Criteria andParentId3GreaterThan(Integer value) { - addCriterion("parent_id_3 >", value, "parentId3"); + public Criteria andParentId2GreaterThan(Integer value) { + addCriterion("parent_id_2 >", value, "parentId2"); return (Criteria) this; } - public Criteria andParentId3GreaterThanOrEqualTo(Integer value) { - addCriterion("parent_id_3 >=", value, "parentId3"); + public Criteria andParentId2GreaterThanOrEqualTo(Integer value) { + addCriterion("parent_id_2 >=", value, "parentId2"); return (Criteria) this; } - public Criteria andParentId3LessThan(Integer value) { - addCriterion("parent_id_3 <", value, "parentId3"); + public Criteria andParentId2LessThan(Integer value) { + addCriterion("parent_id_2 <", value, "parentId2"); return (Criteria) this; } - public Criteria andParentId3LessThanOrEqualTo(Integer value) { - addCriterion("parent_id_3 <=", value, "parentId3"); + public Criteria andParentId2LessThanOrEqualTo(Integer value) { + addCriterion("parent_id_2 <=", value, "parentId2"); return (Criteria) this; } - public Criteria andParentId3In(List values) { - addCriterion("parent_id_3 in", values, "parentId3"); + public Criteria andParentId2In(List values) { + addCriterion("parent_id_2 in", values, "parentId2"); return (Criteria) this; } - public Criteria andParentId3NotIn(List values) { - addCriterion("parent_id_3 not in", values, "parentId3"); + public Criteria andParentId2NotIn(List values) { + addCriterion("parent_id_2 not in", values, "parentId2"); return (Criteria) this; } - public Criteria andParentId3Between(Integer value1, Integer value2) { - addCriterion("parent_id_3 between", value1, value2, "parentId3"); + public Criteria andParentId2Between(Integer value1, Integer value2) { + addCriterion("parent_id_2 between", value1, value2, "parentId2"); return (Criteria) this; } - public Criteria andParentId3NotBetween(Integer value1, Integer value2) { - addCriterion("parent_id_3 not between", value1, value2, "parentId3"); + public Criteria andParentId2NotBetween(Integer value1, Integer value2) { + addCriterion("parent_id_2 not between", value1, value2, "parentId2"); return (Criteria) this; } @@ -2725,63 +2725,63 @@ public class CyymallOrderExample { return (Criteria) this; } - public Criteria andExpressPrice2IsNull() { - addCriterion("express_price_2 is null"); + public Criteria andExpressPrice1IsNull() { + addCriterion("express_price_1 is null"); return (Criteria) this; } - public Criteria andExpressPrice2IsNotNull() { - addCriterion("express_price_2 is not null"); + public Criteria andExpressPrice1IsNotNull() { + addCriterion("express_price_1 is not null"); return (Criteria) this; } - public Criteria andExpressPrice2EqualTo(BigDecimal value) { - addCriterion("express_price_2 =", value, "expressPrice2"); + public Criteria andExpressPrice1EqualTo(BigDecimal value) { + addCriterion("express_price_1 =", value, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2NotEqualTo(BigDecimal value) { - addCriterion("express_price_2 <>", value, "expressPrice2"); + public Criteria andExpressPrice1NotEqualTo(BigDecimal value) { + addCriterion("express_price_1 <>", value, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2GreaterThan(BigDecimal value) { - addCriterion("express_price_2 >", value, "expressPrice2"); + public Criteria andExpressPrice1GreaterThan(BigDecimal value) { + addCriterion("express_price_1 >", value, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2GreaterThanOrEqualTo(BigDecimal value) { - addCriterion("express_price_2 >=", value, "expressPrice2"); + public Criteria andExpressPrice1GreaterThanOrEqualTo(BigDecimal value) { + addCriterion("express_price_1 >=", value, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2LessThan(BigDecimal value) { - addCriterion("express_price_2 <", value, "expressPrice2"); + public Criteria andExpressPrice1LessThan(BigDecimal value) { + addCriterion("express_price_1 <", value, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2LessThanOrEqualTo(BigDecimal value) { - addCriterion("express_price_2 <=", value, "expressPrice2"); + public Criteria andExpressPrice1LessThanOrEqualTo(BigDecimal value) { + addCriterion("express_price_1 <=", value, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2In(List values) { - addCriterion("express_price_2 in", values, "expressPrice2"); + public Criteria andExpressPrice1In(List values) { + addCriterion("express_price_1 in", values, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2NotIn(List values) { - addCriterion("express_price_2 not in", values, "expressPrice2"); + public Criteria andExpressPrice1NotIn(List values) { + addCriterion("express_price_1 not in", values, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2Between(BigDecimal value1, BigDecimal value2) { - addCriterion("express_price_2 between", value1, value2, "expressPrice2"); + public Criteria andExpressPrice1Between(BigDecimal value1, BigDecimal value2) { + addCriterion("express_price_1 between", value1, value2, "expressPrice1"); return (Criteria) this; } - public Criteria andExpressPrice2NotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("express_price_2 not between", value1, value2, "expressPrice2"); + public Criteria andExpressPrice1NotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("express_price_1 not between", value1, value2, "expressPrice1"); return (Criteria) this; } diff --git a/service/src/main/java/com/hfkj/entity/CyymallOrderWithBLOBs.java b/service/src/main/java/com/hfkj/entity/CyymallOrderWithBLOBs.java index 9cc7cec..b64b03b 100644 --- a/service/src/main/java/com/hfkj/entity/CyymallOrderWithBLOBs.java +++ b/service/src/main/java/com/hfkj/entity/CyymallOrderWithBLOBs.java @@ -9,14 +9,29 @@ import java.io.Serializable; public class CyymallOrderWithBLOBs extends CyymallOrder implements Serializable { private String content; + /** + * 收货地址信息，json格式 + */ private String addressData; + /** + * 核销码 + */ private String offlineQrcode; + /** + * 积分使用 + */ private String integral; + /** + * 商家留言 + */ private String words; + /** + * 商家备注 + */ private String sellerComments; private static final long serialVersionUID = 1L; @@ -119,11 +134,11 @@ public class CyymallOrderWithBLOBs extends CyymallOrder implements Serializable && (this.getDiscount() == null ? other.getDiscount() == null : this.getDiscount().equals(other.getDiscount())) && (this.getUserCouponId() == null ? other.getUserCouponId() == null : this.getUserCouponId().equals(other.getUserCouponId())) && (this.getGiveIntegral() == null ? other.getGiveIntegral() == null : this.getGiveIntegral().equals(other.getGiveIntegral())) + && (this.getParentId1() == null ? other.getParentId1() == null : this.getParentId1().equals(other.getParentId1())) && (this.getParentId2() == null ? other.getParentId2() == null : this.getParentId2().equals(other.getParentId2())) - && (this.getParentId3() == null ? other.getParentId3() == null : this.getParentId3().equals(other.getParentId3())) && (this.getIsSale() == null ? other.getIsSale() == null : this.getIsSale().equals(other.getIsSale())) && (this.getVersion() == null ? other.getVersion() == null : this.getVersion().equals(other.getVersion())) - && (this.getExpressPrice2() == null ? other.getExpressPrice2() == null : this.getExpressPrice2().equals(other.getExpressPrice2())) + && (this.getExpressPrice1() == null ? other.getExpressPrice1() == null : this.getExpressPrice1().equals(other.getExpressPrice1())) && (this.getIsRecycle() == null ? other.getIsRecycle() == null : this.getIsRecycle().equals(other.getIsRecycle())) && (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate())) && (this.getBeforeUpdateExpress() == null ? other.getBeforeUpdateExpress() == null : this.getBeforeUpdateExpress().equals(other.getBeforeUpdateExpress())) @@ -217,11 +232,11 @@ public class CyymallOrderWithBLOBs extends CyymallOrder implements Serializable result = prime * result + ((getDiscount() == null) ? 0 : getDiscount().hashCode()); result = prime * result + ((getUserCouponId() == null) ? 0 : getUserCouponId().hashCode()); result = prime * result + ((getGiveIntegral() == null) ? 0 : getGiveIntegral().hashCode()); + result = prime * result + ((getParentId1() == null) ? 0 : getParentId1().hashCode()); result = prime * result + ((getParentId2() == null) ? 0 : getParentId2().hashCode()); - result = prime * result + ((getParentId3() == null) ? 0 : getParentId3().hashCode()); result = prime * result + ((getIsSale() == null) ? 0 : getIsSale().hashCode()); result = prime * result + ((getVersion() == null) ? 0 : getVersion().hashCode()); - result = prime * result + ((getExpressPrice2() == null) ? 0 : getExpressPrice2().hashCode()); + result = prime * result + ((getExpressPrice1() == null) ? 0 : getExpressPrice1().hashCode()); result = prime * result + ((getIsRecycle() == null) ? 0 : getIsRecycle().hashCode()); result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode()); result = prime * result + ((getBeforeUpdateExpress() == null) ? 0 : getBeforeUpdateExpress().hashCode());