hurui
/
puhui-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
master
袁野 2 months ago
parent 55a77a6540
commit ff042ed941
8 changed files with 472 additions and 859 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 107
      service/src/main/java/com/hfkj/dao/BsOrderMapper.java
  2. 212
      service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java
  3. 2
      service/src/main/java/com/hfkj/dao/GoodsShoppingCartMapper.java
  4. 2
      service/src/main/java/com/hfkj/dao/GoodsShoppingCartSqlProvider.java
  5. 242
      service/src/main/java/com/hfkj/entity/BsOrder.java
  6. 762
      service/src/main/java/com/hfkj/entity/BsOrderExample.java
  7. 2
      service/src/main/java/com/hfkj/entity/GoodsShoppingCart.java
  8. 2
      service/src/main/java/com/hfkj/entity/GoodsShoppingCartExample.java

107
service/src/main/java/com/hfkj/dao/BsOrderMapper.java
Unescape View File

@ -39,27 +39,23 @@ public interface BsOrderMapper extends BsOrderMapperExt {
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
@Insert({ @Insert({
"insert into bs_order (user_id, user_name, ", "insert into bs_order (order_no, user_id, ",
"user_phone, order_no, ", "user_phone, img, ",
"pay_channel, pay_channel_order_no, ", "goods_name, customParameters, ",
"pay_serial_no, pay_type, ", "goods_count, total_price, ",
"total_price, pay_real_price, ", "promotionAmount, `status`, ",
"payment, product_total_price, ", "create_time, pay_time, ",
"create_time, update_time, ",
"pay_time, finish_time, ",
"cancel_time, refund_time, ", "cancel_time, refund_time, ",
"order_status, remarks, ", "finish_time, update_time, ",
"ext_1, ext_2, ext_3)", "ext_1, ext_2, ext_3)",
"values (#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ", "values (#{orderNo,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
"#{userPhone,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, ", "#{userPhone,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, ",
"#{payChannel,jdbcType=INTEGER}, #{payChannelOrderNo,jdbcType=VARCHAR}, ", "#{goodsName,jdbcType=VARCHAR}, #{customparameters,jdbcType=VARCHAR}, ",
"#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", "#{goodsCount,jdbcType=INTEGER}, #{totalPrice,jdbcType=DECIMAL}, ",
"#{totalPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", "#{promotionamount,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ",
"#{payment,jdbcType=DECIMAL}, #{productTotalPrice,jdbcType=DECIMAL}, ", "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{payTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
"#{cancelTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ", "#{cancelTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ",
"#{orderStatus,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, ", "#{finishTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
}) })
@Options(useGeneratedKeys=true,keyProperty="id") @Options(useGeneratedKeys=true,keyProperty="id")
@ -72,26 +68,22 @@ public interface BsOrderMapper extends BsOrderMapperExt {
@SelectProvider(type=BsOrderSqlProvider.class, method="selectByExample") @SelectProvider(type=BsOrderSqlProvider.class, method="selectByExample")
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR),
@Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
@Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_channel_order_no", property="payChannelOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="customParameters", property="customparameters", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
@Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
@Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL),
@Result(column="payment", property="payment", jdbcType=JdbcType.DECIMAL), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="product_total_price", property="productTotalPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", 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)
@ -100,35 +92,30 @@ public interface BsOrderMapper extends BsOrderMapperExt {
@Select({ @Select({
"select", "select",
"id, user_id, user_name, user_phone, order_no, pay_channel, pay_channel_order_no, ", "id, order_no, user_id, user_phone, img, goods_name, customParameters, goods_count, ",
"pay_serial_no, pay_type, total_price, pay_real_price, payment, product_total_price, ", "total_price, promotionAmount, `status`, create_time, pay_time, cancel_time, ",
"create_time, update_time, pay_time, finish_time, cancel_time, refund_time, order_status, ", "refund_time, finish_time, update_time, ext_1, ext_2, ext_3",
"remarks, ext_1, ext_2, ext_3",
"from bs_order", "from bs_order",
"where id = #{id,jdbcType=BIGINT}" "where id = #{id,jdbcType=BIGINT}"
}) })
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR),
@Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR),
@Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
@Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_channel_order_no", property="payChannelOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="customParameters", property="customparameters", jdbcType=JdbcType.VARCHAR),
@Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
@Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER),
@Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL),
@Result(column="payment", property="payment", jdbcType=JdbcType.DECIMAL), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="product_total_price", property="productTotalPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="order_status", property="orderStatus", jdbcType=JdbcType.INTEGER), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", 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)
@ -146,26 +133,22 @@ public interface BsOrderMapper extends BsOrderMapperExt {
@Update({ @Update({
"update bs_order", "update bs_order",
"set user_id = #{userId,jdbcType=BIGINT},", "set order_no = #{orderNo,jdbcType=VARCHAR},",
"user_name = #{userName,jdbcType=VARCHAR},", "user_id = #{userId,jdbcType=BIGINT},",
"user_phone = #{userPhone,jdbcType=VARCHAR},", "user_phone = #{userPhone,jdbcType=VARCHAR},",
"order_no = #{orderNo,jdbcType=VARCHAR},", "img = #{img,jdbcType=VARCHAR},",
"pay_channel = #{payChannel,jdbcType=INTEGER},", "goods_name = #{goodsName,jdbcType=VARCHAR},",
"pay_channel_order_no = #{payChannelOrderNo,jdbcType=VARCHAR},", "customParameters = #{customparameters,jdbcType=VARCHAR},",
"pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", "goods_count = #{goodsCount,jdbcType=INTEGER},",
"pay_type = #{payType,jdbcType=INTEGER},",
"total_price = #{totalPrice,jdbcType=DECIMAL},", "total_price = #{totalPrice,jdbcType=DECIMAL},",
"pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "promotionAmount = #{promotionamount,jdbcType=DECIMAL},",
"payment = #{payment,jdbcType=DECIMAL},", "`status` = #{status,jdbcType=INTEGER},",
"product_total_price = #{productTotalPrice,jdbcType=DECIMAL},",
"create_time = #{createTime,jdbcType=TIMESTAMP},", "create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",
"pay_time = #{payTime,jdbcType=TIMESTAMP},", "pay_time = #{payTime,jdbcType=TIMESTAMP},",
"finish_time = #{finishTime,jdbcType=TIMESTAMP},",
"cancel_time = #{cancelTime,jdbcType=TIMESTAMP},", "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},",
"refund_time = #{refundTime,jdbcType=TIMESTAMP},", "refund_time = #{refundTime,jdbcType=TIMESTAMP},",
"order_status = #{orderStatus,jdbcType=INTEGER},", "finish_time = #{finishTime,jdbcType=TIMESTAMP},",
"remarks = #{remarks,jdbcType=VARCHAR},", "update_time = #{updateTime,jdbcType=TIMESTAMP},",
"ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}", "ext_3 = #{ext3,jdbcType=VARCHAR}",

212
service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java
Unescape View File

@ -28,70 +28,54 @@ public class BsOrderSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.INSERT_INTO("bs_order"); sql.INSERT_INTO("bs_order");
if (record.getUserId() != null) { if (record.getOrderNo() != null) {
sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}");
} }
if (record.getUserName() != null) { if (record.getUserId() != null) {
sql.VALUES("user_name", "#{userName,jdbcType=VARCHAR}"); sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}");
} }
if (record.getUserPhone() != null) { if (record.getUserPhone() != null) {
sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}"); sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}");
} }
if (record.getOrderNo() != null) { if (record.getImg() != null) {
sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); sql.VALUES("img", "#{img,jdbcType=VARCHAR}");
} }
if (record.getPayChannel() != null) { if (record.getGoodsName() != null) {
sql.VALUES("pay_channel", "#{payChannel,jdbcType=INTEGER}"); sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}");
} }
if (record.getPayChannelOrderNo() != null) { if (record.getCustomparameters() != null) {
sql.VALUES("pay_channel_order_no", "#{payChannelOrderNo,jdbcType=VARCHAR}"); sql.VALUES("customParameters", "#{customparameters,jdbcType=VARCHAR}");
} }
if (record.getPaySerialNo() != null) { if (record.getGoodsCount() != null) {
sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}"); sql.VALUES("goods_count", "#{goodsCount,jdbcType=INTEGER}");
}
if (record.getPayType() != null) {
sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}");
} }
if (record.getTotalPrice() != null) { if (record.getTotalPrice() != null) {
sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}"); sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}");
} }
if (record.getPayRealPrice() != null) { if (record.getPromotionamount() != null) {
sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}"); sql.VALUES("promotionAmount", "#{promotionamount,jdbcType=DECIMAL}");
} }
if (record.getPayment() != null) { if (record.getStatus() != null) {
sql.VALUES("payment", "#{payment,jdbcType=DECIMAL}"); sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
if (record.getProductTotalPrice() != null) {
sql.VALUES("product_total_price", "#{productTotalPrice,jdbcType=DECIMAL}");
} }
if (record.getCreateTime() != null) { if (record.getCreateTime() != null) {
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
} }
if (record.getUpdateTime() != null) {
sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getPayTime() != null) { if (record.getPayTime() != null) {
sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}"); sql.VALUES("pay_time", "#{payTime,jdbcType=TIMESTAMP}");
} }
if (record.getFinishTime() != null) {
sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}");
}
if (record.getCancelTime() != null) { if (record.getCancelTime() != null) {
sql.VALUES("cancel_time", "#{cancelTime,jdbcType=TIMESTAMP}"); sql.VALUES("cancel_time", "#{cancelTime,jdbcType=TIMESTAMP}");
} }
@ -100,12 +84,12 @@ public class BsOrderSqlProvider {
sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}"); sql.VALUES("refund_time", "#{refundTime,jdbcType=TIMESTAMP}");
} }
if (record.getOrderStatus() != null) { if (record.getFinishTime() != null) {
sql.VALUES("order_status", "#{orderStatus,jdbcType=INTEGER}"); sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}");
} }
if (record.getRemarks() != null) { if (record.getUpdateTime() != null) {
sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}"); sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
} }
if (record.getExt1() != null) { if (record.getExt1() != null) {
@ -130,26 +114,22 @@ public class BsOrderSqlProvider {
} else { } else {
sql.SELECT("id"); sql.SELECT("id");
} }
sql.SELECT("order_no");
sql.SELECT("user_id"); sql.SELECT("user_id");
sql.SELECT("user_name");
sql.SELECT("user_phone"); sql.SELECT("user_phone");
sql.SELECT("order_no"); sql.SELECT("img");
sql.SELECT("pay_channel"); sql.SELECT("goods_name");
sql.SELECT("pay_channel_order_no"); sql.SELECT("customParameters");
sql.SELECT("pay_serial_no"); sql.SELECT("goods_count");
sql.SELECT("pay_type");
sql.SELECT("total_price"); sql.SELECT("total_price");
sql.SELECT("pay_real_price"); sql.SELECT("promotionAmount");
sql.SELECT("payment"); sql.SELECT("`status`");
sql.SELECT("product_total_price");
sql.SELECT("create_time"); sql.SELECT("create_time");
sql.SELECT("update_time");
sql.SELECT("pay_time"); sql.SELECT("pay_time");
sql.SELECT("finish_time");
sql.SELECT("cancel_time"); sql.SELECT("cancel_time");
sql.SELECT("refund_time"); sql.SELECT("refund_time");
sql.SELECT("order_status"); sql.SELECT("finish_time");
sql.SELECT("remarks"); sql.SELECT("update_time");
sql.SELECT("ext_1"); sql.SELECT("ext_1");
sql.SELECT("ext_2"); sql.SELECT("ext_2");
sql.SELECT("ext_3"); sql.SELECT("ext_3");
@ -174,70 +154,54 @@ public class BsOrderSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
} }
if (record.getUserId() != null) { if (record.getOrderNo() != null) {
sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
} }
if (record.getUserName() != null) { if (record.getUserId() != null) {
sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
} }
if (record.getUserPhone() != null) { if (record.getUserPhone() != null) {
sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
} }
if (record.getOrderNo() != null) { if (record.getImg() != null) {
sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("img = #{record.img,jdbcType=VARCHAR}");
}
if (record.getPayChannel() != null) {
sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}");
} }
if (record.getPayChannelOrderNo() != null) { if (record.getGoodsName() != null) {
sql.SET("pay_channel_order_no = #{record.payChannelOrderNo,jdbcType=VARCHAR}"); sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
} }
if (record.getPaySerialNo() != null) { if (record.getCustomparameters() != null) {
sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); sql.SET("customParameters = #{record.customparameters,jdbcType=VARCHAR}");
} }
if (record.getPayType() != null) { if (record.getGoodsCount() != null) {
sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
} }
if (record.getTotalPrice() != null) { if (record.getTotalPrice() != null) {
sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
} }
if (record.getPayRealPrice() != null) { if (record.getPromotionamount() != null) {
sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}");
}
if (record.getPayment() != null) {
sql.SET("payment = #{record.payment,jdbcType=DECIMAL}");
} }
if (record.getProductTotalPrice() != null) { if (record.getStatus() != null) {
sql.SET("product_total_price = #{record.productTotalPrice,jdbcType=DECIMAL}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
} }
if (record.getCreateTime() != null) { if (record.getCreateTime() != null) {
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
} }
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
}
if (record.getPayTime() != null) { if (record.getPayTime() != null) {
sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}");
} }
if (record.getFinishTime() != null) {
sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
}
if (record.getCancelTime() != null) { if (record.getCancelTime() != null) {
sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}");
} }
@ -246,12 +210,12 @@ public class BsOrderSqlProvider {
sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
} }
if (record.getOrderStatus() != null) { if (record.getFinishTime() != null) {
sql.SET("order_status = #{record.orderStatus,jdbcType=INTEGER}"); sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
} }
if (record.getRemarks() != null) { if (record.getUpdateTime() != null) {
sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
} }
if (record.getExt1() != null) { if (record.getExt1() != null) {
@ -275,26 +239,22 @@ public class BsOrderSqlProvider {
sql.UPDATE("bs_order"); sql.UPDATE("bs_order");
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}");
sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}");
sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); sql.SET("img = #{record.img,jdbcType=VARCHAR}");
sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
sql.SET("pay_channel_order_no = #{record.payChannelOrderNo,jdbcType=VARCHAR}"); sql.SET("customParameters = #{record.customparameters,jdbcType=VARCHAR}");
sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}");
sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}"); sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}");
sql.SET("payment = #{record.payment,jdbcType=DECIMAL}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("product_total_price = #{record.productTotalPrice,jdbcType=DECIMAL}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}");
sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}");
sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}");
sql.SET("order_status = #{record.orderStatus,jdbcType=INTEGER}"); sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}");
sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
@ -308,70 +268,54 @@ public class BsOrderSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.UPDATE("bs_order"); sql.UPDATE("bs_order");
if (record.getUserId() != null) { if (record.getOrderNo() != null) {
sql.SET("user_id = #{userId,jdbcType=BIGINT}"); sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}");
} }
if (record.getUserName() != null) { if (record.getUserId() != null) {
sql.SET("user_name = #{userName,jdbcType=VARCHAR}"); sql.SET("user_id = #{userId,jdbcType=BIGINT}");
} }
if (record.getUserPhone() != null) { if (record.getUserPhone() != null) {
sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}"); sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}");
} }
if (record.getOrderNo() != null) { if (record.getImg() != null) {
sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); sql.SET("img = #{img,jdbcType=VARCHAR}");
} }
if (record.getPayChannel() != null) { if (record.getGoodsName() != null) {
sql.SET("pay_channel = #{payChannel,jdbcType=INTEGER}"); sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}");
} }
if (record.getPayChannelOrderNo() != null) { if (record.getCustomparameters() != null) {
sql.SET("pay_channel_order_no = #{payChannelOrderNo,jdbcType=VARCHAR}"); sql.SET("customParameters = #{customparameters,jdbcType=VARCHAR}");
} }
if (record.getPaySerialNo() != null) { if (record.getGoodsCount() != null) {
sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}"); sql.SET("goods_count = #{goodsCount,jdbcType=INTEGER}");
}
if (record.getPayType() != null) {
sql.SET("pay_type = #{payType,jdbcType=INTEGER}");
} }
if (record.getTotalPrice() != null) { if (record.getTotalPrice() != null) {
sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}"); sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}");
} }
if (record.getPayRealPrice() != null) { if (record.getPromotionamount() != null) {
sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}"); sql.SET("promotionAmount = #{promotionamount,jdbcType=DECIMAL}");
}
if (record.getPayment() != null) {
sql.SET("payment = #{payment,jdbcType=DECIMAL}");
} }
if (record.getProductTotalPrice() != null) { if (record.getStatus() != null) {
sql.SET("product_total_price = #{productTotalPrice,jdbcType=DECIMAL}"); sql.SET("`status` = #{status,jdbcType=INTEGER}");
} }
if (record.getCreateTime() != null) { if (record.getCreateTime() != null) {
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
} }
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getPayTime() != null) { if (record.getPayTime() != null) {
sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}"); sql.SET("pay_time = #{payTime,jdbcType=TIMESTAMP}");
} }
if (record.getFinishTime() != null) {
sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}");
}
if (record.getCancelTime() != null) { if (record.getCancelTime() != null) {
sql.SET("cancel_time = #{cancelTime,jdbcType=TIMESTAMP}"); sql.SET("cancel_time = #{cancelTime,jdbcType=TIMESTAMP}");
} }
@ -380,12 +324,12 @@ public class BsOrderSqlProvider {
sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}"); sql.SET("refund_time = #{refundTime,jdbcType=TIMESTAMP}");
} }
if (record.getOrderStatus() != null) { if (record.getFinishTime() != null) {
sql.SET("order_status = #{orderStatus,jdbcType=INTEGER}"); sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}");
} }
if (record.getRemarks() != null) { if (record.getUpdateTime() != null) {
sql.SET("remarks = #{remarks,jdbcType=VARCHAR}"); sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
} }
if (record.getExt1() != null) { if (record.getExt1() != null) {

2
service/src/main/java/com/hfkj/dao/GoodsShoppingCartMapper.java
Unescape View File

@ -153,4 +153,4 @@ public interface GoodsShoppingCartMapper extends GoodsShoppingCartMapperExt {
"where id = #{id,jdbcType=BIGINT}" "where id = #{id,jdbcType=BIGINT}"
}) })
int updateByPrimaryKey(GoodsShoppingCart record); int updateByPrimaryKey(GoodsShoppingCart record);
} }

