From f31d36a3d7bc52322d95ccb79232a9dade95250c Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 2 Nov 2022 16:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hai/dao/HighOrderRefundMapper.java | 8 ++++---- .../hai/dao/HighOrderRefundSqlProvider.java | 8 ++++---- .../java/com/hai/entity/HighOrderRefund.java | 6 +++--- .../hai/entity/HighOrderRefundExample.java | 20 +++++++++---------- .../impl/OrderPaySuccessServiceImpl.java | 2 +- .../service/impl/OrderRefundServiceImpl.java | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java index f3b1f059..74893c8e 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderRefundMapper.java @@ -68,7 +68,7 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { "#{refundStatus,jdbcType=INTEGER}, #{refundFailReason,jdbcType=VARCHAR}, ", "#{createTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{opUserType,jdbcType=INTEGER}, ", - "#{opUserId,jdbcType=INTEGER}, #{opUserName,jdbcType=VARCHAR}, ", + "#{opUserId,jdbcType=BIGINT}, #{opUserName,jdbcType=VARCHAR}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ", "#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR}, #{ext6,jdbcType=VARCHAR})" }) @@ -109,7 +109,7 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="op_user_type", property="opUserType", jdbcType=JdbcType.INTEGER), - @Result(column="op_user_id", property="opUserId", jdbcType=JdbcType.INTEGER), + @Result(column="op_user_id", property="opUserId", jdbcType=JdbcType.BIGINT), @Result(column="op_user_name", property="opUserName", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @@ -160,7 +160,7 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="op_user_type", property="opUserType", jdbcType=JdbcType.INTEGER), - @Result(column="op_user_id", property="opUserId", jdbcType=JdbcType.INTEGER), + @Result(column="op_user_id", property="opUserId", jdbcType=JdbcType.BIGINT), @Result(column="op_user_name", property="opUserName", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @@ -209,7 +209,7 @@ public interface HighOrderRefundMapper extends HighOrderRefundMapperExt { "refund_time = #{refundTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", "op_user_type = #{opUserType,jdbcType=INTEGER},", - "op_user_id = #{opUserId,jdbcType=INTEGER},", + "op_user_id = #{opUserId,jdbcType=BIGINT},", "op_user_name = #{opUserName,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java index 91992de4..abcbeaff 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderRefundSqlProvider.java @@ -137,7 +137,7 @@ public class HighOrderRefundSqlProvider { } if (record.getOpUserId() != null) { - sql.VALUES("op_user_id", "#{opUserId,jdbcType=INTEGER}"); + sql.VALUES("op_user_id", "#{opUserId,jdbcType=BIGINT}"); } if (record.getOpUserName() != null) { @@ -343,7 +343,7 @@ public class HighOrderRefundSqlProvider { } if (record.getOpUserId() != null) { - sql.SET("op_user_id = #{record.opUserId,jdbcType=INTEGER}"); + sql.SET("op_user_id = #{record.opUserId,jdbcType=BIGINT}"); } if (record.getOpUserName() != null) { @@ -410,7 +410,7 @@ public class HighOrderRefundSqlProvider { sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("op_user_type = #{record.opUserType,jdbcType=INTEGER}"); - sql.SET("op_user_id = #{record.opUserId,jdbcType=INTEGER}"); + sql.SET("op_user_id = #{record.opUserId,jdbcType=BIGINT}"); sql.SET("op_user_name = #{record.opUserName,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); @@ -537,7 +537,7 @@ public class HighOrderRefundSqlProvider { } if (record.getOpUserId() != null) { - sql.SET("op_user_id = #{opUserId,jdbcType=INTEGER}"); + sql.SET("op_user_id = #{opUserId,jdbcType=BIGINT}"); } if (record.getOpUserName() != null) { diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderRefund.java b/hai-service/src/main/java/com/hai/entity/HighOrderRefund.java index 7403db5b..3d78d662 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderRefund.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderRefund.java @@ -170,7 +170,7 @@ public class HighOrderRefund implements Serializable { /** * 操作人id */ - private Integer opUserId; + private Long opUserId; /** * 操作人名称 @@ -415,11 +415,11 @@ public class HighOrderRefund implements Serializable { this.opUserType = opUserType; } - public Integer getOpUserId() { + public Long getOpUserId() { return opUserId; } - public void setOpUserId(Integer opUserId) { + public void setOpUserId(Long opUserId) { this.opUserId = opUserId; } diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderRefundExample.java b/hai-service/src/main/java/com/hai/entity/HighOrderRefundExample.java index 810b6948..01cbfd6a 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderRefundExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderRefundExample.java @@ -1936,52 +1936,52 @@ public class HighOrderRefundExample { return (Criteria) this; } - public Criteria andOpUserIdEqualTo(Integer value) { + public Criteria andOpUserIdEqualTo(Long value) { addCriterion("op_user_id =", value, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdNotEqualTo(Integer value) { + public Criteria andOpUserIdNotEqualTo(Long value) { addCriterion("op_user_id <>", value, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdGreaterThan(Integer value) { + public Criteria andOpUserIdGreaterThan(Long value) { addCriterion("op_user_id >", value, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdGreaterThanOrEqualTo(Integer value) { + public Criteria andOpUserIdGreaterThanOrEqualTo(Long value) { addCriterion("op_user_id >=", value, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdLessThan(Integer value) { + public Criteria andOpUserIdLessThan(Long value) { addCriterion("op_user_id <", value, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdLessThanOrEqualTo(Integer value) { + public Criteria andOpUserIdLessThanOrEqualTo(Long value) { addCriterion("op_user_id <=", value, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdIn(List values) { + public Criteria andOpUserIdIn(List values) { addCriterion("op_user_id in", values, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdNotIn(List values) { + public Criteria andOpUserIdNotIn(List values) { addCriterion("op_user_id not in", values, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdBetween(Integer value1, Integer value2) { + public Criteria andOpUserIdBetween(Long value1, Long value2) { addCriterion("op_user_id between", value1, value2, "opUserId"); return (Criteria) this; } - public Criteria andOpUserIdNotBetween(Integer value1, Integer value2) { + public Criteria andOpUserIdNotBetween(Long value1, Long value2) { addCriterion("op_user_id not between", value1, value2, "opUserId"); return (Criteria) this; } diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java index efe9601d..7bef96e0 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java @@ -135,7 +135,7 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService { // 处理订单产品业务 orderBusHandle(order); - // 推送支付成功消息 + // Todo 需要改成异步推送。推送支付成功消息 bsMsgService.pushUserMsg(order.getId() , "支付成功"); } return order; diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java index 42d09d85..6c93b19e 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderRefundServiceImpl.java @@ -124,8 +124,8 @@ public class OrderRefundServiceImpl implements OrderRefundService { orderRefund.setCreateTime(new Date()); orderRefund.setUpdateTime(new Date()); orderRefund.setOpUserType(opUserType.getNumber()); - orderRefund.setOpUserId(opUserType.getNumber()); - orderRefund.setOpUserName(opUserType.getName()); + orderRefund.setOpUserId(opUserId); + orderRefund.setOpUserName(opUserName); orderRefundMapper.insert(orderRefund); return orderRefund; }