hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev

Browse Source
new-dev
胡锐 1 year ago
parent c7b0dde06c 7ec9da8194
commit a229b9b424
6 changed files with 58 additions and 50 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. 10
      hai-order/src/main/java/com/web/controller/OrderController.java
  2. 12
      hai-service/src/main/java/com/hai/dao/HighGroupCodeMapper.java
  3. 16
      hai-service/src/main/java/com/hai/dao/HighGroupCodeSqlProvider.java
  4. 16
      hai-service/src/main/java/com/hai/entity/HighGroupCode.java
  5. 48
      hai-service/src/main/java/com/hai/entity/HighGroupCodeExample.java
  6. 6
      hai-service/src/main/java/com/hai/group/impl/GroupCodeServiceImpl.java

10
hai-order/src/main/java/com/web/controller/OrderController.java
Unescape View File

@ -308,6 +308,15 @@ public class OrderController {
goodsOrderModel.setGoodsOrder(order); goodsOrderModel.setGoodsOrder(order);
goodsOrderModel.setGoodsDeliveryAddress(deliveryAddress); 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()); HighGroupOrder highGroupOrder = groupCodeService.findGroupOrder(highOrder.getOrderNo());
JSONObject object = groupService.getGroupContent(highGroupOrder.getGroupId()); JSONObject object = groupService.getGroupContent(highGroupOrder.getGroupId());
@ -321,7 +330,6 @@ public class OrderController {
HighGroupCode highGroupCode = groupCodeService.findGroupCode(map); HighGroupCode highGroupCode = groupCodeService.findGroupCode(map);
goodsOrderModel.setHighGroupCode(highGroupCode); goodsOrderModel.setHighGroupCode(highGroupCode);
return ResponseMsgUtil.success(goodsOrderModel); return ResponseMsgUtil.success(goodsOrderModel);
} }

12
hai-service/src/main/java/com/hai/dao/HighGroupCodeMapper.java
Unescape View File

