From 025fe1b0b6f839f0f48134d34bd3e7ddf7702f3b Mon Sep 17 00:00:00 2001 From: "12691282@qq.com" <12691282@qq.com> Date: Mon, 4 Nov 2024 16:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/UmsMemberOrderQueueMapper.java | 30 + .../model/UmsMemberAccountTransaction.java | 32 + .../UmsMemberAccountTransactionExample.java | 120 +++ .../mall/model/UmsMemberOrderQueue.java | 142 ++++ .../model/UmsMemberOrderQueueExample.java | 742 ++++++++++++++++++ .../mall/model/UmsMemberRelationTree.java | 30 +- .../model/UmsMemberRelationTreeExample.java | 140 ++-- .../UmsMemberAccountTransactionMapper.xml | 45 +- .../mall/mapper/UmsMemberOrderQueueMapper.xml | 274 +++++++ .../mapper/UmsMemberRelationTreeMapper.xml | 48 +- .../controller/OmsPortalOrderController.java | 16 + .../portal/service/OmsPortalOrderService.java | 17 +- .../impl/MemberCommissionServiceImpl.java | 116 ++- .../impl/OmsPortalOrderServiceImpl.java | 290 +++++-- .../src/main/resources/application-dev.yml | 8 +- 15 files changed, 1871 insertions(+), 179 deletions(-) create mode 100644 mall-dao/src/main/java/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.java create mode 100644 mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueue.java create mode 100644 mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueueExample.java create mode 100644 mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.xml diff --git a/mall-dao/src/main/java/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.java b/mall-dao/src/main/java/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.java new file mode 100644 index 0000000..0f6185f --- /dev/null +++ b/mall-dao/src/main/java/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.java @@ -0,0 +1,30 @@ +package com.buy507.mall.mapper; + +import com.buy507.mall.model.UmsMemberOrderQueue; +import com.buy507.mall.model.UmsMemberOrderQueueExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface UmsMemberOrderQueueMapper { + long countByExample(UmsMemberOrderQueueExample example); + + int deleteByExample(UmsMemberOrderQueueExample example); + + int deleteByPrimaryKey(Long id); + + int insert(UmsMemberOrderQueue record); + + int insertSelective(UmsMemberOrderQueue record); + + List selectByExample(UmsMemberOrderQueueExample example); + + UmsMemberOrderQueue selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") UmsMemberOrderQueue record, @Param("example") UmsMemberOrderQueueExample example); + + int updateByExample(@Param("record") UmsMemberOrderQueue record, @Param("example") UmsMemberOrderQueueExample example); + + int updateByPrimaryKeySelective(UmsMemberOrderQueue record); + + int updateByPrimaryKey(UmsMemberOrderQueue record); +} \ No newline at end of file diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransaction.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransaction.java index 298d002..a645166 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransaction.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransaction.java @@ -6,6 +6,14 @@ import java.math.BigDecimal; import java.util.Date; public class UmsMemberAccountTransaction implements Serializable { + + //0 未转账状态 + public static Integer TRANSACTION_STATE_NO = 0; + //1 已转账状态 + public static Integer TRANSACTION_STATE_YES = 1; + //1 已退款状态 + public static Integer TRANSACTION_STATE_OUT = 2; + @ApiModelProperty(value = "主键id") private Long id; @@ -18,6 +26,9 @@ public class UmsMemberAccountTransaction implements Serializable { @ApiModelProperty(value = "进帐金额") private BigDecimal revenueAmount; + @ApiModelProperty(value = "转账状态 0 未转账，1 转账， 2 退款") + private Integer transactionState; + @ApiModelProperty(value = "备注") private String remarks; @@ -27,6 +38,9 @@ public class UmsMemberAccountTransaction implements Serializable { @ApiModelProperty(value = "创建时间") private Date createTime; + @ApiModelProperty(value = "转账时间") + private Date transferPaymentTime; + private static final long serialVersionUID = 1L; public Long getId() { @@ -61,6 +75,14 @@ public class UmsMemberAccountTransaction implements Serializable { this.revenueAmount = revenueAmount; } + public Integer getTransactionState() { + return transactionState; + } + + public void setTransactionState(Integer transactionState) { + this.transactionState = transactionState; + } + public String getRemarks() { return remarks; } @@ -85,6 +107,14 @@ public class UmsMemberAccountTransaction implements Serializable { this.createTime = createTime; } + public Date getTransferPaymentTime() { + return transferPaymentTime; + } + + public void setTransferPaymentTime(Date transferPaymentTime) { + this.transferPaymentTime = transferPaymentTime; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -95,9 +125,11 @@ public class UmsMemberAccountTransaction implements Serializable { sb.append(", memberId=").append(memberId); sb.append(", orderId=").append(orderId); sb.append(", revenueAmount=").append(revenueAmount); + sb.append(", transactionState=").append(transactionState); sb.append(", remarks=").append(remarks); sb.append(", commissionRatio=").append(commissionRatio); sb.append(", createTime=").append(createTime); + sb.append(", transferPaymentTime=").append(transferPaymentTime); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransactionExample.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransactionExample.java index 5d18f1a..5f965b0 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransactionExample.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransactionExample.java @@ -346,6 +346,66 @@ public class UmsMemberAccountTransactionExample { return (Criteria) this; } + public Criteria andTransactionStateIsNull() { + addCriterion("transaction_state is null"); + return (Criteria) this; + } + + public Criteria andTransactionStateIsNotNull() { + addCriterion("transaction_state is not null"); + return (Criteria) this; + } + + public Criteria andTransactionStateEqualTo(Integer value) { + addCriterion("transaction_state =", value, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateNotEqualTo(Integer value) { + addCriterion("transaction_state <>", value, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateGreaterThan(Integer value) { + addCriterion("transaction_state >", value, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateGreaterThanOrEqualTo(Integer value) { + addCriterion("transaction_state >=", value, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateLessThan(Integer value) { + addCriterion("transaction_state <", value, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateLessThanOrEqualTo(Integer value) { + addCriterion("transaction_state <=", value, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateIn(List values) { + addCriterion("transaction_state in", values, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateNotIn(List values) { + addCriterion("transaction_state not in", values, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateBetween(Integer value1, Integer value2) { + addCriterion("transaction_state between", value1, value2, "transactionState"); + return (Criteria) this; + } + + public Criteria andTransactionStateNotBetween(Integer value1, Integer value2) { + addCriterion("transaction_state not between", value1, value2, "transactionState"); + return (Criteria) this; + } + public Criteria andRemarksIsNull() { addCriterion("remarks is null"); return (Criteria) this; @@ -535,6 +595,66 @@ public class UmsMemberAccountTransactionExample { addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } + + public Criteria andTransferPaymentTimeIsNull() { + addCriterion("transfer_payment_time is null"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeIsNotNull() { + addCriterion("transfer_payment_time is not null"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeEqualTo(Date value) { + addCriterion("transfer_payment_time =", value, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeNotEqualTo(Date value) { + addCriterion("transfer_payment_time <>", value, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeGreaterThan(Date value) { + addCriterion("transfer_payment_time >", value, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeGreaterThanOrEqualTo(Date value) { + addCriterion("transfer_payment_time >=", value, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeLessThan(Date value) { + addCriterion("transfer_payment_time <", value, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeLessThanOrEqualTo(Date value) { + addCriterion("transfer_payment_time <=", value, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeIn(List values) { + addCriterion("transfer_payment_time in", values, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeNotIn(List values) { + addCriterion("transfer_payment_time not in", values, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeBetween(Date value1, Date value2) { + addCriterion("transfer_payment_time between", value1, value2, "transferPaymentTime"); + return (Criteria) this; + } + + public Criteria andTransferPaymentTimeNotBetween(Date value1, Date value2) { + addCriterion("transfer_payment_time not between", value1, value2, "transferPaymentTime"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueue.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueue.java new file mode 100644 index 0000000..e927af2 --- /dev/null +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueue.java @@ -0,0 +1,142 @@ +package com.buy507.mall.model; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +public class UmsMemberOrderQueue implements Serializable { + + + //0 普通队列 + public static Integer QUEUE_TYPE_ORDINARY = 0; + //1 加速队列 + public static Integer QUEUE_TYPE_FAST = 1; + //0 未退出 + public static Integer QUEUE_STATUS_WAIT = 0; + //1 准备退队列 + public static Integer QUEUE_PREPARE_QUIT = 1; + //1 退出队列 + public static Integer QUEUE_STATUS_QUIT = 2; + + @ApiModelProperty(value = "主键id") + private Long id; + + @ApiModelProperty(value = "会员id") + private Long memberId; + + @ApiModelProperty(value = "订单id") + private Long orderId; + + @ApiModelProperty(value = "订单金额") + private BigDecimal orderAmount; + + @ApiModelProperty(value = "队列位置") + private Long queueIndex; + + @ApiModelProperty(value = "0 未退出，1 准备退队列, 2退出队列") + private Integer quitQueueMark; + + @ApiModelProperty(value = "0 普通队列，1 加速队列") + private Integer queueType; + + @ApiModelProperty(value = "加速单剩余数量") + private Integer remainNumber; + + @ApiModelProperty(value = "创建时间") + private Date createTime; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getMemberId() { + return memberId; + } + + public void setMemberId(Long memberId) { + this.memberId = memberId; + } + + public Long getOrderId() { + return orderId; + } + + public void setOrderId(Long orderId) { + this.orderId = orderId; + } + + public BigDecimal getOrderAmount() { + return orderAmount; + } + + public void setOrderAmount(BigDecimal orderAmount) { + this.orderAmount = orderAmount; + } + + public Long getQueueIndex() { + return queueIndex; + } + + public void setQueueIndex(Long queueIndex) { + this.queueIndex = queueIndex; + } + + public Integer getQuitQueueMark() { + return quitQueueMark; + } + + public void setQuitQueueMark(Integer quitQueueMark) { + this.quitQueueMark = quitQueueMark; + } + + public Integer getQueueType() { + return queueType; + } + + public void setQueueType(Integer queueType) { + this.queueType = queueType; + } + + public Integer getRemainNumber() { + return remainNumber; + } + + public void setRemainNumber(Integer remainNumber) { + this.remainNumber = remainNumber; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", memberId=").append(memberId); + sb.append(", orderId=").append(orderId); + sb.append(", orderAmount=").append(orderAmount); + sb.append(", queueIndex=").append(queueIndex); + sb.append(", quitQueueMark=").append(quitQueueMark); + sb.append(", queueType=").append(queueType); + sb.append(", remainNumber=").append(remainNumber); + sb.append(", createTime=").append(createTime); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueueExample.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueueExample.java new file mode 100644 index 0000000..bb7b9ff --- /dev/null +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberOrderQueueExample.java @@ -0,0 +1,742 @@ +package com.buy507.mall.model; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class UmsMemberOrderQueueExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public UmsMemberOrderQueueExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNull() { + addCriterion("member_id is null"); + return (Criteria) this; + } + + public Criteria andMemberIdIsNotNull() { + addCriterion("member_id is not null"); + return (Criteria) this; + } + + public Criteria andMemberIdEqualTo(Long value) { + addCriterion("member_id =", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotEqualTo(Long value) { + addCriterion("member_id <>", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThan(Long value) { + addCriterion("member_id >", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdGreaterThanOrEqualTo(Long value) { + addCriterion("member_id >=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThan(Long value) { + addCriterion("member_id <", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdLessThanOrEqualTo(Long value) { + addCriterion("member_id <=", value, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdIn(List values) { + addCriterion("member_id in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotIn(List values) { + addCriterion("member_id not in", values, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdBetween(Long value1, Long value2) { + addCriterion("member_id between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andMemberIdNotBetween(Long value1, Long value2) { + addCriterion("member_id not between", value1, value2, "memberId"); + return (Criteria) this; + } + + public Criteria andOrderIdIsNull() { + addCriterion("order_id is null"); + return (Criteria) this; + } + + public Criteria andOrderIdIsNotNull() { + addCriterion("order_id is not null"); + return (Criteria) this; + } + + public Criteria andOrderIdEqualTo(Long value) { + addCriterion("order_id =", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdNotEqualTo(Long value) { + addCriterion("order_id <>", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdGreaterThan(Long value) { + addCriterion("order_id >", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdGreaterThanOrEqualTo(Long value) { + addCriterion("order_id >=", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdLessThan(Long value) { + addCriterion("order_id <", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdLessThanOrEqualTo(Long value) { + addCriterion("order_id <=", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdIn(List values) { + addCriterion("order_id in", values, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdNotIn(List values) { + addCriterion("order_id not in", values, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdBetween(Long value1, Long value2) { + addCriterion("order_id between", value1, value2, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdNotBetween(Long value1, Long value2) { + addCriterion("order_id not between", value1, value2, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderAmountIsNull() { + addCriterion("order_amount is null"); + return (Criteria) this; + } + + public Criteria andOrderAmountIsNotNull() { + addCriterion("order_amount is not null"); + return (Criteria) this; + } + + public Criteria andOrderAmountEqualTo(BigDecimal value) { + addCriterion("order_amount =", value, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountNotEqualTo(BigDecimal value) { + addCriterion("order_amount <>", value, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountGreaterThan(BigDecimal value) { + addCriterion("order_amount >", value, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("order_amount >=", value, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountLessThan(BigDecimal value) { + addCriterion("order_amount <", value, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("order_amount <=", value, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountIn(List values) { + addCriterion("order_amount in", values, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountNotIn(List values) { + addCriterion("order_amount not in", values, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_amount between", value1, value2, "orderAmount"); + return (Criteria) this; + } + + public Criteria andOrderAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_amount not between", value1, value2, "orderAmount"); + return (Criteria) this; + } + + public Criteria andQueueIndexIsNull() { + addCriterion("queue_index is null"); + return (Criteria) this; + } + + public Criteria andQueueIndexIsNotNull() { + addCriterion("queue_index is not null"); + return (Criteria) this; + } + + public Criteria andQueueIndexEqualTo(Long value) { + addCriterion("queue_index =", value, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexNotEqualTo(Long value) { + addCriterion("queue_index <>", value, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexGreaterThan(Long value) { + addCriterion("queue_index >", value, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexGreaterThanOrEqualTo(Long value) { + addCriterion("queue_index >=", value, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexLessThan(Long value) { + addCriterion("queue_index <", value, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexLessThanOrEqualTo(Long value) { + addCriterion("queue_index <=", value, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexIn(List values) { + addCriterion("queue_index in", values, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexNotIn(List values) { + addCriterion("queue_index not in", values, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexBetween(Long value1, Long value2) { + addCriterion("queue_index between", value1, value2, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQueueIndexNotBetween(Long value1, Long value2) { + addCriterion("queue_index not between", value1, value2, "queueIndex"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkIsNull() { + addCriterion("quit_queue_mark is null"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkIsNotNull() { + addCriterion("quit_queue_mark is not null"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkEqualTo(Integer value) { + addCriterion("quit_queue_mark =", value, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkNotEqualTo(Integer value) { + addCriterion("quit_queue_mark <>", value, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkGreaterThan(Integer value) { + addCriterion("quit_queue_mark >", value, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkGreaterThanOrEqualTo(Integer value) { + addCriterion("quit_queue_mark >=", value, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkLessThan(Integer value) { + addCriterion("quit_queue_mark <", value, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkLessThanOrEqualTo(Integer value) { + addCriterion("quit_queue_mark <=", value, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkIn(List values) { + addCriterion("quit_queue_mark in", values, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkNotIn(List values) { + addCriterion("quit_queue_mark not in", values, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkBetween(Integer value1, Integer value2) { + addCriterion("quit_queue_mark between", value1, value2, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQuitQueueMarkNotBetween(Integer value1, Integer value2) { + addCriterion("quit_queue_mark not between", value1, value2, "quitQueueMark"); + return (Criteria) this; + } + + public Criteria andQueueTypeIsNull() { + addCriterion("queue_type is null"); + return (Criteria) this; + } + + public Criteria andQueueTypeIsNotNull() { + addCriterion("queue_type is not null"); + return (Criteria) this; + } + + public Criteria andQueueTypeEqualTo(Integer value) { + addCriterion("queue_type =", value, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeNotEqualTo(Integer value) { + addCriterion("queue_type <>", value, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeGreaterThan(Integer value) { + addCriterion("queue_type >", value, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("queue_type >=", value, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeLessThan(Integer value) { + addCriterion("queue_type <", value, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeLessThanOrEqualTo(Integer value) { + addCriterion("queue_type <=", value, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeIn(List values) { + addCriterion("queue_type in", values, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeNotIn(List values) { + addCriterion("queue_type not in", values, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeBetween(Integer value1, Integer value2) { + addCriterion("queue_type between", value1, value2, "queueType"); + return (Criteria) this; + } + + public Criteria andQueueTypeNotBetween(Integer value1, Integer value2) { + addCriterion("queue_type not between", value1, value2, "queueType"); + return (Criteria) this; + } + + public Criteria andRemainNumberIsNull() { + addCriterion("remain_number is null"); + return (Criteria) this; + } + + public Criteria andRemainNumberIsNotNull() { + addCriterion("remain_number is not null"); + return (Criteria) this; + } + + public Criteria andRemainNumberEqualTo(Integer value) { + addCriterion("remain_number =", value, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberNotEqualTo(Integer value) { + addCriterion("remain_number <>", value, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberGreaterThan(Integer value) { + addCriterion("remain_number >", value, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberGreaterThanOrEqualTo(Integer value) { + addCriterion("remain_number >=", value, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberLessThan(Integer value) { + addCriterion("remain_number <", value, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberLessThanOrEqualTo(Integer value) { + addCriterion("remain_number <=", value, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberIn(List values) { + addCriterion("remain_number in", values, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberNotIn(List values) { + addCriterion("remain_number not in", values, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberBetween(Integer value1, Integer value2) { + addCriterion("remain_number between", value1, value2, "remainNumber"); + return (Criteria) this; + } + + public Criteria andRemainNumberNotBetween(Integer value1, Integer value2) { + addCriterion("remain_number not between", value1, value2, "remainNumber"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTree.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTree.java index 15fa51a..e56b1a8 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTree.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTree.java @@ -11,11 +11,11 @@ public class UmsMemberRelationTree implements Serializable { @ApiModelProperty(value = "会员id") private Long memberId; - @ApiModelProperty(value = "上级会员id") - private Integer higherLevelId; + @ApiModelProperty(value = "下级会员id") + private Long lowerLevelId; - @ApiModelProperty(value = "0 未退出，1 退出队列") - private Integer quitQueueMark; + @ApiModelProperty(value = "上级会员id") + private Long higherLevelId; @ApiModelProperty(value = "创建时间") private Date createTime; @@ -38,22 +38,22 @@ public class UmsMemberRelationTree implements Serializable { this.memberId = memberId; } - public Integer getHigherLevelId() { + public Long getLowerLevelId() { + return lowerLevelId; + } + + public void setLowerLevelId(Long lowerLevelId) { + this.lowerLevelId = lowerLevelId; + } + + public Long getHigherLevelId() { return higherLevelId; } - public void setHigherLevelId(Integer higherLevelId) { + public void setHigherLevelId(Long higherLevelId) { this.higherLevelId = higherLevelId; } - public Integer getQuitQueueMark() { - return quitQueueMark; - } - - public void setQuitQueueMark(Integer quitQueueMark) { - this.quitQueueMark = quitQueueMark; - } - public Date getCreateTime() { return createTime; } @@ -70,8 +70,8 @@ public class UmsMemberRelationTree implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", memberId=").append(memberId); + sb.append(", lowerLevelId=").append(lowerLevelId); sb.append(", higherLevelId=").append(higherLevelId); - sb.append(", quitQueueMark=").append(quitQueueMark); sb.append(", createTime=").append(createTime); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); diff --git a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTreeExample.java b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTreeExample.java index 372a344..bca4e95 100644 --- a/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTreeExample.java +++ b/mall-dao/src/main/java/com/buy507/mall/model/UmsMemberRelationTreeExample.java @@ -225,6 +225,66 @@ public class UmsMemberRelationTreeExample { return (Criteria) this; } + public Criteria andLowerLevelIdIsNull() { + addCriterion("lower_level_id is null"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdIsNotNull() { + addCriterion("lower_level_id is not null"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdEqualTo(Long value) { + addCriterion("lower_level_id =", value, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdNotEqualTo(Long value) { + addCriterion("lower_level_id <>", value, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdGreaterThan(Long value) { + addCriterion("lower_level_id >", value, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdGreaterThanOrEqualTo(Long value) { + addCriterion("lower_level_id >=", value, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdLessThan(Long value) { + addCriterion("lower_level_id <", value, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdLessThanOrEqualTo(Long value) { + addCriterion("lower_level_id <=", value, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdIn(List values) { + addCriterion("lower_level_id in", values, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdNotIn(List values) { + addCriterion("lower_level_id not in", values, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdBetween(Long value1, Long value2) { + addCriterion("lower_level_id between", value1, value2, "lowerLevelId"); + return (Criteria) this; + } + + public Criteria andLowerLevelIdNotBetween(Long value1, Long value2) { + addCriterion("lower_level_id not between", value1, value2, "lowerLevelId"); + return (Criteria) this; + } + public Criteria andHigherLevelIdIsNull() { addCriterion("higher_level_id is null"); return (Criteria) this; @@ -235,116 +295,56 @@ public class UmsMemberRelationTreeExample { return (Criteria) this; } - public Criteria andHigherLevelIdEqualTo(Integer value) { + public Criteria andHigherLevelIdEqualTo(Long value) { addCriterion("higher_level_id =", value, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdNotEqualTo(Integer value) { + public Criteria andHigherLevelIdNotEqualTo(Long value) { addCriterion("higher_level_id <>", value, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdGreaterThan(Integer value) { + public Criteria andHigherLevelIdGreaterThan(Long value) { addCriterion("higher_level_id >", value, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdGreaterThanOrEqualTo(Integer value) { + public Criteria andHigherLevelIdGreaterThanOrEqualTo(Long value) { addCriterion("higher_level_id >=", value, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdLessThan(Integer value) { + public Criteria andHigherLevelIdLessThan(Long value) { addCriterion("higher_level_id <", value, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdLessThanOrEqualTo(Integer value) { + public Criteria andHigherLevelIdLessThanOrEqualTo(Long value) { addCriterion("higher_level_id <=", value, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdIn(List values) { + public Criteria andHigherLevelIdIn(List values) { addCriterion("higher_level_id in", values, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdNotIn(List values) { + public Criteria andHigherLevelIdNotIn(List values) { addCriterion("higher_level_id not in", values, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdBetween(Integer value1, Integer value2) { + public Criteria andHigherLevelIdBetween(Long value1, Long value2) { addCriterion("higher_level_id between", value1, value2, "higherLevelId"); return (Criteria) this; } - public Criteria andHigherLevelIdNotBetween(Integer value1, Integer value2) { + public Criteria andHigherLevelIdNotBetween(Long value1, Long value2) { addCriterion("higher_level_id not between", value1, value2, "higherLevelId"); return (Criteria) this; } - public Criteria andQuitQueueMarkIsNull() { - addCriterion("quit_queue_mark is null"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkIsNotNull() { - addCriterion("quit_queue_mark is not null"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkEqualTo(Integer value) { - addCriterion("quit_queue_mark =", value, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkNotEqualTo(Integer value) { - addCriterion("quit_queue_mark <>", value, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkGreaterThan(Integer value) { - addCriterion("quit_queue_mark >", value, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkGreaterThanOrEqualTo(Integer value) { - addCriterion("quit_queue_mark >=", value, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkLessThan(Integer value) { - addCriterion("quit_queue_mark <", value, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkLessThanOrEqualTo(Integer value) { - addCriterion("quit_queue_mark <=", value, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkIn(List values) { - addCriterion("quit_queue_mark in", values, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkNotIn(List values) { - addCriterion("quit_queue_mark not in", values, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkBetween(Integer value1, Integer value2) { - addCriterion("quit_queue_mark between", value1, value2, "quitQueueMark"); - return (Criteria) this; - } - - public Criteria andQuitQueueMarkNotBetween(Integer value1, Integer value2) { - addCriterion("quit_queue_mark not between", value1, value2, "quitQueueMark"); - return (Criteria) this; - } - public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; diff --git a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberAccountTransactionMapper.xml b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberAccountTransactionMapper.xml index 1c24511..c323e6d 100644 --- a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberAccountTransactionMapper.xml +++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberAccountTransactionMapper.xml @@ -6,9 +6,11 @@ + + @@ -69,7 +71,8 @@ - id, member_id, order_id, revenue_amount, remarks, commission_ratio, create_time + id, member_id, order_id, revenue_amount, transaction_state, remarks, commission_ratio, + create_time, transfer_payment_time @@ -179,6 +194,9 @@ revenue_amount = #{record.revenueAmount,jdbcType=DECIMAL}, + + transaction_state = #{record.transactionState,jdbcType=INTEGER}, + remarks = #{record.remarks,jdbcType=VARCHAR}, @@ -188,6 +206,9 @@ create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + transfer_payment_time = #{record.transferPaymentTime,jdbcType=TIMESTAMP}, + @@ -199,9 +220,11 @@ member_id = #{record.memberId,jdbcType=BIGINT}, order_id = #{record.orderId,jdbcType=BIGINT}, revenue_amount = #{record.revenueAmount,jdbcType=DECIMAL}, + transaction_state = #{record.transactionState,jdbcType=INTEGER}, remarks = #{record.remarks,jdbcType=VARCHAR}, commission_ratio = #{record.commissionRatio,jdbcType=INTEGER}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + transfer_payment_time = #{record.transferPaymentTime,jdbcType=TIMESTAMP} @@ -218,6 +241,9 @@ revenue_amount = #{revenueAmount,jdbcType=DECIMAL}, + + transaction_state = #{transactionState,jdbcType=INTEGER}, + remarks = #{remarks,jdbcType=VARCHAR}, @@ -227,6 +253,9 @@ create_time = #{createTime,jdbcType=TIMESTAMP}, + + transfer_payment_time = #{transferPaymentTime,jdbcType=TIMESTAMP}, + where id = #{id,jdbcType=BIGINT} @@ -235,9 +264,11 @@ set member_id = #{memberId,jdbcType=BIGINT}, order_id = #{orderId,jdbcType=BIGINT}, revenue_amount = #{revenueAmount,jdbcType=DECIMAL}, + transaction_state = #{transactionState,jdbcType=INTEGER}, remarks = #{remarks,jdbcType=VARCHAR}, commission_ratio = #{commissionRatio,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP} + create_time = #{createTime,jdbcType=TIMESTAMP}, + transfer_payment_time = #{transferPaymentTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=BIGINT} \ No newline at end of file diff --git a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.xml b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.xml new file mode 100644 index 0000000..8674172 --- /dev/null +++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberOrderQueueMapper.xml @@ -0,0 +1,274 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, member_id, order_id, order_amount, queue_index, quit_queue_mark, queue_type, + remain_number, create_time + + + + + delete from ums_member_order_queue + where id = #{id,jdbcType=BIGINT} + + + delete from ums_member_order_queue + + + + + + + SELECT LAST_INSERT_ID() + + insert into ums_member_order_queue (member_id, order_id, order_amount, + queue_index, quit_queue_mark, queue_type, + remain_number, create_time) + values (#{memberId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{orderAmount,jdbcType=DECIMAL}, + #{queueIndex,jdbcType=BIGINT}, #{quitQueueMark,jdbcType=INTEGER}, #{queueType,jdbcType=INTEGER}, + #{remainNumber,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}) + + + + SELECT LAST_INSERT_ID() + + insert into ums_member_order_queue + + + member_id, + + + order_id, + + + order_amount, + + + queue_index, + + + quit_queue_mark, + + + queue_type, + + + remain_number, + + + create_time, + + + + + #{memberId,jdbcType=BIGINT}, + + + #{orderId,jdbcType=BIGINT}, + + + #{orderAmount,jdbcType=DECIMAL}, + + + #{queueIndex,jdbcType=BIGINT}, + + + #{quitQueueMark,jdbcType=INTEGER}, + + + #{queueType,jdbcType=INTEGER}, + + + #{remainNumber,jdbcType=INTEGER}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + + + + update ums_member_order_queue + + + id = #{record.id,jdbcType=BIGINT}, + + + member_id = #{record.memberId,jdbcType=BIGINT}, + + + order_id = #{record.orderId,jdbcType=BIGINT}, + + + order_amount = #{record.orderAmount,jdbcType=DECIMAL}, + + + queue_index = #{record.queueIndex,jdbcType=BIGINT}, + + + quit_queue_mark = #{record.quitQueueMark,jdbcType=INTEGER}, + + + queue_type = #{record.queueType,jdbcType=INTEGER}, + + + remain_number = #{record.remainNumber,jdbcType=INTEGER}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + + + + + + update ums_member_order_queue + set id = #{record.id,jdbcType=BIGINT}, + member_id = #{record.memberId,jdbcType=BIGINT}, + order_id = #{record.orderId,jdbcType=BIGINT}, + order_amount = #{record.orderAmount,jdbcType=DECIMAL}, + queue_index = #{record.queueIndex,jdbcType=BIGINT}, + quit_queue_mark = #{record.quitQueueMark,jdbcType=INTEGER}, + queue_type = #{record.queueType,jdbcType=INTEGER}, + remain_number = #{record.remainNumber,jdbcType=INTEGER}, + create_time = #{record.createTime,jdbcType=TIMESTAMP} + + + + + + update ums_member_order_queue + + + member_id = #{memberId,jdbcType=BIGINT}, + + + order_id = #{orderId,jdbcType=BIGINT}, + + + order_amount = #{orderAmount,jdbcType=DECIMAL}, + + + queue_index = #{queueIndex,jdbcType=BIGINT}, + + + quit_queue_mark = #{quitQueueMark,jdbcType=INTEGER}, + + + queue_type = #{queueType,jdbcType=INTEGER}, + + + remain_number = #{remainNumber,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update ums_member_order_queue + set member_id = #{memberId,jdbcType=BIGINT}, + order_id = #{orderId,jdbcType=BIGINT}, + order_amount = #{orderAmount,jdbcType=DECIMAL}, + queue_index = #{queueIndex,jdbcType=BIGINT}, + quit_queue_mark = #{quitQueueMark,jdbcType=INTEGER}, + queue_type = #{queueType,jdbcType=INTEGER}, + remain_number = #{remainNumber,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberRelationTreeMapper.xml b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberRelationTreeMapper.xml index 8abc3f3..a9d288a 100644 --- a/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberRelationTreeMapper.xml +++ b/mall-dao/src/main/resources/com/buy507/mall/mapper/UmsMemberRelationTreeMapper.xml @@ -4,8 +4,8 @@ - - + + @@ -67,7 +67,7 @@ - id, member_id, higher_level_id, quit_queue_mark, create_time + id, member_id, lower_level_id, higher_level_id, create_time