From e3fd55b8e09aab9e29ca153401cd681211e7126b Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Wed, 15 Nov 2023 11:19:39 +0800 Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev --- .../java/com/hai/dao/HighGroupCodeMapper.java | 12 ++--- .../com/hai/dao/HighGroupCodeSqlProvider.java | 16 +++---- .../java/com/hai/entity/HighGroupCode.java | 16 +++---- .../com/hai/entity/HighGroupCodeExample.java | 48 +++++++++---------- .../hai/group/impl/GroupCodeServiceImpl.java | 6 +-- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/hai-service/src/main/java/com/hai/dao/HighGroupCodeMapper.java b/hai-service/src/main/java/com/hai/dao/HighGroupCodeMapper.java index 7f14dac4..54309d44 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGroupCodeMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighGroupCodeMapper.java @@ -40,14 +40,14 @@ public interface HighGroupCodeMapper extends HighGroupCodeMapperExt { @Insert({ "insert into high_group_code (user_id, order_id, ", - "srore_id, group_id, ", + "store_id, group_id, ", "group_code, code_img_url, ", "expiration_time, create_time, ", "update_time, `status`, ", "op_id, op_name, ext_1, ", "ext_2, ext_3)", "values (#{userId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, ", - "#{sroreId,jdbcType=BIGINT}, #{groupId,jdbcType=BIGINT}, ", + "#{storeId,jdbcType=BIGINT}, #{groupId,jdbcType=BIGINT}, ", "#{groupCode,jdbcType=VARCHAR}, #{codeImgUrl,jdbcType=VARCHAR}, ", "#{expirationTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", @@ -66,7 +66,7 @@ public interface HighGroupCodeMapper extends HighGroupCodeMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT), - @Result(column="srore_id", property="sroreId", jdbcType=JdbcType.BIGINT), + @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT), @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT), @Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR), @Result(column="code_img_url", property="codeImgUrl", jdbcType=JdbcType.VARCHAR), @@ -84,7 +84,7 @@ public interface HighGroupCodeMapper extends HighGroupCodeMapperExt { @Select({ "select", - "id, user_id, order_id, srore_id, group_id, group_code, code_img_url, expiration_time, ", + "id, user_id, order_id, store_id, group_id, group_code, code_img_url, expiration_time, ", "create_time, update_time, `status`, op_id, op_name, ext_1, ext_2, ext_3", "from high_group_code", "where id = #{id,jdbcType=BIGINT}" @@ -93,7 +93,7 @@ public interface HighGroupCodeMapper extends HighGroupCodeMapperExt { @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT), - @Result(column="srore_id", property="sroreId", jdbcType=JdbcType.BIGINT), + @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT), @Result(column="group_id", property="groupId", jdbcType=JdbcType.BIGINT), @Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR), @Result(column="code_img_url", property="codeImgUrl", jdbcType=JdbcType.VARCHAR), @@ -122,7 +122,7 @@ public interface HighGroupCodeMapper extends HighGroupCodeMapperExt { "update high_group_code", "set user_id = #{userId,jdbcType=BIGINT},", "order_id = #{orderId,jdbcType=BIGINT},", - "srore_id = #{sroreId,jdbcType=BIGINT},", + "store_id = #{storeId,jdbcType=BIGINT},", "group_id = #{groupId,jdbcType=BIGINT},", "group_code = #{groupCode,jdbcType=VARCHAR},", "code_img_url = #{codeImgUrl,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighGroupCodeSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGroupCodeSqlProvider.java index 45c93938..a8bdac71 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGroupCodeSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighGroupCodeSqlProvider.java @@ -36,8 +36,8 @@ public class HighGroupCodeSqlProvider { sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}"); } - if (record.getSroreId() != null) { - sql.VALUES("srore_id", "#{sroreId,jdbcType=BIGINT}"); + if (record.getStoreId() != null) { + sql.VALUES("store_id", "#{storeId,jdbcType=BIGINT}"); } if (record.getGroupId() != null) { @@ -100,7 +100,7 @@ public class HighGroupCodeSqlProvider { } sql.SELECT("user_id"); sql.SELECT("order_id"); - sql.SELECT("srore_id"); + sql.SELECT("store_id"); sql.SELECT("group_id"); sql.SELECT("group_code"); sql.SELECT("code_img_url"); @@ -142,8 +142,8 @@ public class HighGroupCodeSqlProvider { sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); } - if (record.getSroreId() != null) { - sql.SET("srore_id = #{record.sroreId,jdbcType=BIGINT}"); + if (record.getStoreId() != null) { + sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}"); } if (record.getGroupId() != null) { @@ -205,7 +205,7 @@ public class HighGroupCodeSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); - sql.SET("srore_id = #{record.sroreId,jdbcType=BIGINT}"); + sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}"); sql.SET("group_id = #{record.groupId,jdbcType=BIGINT}"); sql.SET("group_code = #{record.groupCode,jdbcType=VARCHAR}"); sql.SET("code_img_url = #{record.codeImgUrl,jdbcType=VARCHAR}"); @@ -236,8 +236,8 @@ public class HighGroupCodeSqlProvider { sql.SET("order_id = #{orderId,jdbcType=BIGINT}"); } - if (record.getSroreId() != null) { - sql.SET("srore_id = #{sroreId,jdbcType=BIGINT}"); + if (record.getStoreId() != null) { + sql.SET("store_id = #{storeId,jdbcType=BIGINT}"); } if (record.getGroupId() != null) { diff --git a/hai-service/src/main/java/com/hai/entity/HighGroupCode.java b/hai-service/src/main/java/com/hai/entity/HighGroupCode.java index 97ff088a..b756e8ca 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGroupCode.java +++ b/hai-service/src/main/java/com/hai/entity/HighGroupCode.java @@ -31,7 +31,7 @@ public class HighGroupCode implements Serializable { /** * 门店ID */ - private Long sroreId; + private Long storeId; /** * 团购ID @@ -119,12 +119,12 @@ public class HighGroupCode implements Serializable { this.orderId = orderId; } - public Long getSroreId() { - return sroreId; + public Long getStoreId() { + return storeId; } - public void setSroreId(Long sroreId) { - this.sroreId = sroreId; + public void setStoreId(Long storeId) { + this.storeId = storeId; } public Long getGroupId() { @@ -238,7 +238,7 @@ public class HighGroupCode implements Serializable { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) - && (this.getSroreId() == null ? other.getSroreId() == null : this.getSroreId().equals(other.getSroreId())) + && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId())) && (this.getGroupId() == null ? other.getGroupId() == null : this.getGroupId().equals(other.getGroupId())) && (this.getGroupCode() == null ? other.getGroupCode() == null : this.getGroupCode().equals(other.getGroupCode())) && (this.getCodeImgUrl() == null ? other.getCodeImgUrl() == null : this.getCodeImgUrl().equals(other.getCodeImgUrl())) @@ -260,7 +260,7 @@ public class HighGroupCode implements Serializable { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); - result = prime * result + ((getSroreId() == null) ? 0 : getSroreId().hashCode()); + result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode()); result = prime * result + ((getGroupId() == null) ? 0 : getGroupId().hashCode()); result = prime * result + ((getGroupCode() == null) ? 0 : getGroupCode().hashCode()); result = prime * result + ((getCodeImgUrl() == null) ? 0 : getCodeImgUrl().hashCode()); @@ -285,7 +285,7 @@ public class HighGroupCode implements Serializable { sb.append(", id=").append(id); sb.append(", userId=").append(userId); sb.append(", orderId=").append(orderId); - sb.append(", sroreId=").append(sroreId); + sb.append(", storeId=").append(storeId); sb.append(", groupId=").append(groupId); sb.append(", groupCode=").append(groupCode); sb.append(", codeImgUrl=").append(codeImgUrl); diff --git a/hai-service/src/main/java/com/hai/entity/HighGroupCodeExample.java b/hai-service/src/main/java/com/hai/entity/HighGroupCodeExample.java index d17be1b4..40402618 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGroupCodeExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighGroupCodeExample.java @@ -305,63 +305,63 @@ public class HighGroupCodeExample { return (Criteria) this; } - public Criteria andSroreIdIsNull() { - addCriterion("srore_id is null"); + public Criteria andStoreIdIsNull() { + addCriterion("store_id is null"); return (Criteria) this; } - public Criteria andSroreIdIsNotNull() { - addCriterion("srore_id is not null"); + public Criteria andStoreIdIsNotNull() { + addCriterion("store_id is not null"); return (Criteria) this; } - public Criteria andSroreIdEqualTo(Long value) { - addCriterion("srore_id =", value, "sroreId"); + public Criteria andStoreIdEqualTo(Long value) { + addCriterion("store_id =", value, "storeId"); return (Criteria) this; } - public Criteria andSroreIdNotEqualTo(Long value) { - addCriterion("srore_id <>", value, "sroreId"); + public Criteria andStoreIdNotEqualTo(Long value) { + addCriterion("store_id <>", value, "storeId"); return (Criteria) this; } - public Criteria andSroreIdGreaterThan(Long value) { - addCriterion("srore_id >", value, "sroreId"); + public Criteria andStoreIdGreaterThan(Long value) { + addCriterion("store_id >", value, "storeId"); return (Criteria) this; } - public Criteria andSroreIdGreaterThanOrEqualTo(Long value) { - addCriterion("srore_id >=", value, "sroreId"); + public Criteria andStoreIdGreaterThanOrEqualTo(Long value) { + addCriterion("store_id >=", value, "storeId"); return (Criteria) this; } - public Criteria andSroreIdLessThan(Long value) { - addCriterion("srore_id <", value, "sroreId"); + public Criteria andStoreIdLessThan(Long value) { + addCriterion("store_id <", value, "storeId"); return (Criteria) this; } - public Criteria andSroreIdLessThanOrEqualTo(Long value) { - addCriterion("srore_id <=", value, "sroreId"); + public Criteria andStoreIdLessThanOrEqualTo(Long value) { + addCriterion("store_id <=", value, "storeId"); return (Criteria) this; } - public Criteria andSroreIdIn(List values) { - addCriterion("srore_id in", values, "sroreId"); + public Criteria andStoreIdIn(List values) { + addCriterion("store_id in", values, "storeId"); return (Criteria) this; } - public Criteria andSroreIdNotIn(List values) { - addCriterion("srore_id not in", values, "sroreId"); + public Criteria andStoreIdNotIn(List values) { + addCriterion("store_id not in", values, "storeId"); return (Criteria) this; } - public Criteria andSroreIdBetween(Long value1, Long value2) { - addCriterion("srore_id between", value1, value2, "sroreId"); + public Criteria andStoreIdBetween(Long value1, Long value2) { + addCriterion("store_id between", value1, value2, "storeId"); return (Criteria) this; } - public Criteria andSroreIdNotBetween(Long value1, Long value2) { - addCriterion("srore_id not between", value1, value2, "sroreId"); + public Criteria andStoreIdNotBetween(Long value1, Long value2) { + addCriterion("store_id not between", value1, value2, "storeId"); return (Criteria) this; } diff --git a/hai-service/src/main/java/com/hai/group/impl/GroupCodeServiceImpl.java b/hai-service/src/main/java/com/hai/group/impl/GroupCodeServiceImpl.java index bcc67a29..53cde4b8 100644 --- a/hai-service/src/main/java/com/hai/group/impl/GroupCodeServiceImpl.java +++ b/hai-service/src/main/java/com/hai/group/impl/GroupCodeServiceImpl.java @@ -58,7 +58,7 @@ public class GroupCodeServiceImpl implements GroupCodeService { criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId")); } if (MapUtils.getLong(map, "storeId") != null) { - criteria.andSroreIdEqualTo(MapUtils.getLong(map, "storeId")); + criteria.andStoreIdEqualTo(MapUtils.getLong(map, "storeId")); } if (MapUtils.getLong(map, "orderId") != null) { criteria.andOrderIdEqualTo(MapUtils.getLong(map, "orderId")); @@ -87,7 +87,7 @@ public class GroupCodeServiceImpl implements GroupCodeService { criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId")); } if (MapUtils.getLong(map, "storeId") != null) { - criteria.andSroreIdEqualTo(MapUtils.getLong(map, "storeId")); + criteria.andStoreIdEqualTo(MapUtils.getLong(map, "storeId")); } return highGroupCodeMapper.selectByExample(example); @@ -103,7 +103,7 @@ public class GroupCodeServiceImpl implements GroupCodeService { highGroupCode.setGroupId(groupId); highGroupCode.setCreateTime(new Date()); highGroupCode.setOrderId(orderId); - highGroupCode.setSroreId(storeId); + highGroupCode.setStoreId(storeId); highGroupCode.setUpdateTime(new Date()); highGroupCode.setUserId(userId); highGroupCode.setStatus(1); From 7ec9da81949c2d6484b075bbdbb3bedd216db64b Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Wed, 15 Nov 2023 11:50:54 +0800 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev --- .../main/java/com/web/controller/OrderController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hai-order/src/main/java/com/web/controller/OrderController.java b/hai-order/src/main/java/com/web/controller/OrderController.java index 1e3963d2..8380d6c7 100644 --- a/hai-order/src/main/java/com/web/controller/OrderController.java +++ b/hai-order/src/main/java/com/web/controller/OrderController.java @@ -308,6 +308,15 @@ public class OrderController { goodsOrderModel.setGoodsOrder(order); goodsOrderModel.setGoodsDeliveryAddress(deliveryAddress); + + + return ResponseMsgUtil.success(goodsOrderModel); + + } else if (highOrder.getProductType() == 17) { + + GoodsOrderModel goodsOrderModel = new GoodsOrderModel(); + BeanUtils.copyProperties(highOrder , goodsOrderModel); + HighGroupOrder highGroupOrder = groupCodeService.findGroupOrder(highOrder.getOrderNo()); JSONObject object = groupService.getGroupContent(highGroupOrder.getGroupId()); @@ -321,7 +330,6 @@ public class OrderController { HighGroupCode highGroupCode = groupCodeService.findGroupCode(map); goodsOrderModel.setHighGroupCode(highGroupCode); - return ResponseMsgUtil.success(goodsOrderModel); }