@ -40,14 +40,14 @@ public interface HighGroupCodeMapper extends HighGroupCodeMapperExt {
@Insert({ @Insert({
"insert into high_group_code (user_id, order_id, ", "insert into high_group_code (user_id, order_id, ",
"srore_id, group_id, ", "store_id, group_id, ",
"group_code, code_img_url, ", "group_code, code_img_url, ",
"expiration_time, create_time, ", "expiration_time, create_time, ",
"update_time, `status`, ", "update_time, `status`, ",
"op_id, op_name, ext_1, ", "op_id, op_name, ext_1, ",
"ext_2, ext_3)", "ext_2, ext_3)",
"values (#{userId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, ", "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}, ", "#{groupCode,jdbcType=VARCHAR}, #{codeImgUrl,jdbcType=VARCHAR}, ",
"#{expirationTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ", "#{expirationTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", "#{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="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@Result(column="order_id", property="orderId", 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_id", property="groupId", jdbcType=JdbcType.BIGINT),
@Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR), @Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR),
@Result(column="code_img_url", property="codeImgUrl", jdbcType=JdbcType.VARCHAR), @Result(column="code_img_url", property="codeImgUrl", jdbcType=JdbcType.VARCHAR),
@ -84,7 +84,7 @@ public interface HighGroupCodeMapper extends HighGroupCodeMapperExt {
@Select({ @Select({
"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", "create_time, update_time, `status`, op_id, op_name, ext_1, ext_2, ext_3",
"from high_group_code", "from high_group_code",
"where id = #{id,jdbcType=BIGINT}" "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="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@Result(column="order_id", property="orderId", 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_id", property="groupId", jdbcType=JdbcType.BIGINT),
@Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR), @Result(column="group_code", property="groupCode", jdbcType=JdbcType.VARCHAR),
@Result(column="code_img_url", property="codeImgUrl", 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", "update high_group_code",
"set user_id = #{userId,jdbcType=BIGINT},", "set user_id = #{userId,jdbcType=BIGINT},",
"order_id = #{orderId,jdbcType=BIGINT},", "order_id = #{orderId,jdbcType=BIGINT},",
"srore_id = #{sroreId,jdbcType=BIGINT},", "store_id = #{storeId,jdbcType=BIGINT},",
"group_id = #{groupId,jdbcType=BIGINT},", "group_id = #{groupId,jdbcType=BIGINT},",
"group_code = #{groupCode,jdbcType=VARCHAR},", "group_code = #{groupCode,jdbcType=VARCHAR},",
"code_img_url = #{codeImgUrl,jdbcType=VARCHAR},", "code_img_url = #{codeImgUrl,jdbcType=VARCHAR},",

16
hai-service/src/main/java/com/hai/dao/HighGroupCodeSqlProvider.java
Unescape View File

@ -36,8 +36,8 @@ public class HighGroupCodeSqlProvider {
sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}"); sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}");
} }
if (record.getSroreId() != null) { if (record.getStoreId() != null) {
sql.VALUES("srore_id", "#{sroreId,jdbcType=BIGINT}"); sql.VALUES("store_id", "#{storeId,jdbcType=BIGINT}");
} }
if (record.getGroupId() != null) { if (record.getGroupId() != null) {
@ -100,7 +100,7 @@ public class HighGroupCodeSqlProvider {
} }
sql.SELECT("user_id"); sql.SELECT("user_id");
sql.SELECT("order_id"); sql.SELECT("order_id");
sql.SELECT("srore_id"); sql.SELECT("store_id");
sql.SELECT("group_id"); sql.SELECT("group_id");
sql.SELECT("group_code"); sql.SELECT("group_code");
sql.SELECT("code_img_url"); sql.SELECT("code_img_url");
@ -142,8 +142,8 @@ public class HighGroupCodeSqlProvider {
sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}");
} }
if (record.getSroreId() != null) { if (record.getStoreId() != null) {
sql.SET("srore_id = #{record.sroreId,jdbcType=BIGINT}"); sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}");
} }
if (record.getGroupId() != null) { if (record.getGroupId() != null) {
@ -205,7 +205,7 @@ public class HighGroupCodeSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
sql.SET("order_id = #{record.orderId,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_id = #{record.groupId,jdbcType=BIGINT}");
sql.SET("group_code = #{record.groupCode,jdbcType=VARCHAR}"); sql.SET("group_code = #{record.groupCode,jdbcType=VARCHAR}");
sql.SET("code_img_url = #{record.codeImgUrl,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}"); sql.SET("order_id = #{orderId,jdbcType=BIGINT}");
} }
if (record.getSroreId() != null) { if (record.getStoreId() != null) {
sql.SET("srore_id = #{sroreId,jdbcType=BIGINT}"); sql.SET("store_id = #{storeId,jdbcType=BIGINT}");
} }
if (record.getGroupId() != null) { if (record.getGroupId() != null) {

16
hai-service/src/main/java/com/hai/entity/HighGroupCode.java
Unescape View File

@ -31,7 +31,7 @@ public class HighGroupCode implements Serializable {
/** /**
* 门店ID * 门店ID
*/ */
private Long sroreId; private Long storeId;
/** /**
* 团购ID * 团购ID
@ -119,12 +119,12 @@ public class HighGroupCode implements Serializable {
this.orderId = orderId; this.orderId = orderId;
} }
public Long getSroreId() { public Long getStoreId() {
return sroreId; return storeId;
} }
public void setSroreId(Long sroreId) { public void setStoreId(Long storeId) {
this.sroreId = sroreId; this.storeId = storeId;
} }
public Long getGroupId() { public Long getGroupId() {
@ -238,7 +238,7 @@ public class HighGroupCode implements Serializable {
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.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) && (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.getGroupId() == null ? other.getGroupId() == null : this.getGroupId().equals(other.getGroupId()))
&& (this.getGroupCode() == null ? other.getGroupCode() == null : this.getGroupCode().equals(other.getGroupCode())) && (this.getGroupCode() == null ? other.getGroupCode() == null : this.getGroupCode().equals(other.getGroupCode()))
&& (this.getCodeImgUrl() == null ? other.getCodeImgUrl() == null : this.getCodeImgUrl().equals(other.getCodeImgUrl())) && (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 + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().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 + ((getGroupId() == null) ? 0 : getGroupId().hashCode());
result = prime * result + ((getGroupCode() == null) ? 0 : getGroupCode().hashCode()); result = prime * result + ((getGroupCode() == null) ? 0 : getGroupCode().hashCode());
result = prime * result + ((getCodeImgUrl() == null) ? 0 : getCodeImgUrl().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(", id=").append(id);
sb.append(", userId=").append(userId); sb.append(", userId=").append(userId);
sb.append(", orderId=").append(orderId); sb.append(", orderId=").append(orderId);
sb.append(", sroreId=").append(sroreId); sb.append(", storeId=").append(storeId);
sb.append(", groupId=").append(groupId); sb.append(", groupId=").append(groupId);
sb.append(", groupCode=").append(groupCode); sb.append(", groupCode=").append(groupCode);
sb.append(", codeImgUrl=").append(codeImgUrl); sb.append(", codeImgUrl=").append(codeImgUrl);

48
hai-service/src/main/java/com/hai/entity/HighGroupCodeExample.java
Unescape View File

@ -305,63 +305,63 @@ public class HighGroupCodeExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdIsNull() { public Criteria andStoreIdIsNull() {
addCriterion("srore_id is null"); addCriterion("store_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdIsNotNull() { public Criteria andStoreIdIsNotNull() {
addCriterion("srore_id is not null"); addCriterion("store_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdEqualTo(Long value) { public Criteria andStoreIdEqualTo(Long value) {
addCriterion("srore_id =", value, "sroreId"); addCriterion("store_id =", value, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdNotEqualTo(Long value) { public Criteria andStoreIdNotEqualTo(Long value) {
addCriterion("srore_id <>", value, "sroreId"); addCriterion("store_id <>", value, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdGreaterThan(Long value) { public Criteria andStoreIdGreaterThan(Long value) {
addCriterion("srore_id >", value, "sroreId"); addCriterion("store_id >", value, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdGreaterThanOrEqualTo(Long value) { public Criteria andStoreIdGreaterThanOrEqualTo(Long value) {
addCriterion("srore_id >=", value, "sroreId"); addCriterion("store_id >=", value, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdLessThan(Long value) { public Criteria andStoreIdLessThan(Long value) {
addCriterion("srore_id <", value, "sroreId"); addCriterion("store_id <", value, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdLessThanOrEqualTo(Long value) { public Criteria andStoreIdLessThanOrEqualTo(Long value) {
addCriterion("srore_id <=", value, "sroreId"); addCriterion("store_id <=", value, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdIn(List<Long> values) { public Criteria andStoreIdIn(List<Long> values) {
addCriterion("srore_id in", values, "sroreId"); addCriterion("store_id in", values, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdNotIn(List<Long> values) { public Criteria andStoreIdNotIn(List<Long> values) {
addCriterion("srore_id not in", values, "sroreId"); addCriterion("store_id not in", values, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdBetween(Long value1, Long value2) { public Criteria andStoreIdBetween(Long value1, Long value2) {
addCriterion("srore_id between", value1, value2, "sroreId"); addCriterion("store_id between", value1, value2, "storeId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andSroreIdNotBetween(Long value1, Long value2) { public Criteria andStoreIdNotBetween(Long value1, Long value2) {
addCriterion("srore_id not between", value1, value2, "sroreId"); addCriterion("store_id not between", value1, value2, "storeId");
return (Criteria) this; return (Criteria) this;
} }

6
hai-service/src/main/java/com/hai/group/impl/GroupCodeServiceImpl.java
Unescape View File

@ -58,7 +58,7 @@ public class GroupCodeServiceImpl implements GroupCodeService {
criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId")); criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId"));
} }
if (MapUtils.getLong(map, "storeId") != null) { if (MapUtils.getLong(map, "storeId") != null) {
criteria.andSroreIdEqualTo(MapUtils.getLong(map, "storeId")); criteria.andStoreIdEqualTo(MapUtils.getLong(map, "storeId"));
} }
if (MapUtils.getLong(map, "orderId") != null) { if (MapUtils.getLong(map, "orderId") != null) {
criteria.andOrderIdEqualTo(MapUtils.getLong(map, "orderId")); criteria.andOrderIdEqualTo(MapUtils.getLong(map, "orderId"));
@ -87,7 +87,7 @@ public class GroupCodeServiceImpl implements GroupCodeService {
criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId")); criteria.andUserIdEqualTo(MapUtils.getLong(map, "userId"));
} }
if (MapUtils.getLong(map, "storeId") != null) { if (MapUtils.getLong(map, "storeId") != null) {
criteria.andSroreIdEqualTo(MapUtils.getLong(map, "storeId")); criteria.andStoreIdEqualTo(MapUtils.getLong(map, "storeId"));
} }
return highGroupCodeMapper.selectByExample(example); return highGroupCodeMapper.selectByExample(example);
@ -103,7 +103,7 @@ public class GroupCodeServiceImpl implements GroupCodeService {
highGroupCode.setGroupId(groupId); highGroupCode.setGroupId(groupId);
highGroupCode.setCreateTime(new Date()); highGroupCode.setCreateTime(new Date());
highGroupCode.setOrderId(orderId); highGroupCode.setOrderId(orderId);
highGroupCode.setSroreId(storeId); highGroupCode.setStoreId(storeId);
highGroupCode.setUpdateTime(new Date()); highGroupCode.setUpdateTime(new Date());
highGroupCode.setUserId(userId); highGroupCode.setUserId(userId);
highGroupCode.setStatus(1); highGroupCode.setStatus(1);

Write Preview
Loading…
Cancel
Save