2
service/src/main/java/com/hfkj/dao/GoodsShoppingCartSqlProvider.java
Unescape View File

@ -441,4 +441,4 @@ public class GoodsShoppingCartSqlProvider {
sql.WHERE(sb.toString()); sql.WHERE(sb.toString());
} }
} }
} }

242
service/src/main/java/com/hfkj/entity/BsOrder.java
Unescape View File

@ -15,19 +15,19 @@ import java.util.Date;
**/ **/
public class BsOrder implements Serializable { public class BsOrder implements Serializable {
/** /**
* 主键ID * 主键
*/ */
private Long id; private Long id;
/** /**
* 用户id * 交易订单号
*/ */
private Long userId; private String orderNo;
/** /**
* 用户名称 * 用户id
*/ */
private String userName; private Long userId;
/** /**
* 用户手机号 * 用户手机号
@ -35,70 +35,50 @@ public class BsOrder implements Serializable {
private String userPhone; private String userPhone;
/** /**
* 订单号 * 图片
*/
private String orderNo;
/**
* 支付渠道 1：惠支付 2：微信合作商 3：贵州银行 4：汇联通
*/ */
private Integer payChannel; private String img;
/** /**
* 支付渠道流水号 * 商品名称
*/ */
private String payChannelOrderNo; private String goodsName;
/** /**
* 客户支付流水号 * 自定义参数
*/ */
private String paySerialNo; private String customparameters;
/** /**
* 支付方式 1：微信 2: 支付宝 3：快捷支付 4：工会卡 * 商品数量
*/ */
private Integer payType; private Integer goodsCount;
/** /**
* 订单总金额 * 交易金额
*/ */
private BigDecimal totalPrice; private BigDecimal totalPrice;
/** /**
* 应付金额 * 佣金金额
*/
private BigDecimal payRealPrice;
/**
* 支付金额
*/ */
private BigDecimal payment; private BigDecimal promotionamount;
/** /**
* 商品总金额 * 0-已支付；1-已成团；2-确认收货；3-审核成功；4-审核失败（不可提现）；5-已经结算 ;10-已处罚
*/ */
private BigDecimal productTotalPrice; private Integer status;
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/**
* 修改时间
*/
private Date updateTime;
/** /**
* 支付时间 * 支付时间
*/ */
private Date payTime; private Date payTime;
/**
* 完成时间
*/
private Date finishTime;
/** /**
* 取消时间 * 取消时间
*/ */
@ -110,14 +90,14 @@ public class BsOrder implements Serializable {
private Date refundTime; private Date refundTime;
/** /**
* 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 * 完成时间
*/ */
private Integer orderStatus; private Date finishTime;
/** /**
* 备注 * 更新时间
*/ */
private String remarks; private Date updateTime;
private String ext1; private String ext1;
@ -135,20 +115,20 @@ public class BsOrder implements Serializable {
this.id = id; this.id = id;
} }
public Long getUserId() { public String getOrderNo() {
return userId; return orderNo;
} }
public void setUserId(Long userId) { public void setOrderNo(String orderNo) {
this.userId = userId; this.orderNo = orderNo;
} }
public String getUserName() { public Long getUserId() {
return userName; return userId;
} }
public void setUserName(String userName) { public void setUserId(Long userId) {
this.userName = userName; this.userId = userId;
} }
public String getUserPhone() { public String getUserPhone() {
@ -159,44 +139,36 @@ public class BsOrder implements Serializable {
this.userPhone = userPhone; this.userPhone = userPhone;
} }
public String getOrderNo() { public String getImg() {
return orderNo; return img;
} }
public void setOrderNo(String orderNo) { public void setImg(String img) {
this.orderNo = orderNo; this.img = img;
} }
public Integer getPayChannel() { public String getGoodsName() {
return payChannel; return goodsName;
} }
public void setPayChannel(Integer payChannel) { public void setGoodsName(String goodsName) {
this.payChannel = payChannel; this.goodsName = goodsName;
} }
public String getPayChannelOrderNo() { public String getCustomparameters() {
return payChannelOrderNo; return customparameters;
} }
public void setPayChannelOrderNo(String payChannelOrderNo) { public void setCustomparameters(String customparameters) {
this.payChannelOrderNo = payChannelOrderNo; this.customparameters = customparameters;
} }
public String getPaySerialNo() { public Integer getGoodsCount() {
return paySerialNo; return goodsCount;
} }
public void setPaySerialNo(String paySerialNo) { public void setGoodsCount(Integer goodsCount) {
this.paySerialNo = paySerialNo; this.goodsCount = goodsCount;
}
public Integer getPayType() {
return payType;
}
public void setPayType(Integer payType) {
this.payType = payType;
} }
public BigDecimal getTotalPrice() { public BigDecimal getTotalPrice() {
@ -207,28 +179,20 @@ public class BsOrder implements Serializable {
this.totalPrice = totalPrice; this.totalPrice = totalPrice;
} }
public BigDecimal getPayRealPrice() { public BigDecimal getPromotionamount() {
return payRealPrice; return promotionamount;
}
public void setPayRealPrice(BigDecimal payRealPrice) {
this.payRealPrice = payRealPrice;
}
public BigDecimal getPayment() {
return payment;
} }
public void setPayment(BigDecimal payment) { public void setPromotionamount(BigDecimal promotionamount) {
this.payment = payment; this.promotionamount = promotionamount;
} }
public BigDecimal getProductTotalPrice() { public Integer getStatus() {
return productTotalPrice; return status;
} }
public void setProductTotalPrice(BigDecimal productTotalPrice) { public void setStatus(Integer status) {
this.productTotalPrice = productTotalPrice; this.status = status;
} }
public Date getCreateTime() { public Date getCreateTime() {
@ -239,14 +203,6 @@ public class BsOrder implements Serializable {
this.createTime = createTime; this.createTime = createTime;
} }
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Date getPayTime() { public Date getPayTime() {
return payTime; return payTime;
} }
@ -255,14 +211,6 @@ public class BsOrder implements Serializable {
this.payTime = payTime; this.payTime = payTime;
} }
public Date getFinishTime() {
return finishTime;
}
public void setFinishTime(Date finishTime) {
this.finishTime = finishTime;
}
public Date getCancelTime() { public Date getCancelTime() {
return cancelTime; return cancelTime;
} }
@ -279,20 +227,20 @@ public class BsOrder implements Serializable {
this.refundTime = refundTime; this.refundTime = refundTime;
} }
public Integer getOrderStatus() { public Date getFinishTime() {
return orderStatus; return finishTime;
} }
public void setOrderStatus(Integer orderStatus) { public void setFinishTime(Date finishTime) {
this.orderStatus = orderStatus; this.finishTime = finishTime;
} }
public String getRemarks() { public Date getUpdateTime() {
return remarks; return updateTime;
} }
public void setRemarks(String remarks) { public void setUpdateTime(Date updateTime) {
this.remarks = remarks; this.updateTime = updateTime;
} }
public String getExt1() { public String getExt1() {
@ -332,26 +280,22 @@ public class BsOrder implements Serializable {
} }
BsOrder other = (BsOrder) that; BsOrder other = (BsOrder) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()))
&& (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone()))
&& (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
&& (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel())) && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName()))
&& (this.getPayChannelOrderNo() == null ? other.getPayChannelOrderNo() == null : this.getPayChannelOrderNo().equals(other.getPayChannelOrderNo())) && (this.getCustomparameters() == null ? other.getCustomparameters() == null : this.getCustomparameters().equals(other.getCustomparameters()))
&& (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) && (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount()))
&& (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
&& (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice()))
&& (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) && (this.getPromotionamount() == null ? other.getPromotionamount() == null : this.getPromotionamount().equals(other.getPromotionamount()))
&& (this.getPayment() == null ? other.getPayment() == null : this.getPayment().equals(other.getPayment())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getProductTotalPrice() == null ? other.getProductTotalPrice() == null : this.getProductTotalPrice().equals(other.getProductTotalPrice()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime()))
&& (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
&& (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime()))
&& (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime()))
&& (this.getOrderStatus() == null ? other.getOrderStatus() == null : this.getOrderStatus().equals(other.getOrderStatus())) && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime()))
&& (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) && (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()));
@ -362,26 +306,22 @@ public class BsOrder implements Serializable {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode());
result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode()); result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode());
result = prime * result + ((getPayChannelOrderNo() == null) ? 0 : getPayChannelOrderNo().hashCode()); result = prime * result + ((getCustomparameters() == null) ? 0 : getCustomparameters().hashCode());
result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode());
result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode());
result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode());
result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); result = prime * result + ((getPromotionamount() == null) ? 0 : getPromotionamount().hashCode());
result = prime * result + ((getPayment() == null) ? 0 : getPayment().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getProductTotalPrice() == null) ? 0 : getProductTotalPrice().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode());
result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode());
result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode()); result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode());
result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode());
result = prime * result + ((getOrderStatus() == null) ? 0 : getOrderStatus().hashCode()); result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode());
result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
@ -395,26 +335,22 @@ public class BsOrder implements Serializable {
sb.append(" ["); sb.append(" [");
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", orderNo=").append(orderNo);
sb.append(", userId=").append(userId); sb.append(", userId=").append(userId);
sb.append(", userName=").append(userName);
sb.append(", userPhone=").append(userPhone); sb.append(", userPhone=").append(userPhone);
sb.append(", orderNo=").append(orderNo); sb.append(", img=").append(img);
sb.append(", payChannel=").append(payChannel); sb.append(", goodsName=").append(goodsName);
sb.append(", payChannelOrderNo=").append(payChannelOrderNo); sb.append(", customparameters=").append(customparameters);
sb.append(", paySerialNo=").append(paySerialNo); sb.append(", goodsCount=").append(goodsCount);
sb.append(", payType=").append(payType);
sb.append(", totalPrice=").append(totalPrice); sb.append(", totalPrice=").append(totalPrice);
sb.append(", payRealPrice=").append(payRealPrice); sb.append(", promotionamount=").append(promotionamount);
sb.append(", payment=").append(payment); sb.append(", status=").append(status);
sb.append(", productTotalPrice=").append(productTotalPrice);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", payTime=").append(payTime); sb.append(", payTime=").append(payTime);
sb.append(", finishTime=").append(finishTime);
sb.append(", cancelTime=").append(cancelTime); sb.append(", cancelTime=").append(cancelTime);
sb.append(", refundTime=").append(refundTime); sb.append(", refundTime=").append(refundTime);
sb.append(", orderStatus=").append(orderStatus); sb.append(", finishTime=").append(finishTime);
sb.append(", remarks=").append(remarks); sb.append(", updateTime=").append(updateTime);
sb.append(", ext1=").append(ext1); sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2); sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3); sb.append(", ext3=").append(ext3);

762
service/src/main/java/com/hfkj/entity/BsOrderExample.java
View File

File diff suppressed because it is too large Load Diff

2
service/src/main/java/com/hfkj/entity/GoodsShoppingCart.java
Unescape View File

@ -367,4 +367,4 @@ public class GoodsShoppingCart implements Serializable {
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
} }

2
service/src/main/java/com/hfkj/entity/GoodsShoppingCartExample.java
Unescape View File

@ -1491,4 +1491,4 @@ public class GoodsShoppingCartExample {
this(condition, value, secondValue, null); this(condition, value, secondValue, null);
} }
} }
} }
Write Preview
Loading…
Cancel
Save