拼团成员表

mall-api/src/main/java/com/txz/mall/dto/StorePinkMembersDTO.java → mall-api/src/main/java/com/txz/mall/dto/StorePinkSummaryDTO.java

@@ -1,8 +1,8 @@
 /*
 *
-* StorePinkMembersDTO.java
+* StorePinkSummaryDTO.java
 * Copyright(C) 2017-2020 fendo公司
-* @date 2025-08-18
+* @date 2025-08-19
 */
 package com.txz.mall.dto;
 
@@ -10,36 +10,11 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class StorePinkMembersDTO implements Serializable {
-    /**
-     * 主键
-     */
-    private Long id;
-
+public class StorePinkSummaryDTO implements Serializable {
     /**
      * 拼团ID
      */
-    private Long storePinkId;
-
-    /**
-     * 用户id
-     */
-    private Long uid;
-
-    /**
-     * 订单编号
-     */
-    private String orderId;
-
-    /**
-     * 订单表主键
-     */
-    private Long orderIdKey;
-
-    /**
-     * 购买商品个数
-     */
-    private Integer totalNum;
+    private Long id;
 
     /**
      * 购买总金额
@@ -56,6 +31,11 @@ public class StorePinkMembersDTO implements Serializable {
      */
     private Long pid;
 
+    /**
+     * 拼图总人数
+     */
+    private Integer people;
+
     /**
      * 拼团商品单价
      */
@@ -66,15 +46,20 @@ public class StorePinkMembersDTO implements Serializable {
      */
     private Date addTime;
 
+    /**
+     * 结束时间
+     */
+    private Date stopTime;
+
     /**
      * 天选 默认0  1为天选
      */
-    private Integer lId;
+    private Long lId;
 
     /**
-     * 团长id 0为团长
+     * 团长id
      */
-    private Integer kId;
+    private Long kId;
 
     /**
      * 是否发送模板消息  0未发送  1已发送
@@ -87,7 +72,7 @@ public class StorePinkMembersDTO implements Serializable {
     private Byte isRefund;
 
     /**
-     * 状态  1进行中  2已完成  3未完成
+     * 拼团状态  1进行中  2已完成  3未完成
      */
     private Byte status;
 
@@ -96,16 +81,6 @@ public class StorePinkMembersDTO implements Serializable {
      */
     private Boolean isVirtual;
 
-    /**
-     * 用户昵称
-     */
-    private String nickname;
-
-    /**
-     * 用户头像
-     */
-    private String avatar;
-
     /**
      * 创建时间
      */
@@ -132,106 +107,26 @@ public class StorePinkMembersDTO implements Serializable {
     private Byte isDelete;
 
     /**
-     * m_store_pink_members
+     * m_store_pink_summary
      */
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
-     * @return id 主键
+     * 拼团ID
+     * @return id 拼团ID
      */
     public Long getId() {
         return id;
     }
 
     /**
-     * 主键
-     * @param id 主键
+     * 拼团ID
+     * @param id 拼团ID
      */
     public void setId(Long id) {
         this.id = id;
     }
 
-    /**
-     * 拼团ID
-     * @return store_pink_id 拼团ID
-     */
-    public Long getStorePinkId() {
-        return storePinkId;
-    }
-
-    /**
-     * 拼团ID
-     * @param storePinkId 拼团ID
-     */
-    public void setStorePinkId(Long storePinkId) {
-        this.storePinkId = storePinkId;
-    }
-
-    /**
-     * 用户id
-     * @return uid 用户id
-     */
-    public Long getUid() {
-        return uid;
-    }
-
-    /**
-     * 用户id
-     * @param uid 用户id
-     */
-    public void setUid(Long uid) {
-        this.uid = uid;
-    }
-
-    /**
-     * 订单编号
-     * @return order_id 订单编号
-     */
-    public String getOrderId() {
-        return orderId;
-    }
-
-    /**
-     * 订单编号
-     * @param orderId 订单编号
-     */
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    /**
-     * 订单表主键
-     * @return order_id_key 订单表主键
-     */
-    public Long getOrderIdKey() {
-        return orderIdKey;
-    }
-
-    /**
-     * 订单表主键
-     * @param orderIdKey 订单表主键
-     */
-    public void setOrderIdKey(Long orderIdKey) {
-        this.orderIdKey = orderIdKey;
-    }
-
-    /**
-     * 购买商品个数
-     * @return total_num 购买商品个数
-     */
-    public Integer getTotalNum() {
-        return totalNum;
-    }
-
-    /**
-     * 购买商品个数
-     * @param totalNum 购买商品个数
-     */
-    public void setTotalNum(Integer totalNum) {
-        this.totalNum = totalNum;
-    }
-
     /**
      * 购买总金额
      * @return total_price 购买总金额
@@ -280,6 +175,22 @@ public class StorePinkMembersDTO implements Serializable {
         this.pid = pid;
     }
 
+    /**
+     * 拼图总人数
+     * @return people 拼图总人数
+     */
+    public Integer getPeople() {
+        return people;
+    }
+
+    /**
+     * 拼图总人数
+     * @param people 拼图总人数
+     */
+    public void setPeople(Integer people) {
+        this.people = people;
+    }
+
     /**
      * 拼团商品单价
      * @return price 拼团商品单价
@@ -312,11 +223,27 @@ public class StorePinkMembersDTO implements Serializable {
         this.addTime = addTime;
     }
 
+    /**
+     * 结束时间
+     * @return stop_time 结束时间
+     */
+    public Date getStopTime() {
+        return stopTime;
+    }
+
+    /**
+     * 结束时间
+     * @param stopTime 结束时间
+     */
+    public void setStopTime(Date stopTime) {
+        this.stopTime = stopTime;
+    }
+
     /**
      * 天选 默认0  1为天选
      * @return l_id 天选 默认0  1为天选
      */
-    public Integer getlId() {
+    public Long getlId() {
         return lId;
     }
 
@@ -324,23 +251,23 @@ public class StorePinkMembersDTO implements Serializable {
      * 天选 默认0  1为天选
      * @param lId 天选 默认0  1为天选
      */
-    public void setlId(Integer lId) {
+    public void setlId(Long lId) {
         this.lId = lId;
     }
 
     /**
-     * 团长id 0为团长
-     * @return k_id 团长id 0为团长
+     * 团长id
+     * @return k_id 团长id
      */
-    public Integer getkId() {
+    public Long getkId() {
         return kId;
     }
 
     /**
-     * 团长id 0为团长
-     * @param kId 团长id 0为团长
+     * 团长id
+     * @param kId 团长id
      */
-    public void setkId(Integer kId) {
+    public void setkId(Long kId) {
         this.kId = kId;
     }
 
@@ -377,16 +304,16 @@ public class StorePinkMembersDTO implements Serializable {
     }
 
     /**
-     * 状态  1进行中  2已完成  3未完成
-     * @return status 状态  1进行中  2已完成  3未完成
+     * 拼团状态  1进行中  2已完成  3未完成
+     * @return status 拼团状态  1进行中  2已完成  3未完成
      */
     public Byte getStatus() {
         return status;
     }
 
     /**
-     * 状态  1进行中  2已完成  3未完成
-     * @param status 状态  1进行中  2已完成  3未完成
+     * 拼团状态  1进行中  2已完成  3未完成
+     * @param status 拼团状态  1进行中  2已完成  3未完成
      */
     public void setStatus(Byte status) {
         this.status = status;
@@ -408,38 +335,6 @@ public class StorePinkMembersDTO implements Serializable {
         this.isVirtual = isVirtual;
     }
 
-    /**
-     * 用户昵称
-     * @return nickname 用户昵称
-     */
-    public String getNickname() {
-        return nickname;
-    }
-
-    /**
-     * 用户昵称
-     * @param nickname 用户昵称
-     */
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    /**
-     * 用户头像
-     * @return avatar 用户头像
-     */
-    public String getAvatar() {
-        return avatar;
-    }
-
-    /**
-     * 用户头像
-     * @param avatar 用户头像
-     */
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
     /**
      * 创建时间
      * @return create_time 创建时间

mall-interface/src/main/java/com/txz/mall/service/StorePinkMembersServiceClient.java

@@ -1,27 +0,0 @@
-package com.txz.mall.service;
-
-
-import com.txz.mall.dto.*;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
-
-@FeignClient("mall")
-public interface StorePinkMembersServiceClient {
-
-	@RequestMapping( value = {"/store/pink/members/add"}, method = {RequestMethod.POST} )
-    public Result add(@RequestBody StorePinkMembersDPO storePinkMembers,@RequestParam("userId") Long userId);
-
-	@RequestMapping( value = {"/store/pink/members/delete"}, method = {RequestMethod.POST} )
-	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
-
-	@RequestMapping( value = {"/store/pink/members/update"}, method = {RequestMethod.POST} )
-	public Result update(@RequestBody StorePinkMembersDPO storePinkMembers,@RequestParam("userId") Long userId);
-
-	@RequestMapping( value = {"/store/pink/members/detail"}, method = {RequestMethod.POST} )
-	public Result<StorePinkMembersDPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
-
-	@RequestMapping( value = {"/store/pink/members/list"}, method = {RequestMethod.POST} )
-	public Result<List<StorePinkMembersDPO>> list(@RequestBody StorePinkMembersDPO storePinkMembers, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
-}

mall-interface/src/main/java/com/txz/mall/service/StorePinkSummaryServiceClient.java

@@ -0,0 +1,27 @@
+package com.txz.mall.service;
+
+
+import com.txz.mall.dto.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+
+@FeignClient("mall")
+public interface StorePinkSummaryServiceClient {
+
+	@RequestMapping( value = {"/store/pink/summary/add"}, method = {RequestMethod.POST} )
+    public Result add(@RequestBody StorePinkSummaryDPO storePinkSummary,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/summary/delete"}, method = {RequestMethod.POST} )
+	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/summary/update"}, method = {RequestMethod.POST} )
+	public Result update(@RequestBody StorePinkSummaryDPO storePinkSummary,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/summary/detail"}, method = {RequestMethod.POST} )
+	public Result<StorePinkSummaryDPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/summary/list"}, method = {RequestMethod.POST} )
+	public Result<List<StorePinkSummaryDPO>> list(@RequestBody StorePinkSummaryDPO storePinkSummary, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
+}

mall-service/src/main/java/com/txz/mall/dao/StorePinkMembersMapper.java

@@ -1,7 +0,0 @@
-package com.txz.mall.dao;
-
-import com.txz.mall.core.Mapper;
-import com.txz.mall.model.StorePinkMembers;
-
-public interface StorePinkMembersMapper extends Mapper<StorePinkMembers> {
-}

mall-service/src/main/java/com/txz/mall/dao/StorePinkSummaryMapper.java

@@ -0,0 +1,7 @@
+package com.txz.mall.dao;
+
+import com.txz.mall.core.Mapper;
+import com.txz.mall.model.StorePinkSummary;
+
+public interface StorePinkSummaryMapper extends Mapper<StorePinkSummary> {
+}

mall-service/src/main/java/com/txz/mall/model/StorePinkMembers.java → mall-service/src/main/java/com/txz/mall/model/StorePinkSummary.java

@@ -4,44 +4,15 @@ import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 
-@Table(name = "m_store_pink_members")
-public class StorePinkMembers {
+@Table(name = "m_store_pink_summary")
+public class StorePinkSummary {
     /**
-     * 主键
+     * 拼团ID
      */
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    /**
-     * 拼团ID
-     */
-    @Column(name = "store_pink_id")
-    private Long storePinkId;
-
-    /**
-     * 用户id
-     */
-    private Long uid;
-
-    /**
-     * 订单编号
-     */
-    @Column(name = "order_id")
-    private String orderId;
-
-    /**
-     * 订单表主键
-     */
-    @Column(name = "order_id_key")
-    private Long orderIdKey;
-
-    /**
-     * 购买商品个数
-     */
-    @Column(name = "total_num")
-    private Integer totalNum;
-
     /**
      * 购买总金额
      */
@@ -58,6 +29,11 @@ public class StorePinkMembers {
      */
     private Long pid;
 
+    /**
+     * 拼图总人数
+     */
+    private Integer people;
+
     /**
      * 拼团商品单价
      */
@@ -69,17 +45,23 @@ public class StorePinkMembers {
     @Column(name = "add_time")
     private Date addTime;
 
+    /**
+     * 结束时间
+     */
+    @Column(name = "stop_time")
+    private Date stopTime;
+
     /**
      * 天选 默认0  1为天选
      */
     @Column(name = "l_id")
-    private Integer lId;
+    private Long lId;
 
     /**
-     * 团长id 0为团长
+     * 团长id
      */
     @Column(name = "k_id")
-    private Integer kId;
+    private Long kId;
 
     /**
      * 是否发送模板消息  0未发送  1已发送
@@ -94,7 +76,7 @@ public class StorePinkMembers {
     private Byte isRefund;
 
     /**
-     * 状态  1进行中  2已完成  3未完成
+     * 拼团状态  1进行中  2已完成  3未完成
      */
     private Byte status;
 
@@ -104,16 +86,6 @@ public class StorePinkMembers {
     @Column(name = "is_virtual")
     private Boolean isVirtual;
 
-    /**
-     * 用户昵称
-     */
-    private String nickname;
-
-    /**
-     * 用户头像
-     */
-    private String avatar;
-
     /**
      * 创建时间
      */
@@ -145,113 +117,23 @@ public class StorePinkMembers {
     private Byte isDelete;
 
     /**
-     * 获取主键
+     * 获取拼团ID
      *
-     * @return id - 主键
+     * @return id - 拼团ID
      */
     public Long getId() {
         return id;
     }
 
     /**
-     * 设置主键
+     * 设置拼团ID
      *
-     * @param id 主键
+     * @param id 拼团ID
      */
     public void setId(Long id) {
         this.id = id;
     }
 
-    /**
-     * 获取拼团ID
-     *
-     * @return store_pink_id - 拼团ID
-     */
-    public Long getStorePinkId() {
-        return storePinkId;
-    }
-
-    /**
-     * 设置拼团ID
-     *
-     * @param storePinkId 拼团ID
-     */
-    public void setStorePinkId(Long storePinkId) {
-        this.storePinkId = storePinkId;
-    }
-
-    /**
-     * 获取用户id
-     *
-     * @return uid - 用户id
-     */
-    public Long getUid() {
-        return uid;
-    }
-
-    /**
-     * 设置用户id
-     *
-     * @param uid 用户id
-     */
-    public void setUid(Long uid) {
-        this.uid = uid;
-    }
-
-    /**
-     * 获取订单编号
-     *
-     * @return order_id - 订单编号
-     */
-    public String getOrderId() {
-        return orderId;
-    }
-
-    /**
-     * 设置订单编号
-     *
-     * @param orderId 订单编号
-     */
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    /**
-     * 获取订单表主键
-     *
-     * @return order_id_key - 订单表主键
-     */
-    public Long getOrderIdKey() {
-        return orderIdKey;
-    }
-
-    /**
-     * 设置订单表主键
-     *
-     * @param orderIdKey 订单表主键
-     */
-    public void setOrderIdKey(Long orderIdKey) {
-        this.orderIdKey = orderIdKey;
-    }
-
-    /**
-     * 获取购买商品个数
-     *
-     * @return total_num - 购买商品个数
-     */
-    public Integer getTotalNum() {
-        return totalNum;
-    }
-
-    /**
-     * 设置购买商品个数
-     *
-     * @param totalNum 购买商品个数
-     */
-    public void setTotalNum(Integer totalNum) {
-        this.totalNum = totalNum;
-    }
-
     /**
      * 获取购买总金额
      *
@@ -306,6 +188,24 @@ public class StorePinkMembers {
         this.pid = pid;
     }
 
+    /**
+     * 获取拼图总人数
+     *
+     * @return people - 拼图总人数
+     */
+    public Integer getPeople() {
+        return people;
+    }
+
+    /**
+     * 设置拼图总人数
+     *
+     * @param people 拼图总人数
+     */
+    public void setPeople(Integer people) {
+        this.people = people;
+    }
+
     /**
      * 获取拼团商品单价
      *
@@ -342,12 +242,30 @@ public class StorePinkMembers {
         this.addTime = addTime;
     }
 
+    /**
+     * 获取结束时间
+     *
+     * @return stop_time - 结束时间
+     */
+    public Date getStopTime() {
+        return stopTime;
+    }
+
+    /**
+     * 设置结束时间
+     *
+     * @param stopTime 结束时间
+     */
+    public void setStopTime(Date stopTime) {
+        this.stopTime = stopTime;
+    }
+
     /**
      * 获取天选 默认0  1为天选
      *
      * @return l_id - 天选 默认0  1为天选
      */
-    public Integer getlId() {
+    public Long getlId() {
         return lId;
     }
 
@@ -356,25 +274,25 @@ public class StorePinkMembers {
      *
      * @param lId 天选 默认0  1为天选
      */
-    public void setlId(Integer lId) {
+    public void setlId(Long lId) {
         this.lId = lId;
     }
 
     /**
-     * 获取团长id 0为团长
+     * 获取团长id
      *
-     * @return k_id - 团长id 0为团长
+     * @return k_id - 团长id
      */
-    public Integer getkId() {
+    public Long getkId() {
         return kId;
     }
 
     /**
-     * 设置团长id 0为团长
+     * 设置团长id
      *
-     * @param kId 团长id 0为团长
+     * @param kId 团长id
      */
-    public void setkId(Integer kId) {
+    public void setkId(Long kId) {
         this.kId = kId;
     }
 
@@ -415,18 +333,18 @@ public class StorePinkMembers {
     }
 
     /**
-     * 获取状态  1进行中  2已完成  3未完成
+     * 获取拼团状态  1进行中  2已完成  3未完成
      *
-     * @return status - 状态  1进行中  2已完成  3未完成
+     * @return status - 拼团状态  1进行中  2已完成  3未完成
      */
     public Byte getStatus() {
         return status;
     }
 
     /**
-     * 设置状态  1进行中  2已完成  3未完成
+     * 设置拼团状态  1进行中  2已完成  3未完成
      *
-     * @param status 状态  1进行中  2已完成  3未完成
+     * @param status 拼团状态  1进行中  2已完成  3未完成
      */
     public void setStatus(Byte status) {
         this.status = status;
@@ -450,42 +368,6 @@ public class StorePinkMembers {
         this.isVirtual = isVirtual;
     }
 
-    /**
-     * 获取用户昵称
-     *
-     * @return nickname - 用户昵称
-     */
-    public String getNickname() {
-        return nickname;
-    }
-
-    /**
-     * 设置用户昵称
-     *
-     * @param nickname 用户昵称
-     */
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-
-    /**
-     * 获取用户头像
-     *
-     * @return avatar - 用户头像
-     */
-    public String getAvatar() {
-        return avatar;
-    }
-
-    /**
-     * 设置用户头像
-     *
-     * @param avatar 用户头像
-     */
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
     /**
      * 获取创建时间
      *

mall-service/src/main/java/com/txz/mall/service/StorePinkMembersService.java

@@ -1,11 +0,0 @@
-package com.txz.mall.service;
-import com.txz.mall.model.StorePinkMembers;
-import com.txz.mall.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2025/08/18.
- */
-public interface StorePinkMembersService extends Service<StorePinkMembers> {
-
-}

mall-service/src/main/java/com/txz/mall/service/StorePinkSummaryService.java

@@ -0,0 +1,11 @@
+package com.txz.mall.service;
+import com.txz.mall.model.StorePinkSummary;
+import com.txz.mall.core.Service;
+
+
+/**
+ * Created by CodeGenerator on 2025/08/19.
+ */
+public interface StorePinkSummaryService extends Service<StorePinkSummary> {
+
+}

mall-service/src/main/java/com/txz/mall/service/impl/StorePinkMembersServiceImpl.java

@@ -1,22 +0,0 @@
-package com.txz.mall.service.impl;
-
-import com.txz.mall.dao.StorePinkMembersMapper;
-import com.txz.mall.model.StorePinkMembers;
-import com.txz.mall.service.StorePinkMembersService;
-import com.txz.mall.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2025/08/18.
- */
-@Service
-@Transactional
-public class StorePinkMembersServiceImpl extends AbstractService<StorePinkMembers> implements StorePinkMembersService {
-    @Resource
-    private StorePinkMembersMapper mStorePinkMembersMapper;
-
-}

mall-service/src/main/java/com/txz/mall/service/impl/StorePinkSummaryServiceImpl.java

@@ -0,0 +1,22 @@
+package com.txz.mall.service.impl;
+
+import com.txz.mall.dao.StorePinkSummaryMapper;
+import com.txz.mall.model.StorePinkSummary;
+import com.txz.mall.service.StorePinkSummaryService;
+import com.txz.mall.core.AbstractService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/08/19.
+ */
+@Service
+@Transactional
+public class StorePinkSummaryServiceImpl extends AbstractService<StorePinkSummary> implements StorePinkSummaryService {
+    @Resource
+    private StorePinkSummaryMapper mStorePinkSummaryMapper;
+
+}

mall-service/src/main/java/com/txz/mall/web/mng/StorePinkMembersController.java → mall-service/src/main/java/com/txz/mall/web/mng/StorePinkSummaryController.java

@@ -1,7 +1,7 @@
 package com.txz.mall.web.mng;
 import com.txz.mall.core.Result;
-import com.txz.mall.model.StorePinkMembers;
-import com.txz.mall.service.StorePinkMembersService;
+import com.txz.mall.model.StorePinkSummary;
+import com.txz.mall.service.StorePinkSummaryService;
 
 import com.txz.mall.core.ResultCode;
 
@@ -25,28 +25,28 @@ import java.util.List;
 import java.util.Date;
 
 /**
-* Created by CodeGenerator on 2025/08/18.
+* Created by CodeGenerator on 2025/08/19.
 */
-@Api(tags = "[后台]storePinkMembers管理")
+@Api(tags = "[后台]storePinkSummary管理")
 @RestController
-@RequestMapping("/store/pink/members")
-public class StorePinkMembersController {
+@RequestMapping("/store/pink/summary")
+public class StorePinkSummaryController {
 
-	private static Logger log = LoggerFactory.getLogger(StorePinkMembersController.class);
+	private static Logger log = LoggerFactory.getLogger(StorePinkSummaryController.class);
 
     @Resource
-    private StorePinkMembersService storePinkMembersService;
+    private StorePinkSummaryService storePinkSummaryService;
 
     @PostMapping("/add")
-	@ApiOperation(value = "storePinkMembers新增")
-	public Result add(@RequestBody StorePinkMembers storePinkMembers) {
-    	if(storePinkMembers == null){
+	@ApiOperation(value = "storePinkSummary新增")
+	public Result add(@RequestBody StorePinkSummary storePinkSummary) {
+    	if(storePinkSummary == null){
     		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
     	try {
-    		storePinkMembers.setCreateTime(new Date());
-//            storePinkMembers.setCreateUserId(userId);
-    		storePinkMembersService.save(storePinkMembers);
+    		storePinkSummary.setCreateTime(new Date());
+//            storePinkSummary.setCreateUserId(userId);
+    		storePinkSummaryService.save(storePinkSummary);
 		} catch (Exception e) {
 			log.error("新增对象操作异常e:{}",e);
 			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -55,16 +55,16 @@ public class StorePinkMembersController {
     }
 
     @DeleteMapping("/delete")
-	@ApiOperation(value = "storePinkMembers删除")
+	@ApiOperation(value = "storePinkSummary删除")
 	public Result delete(@RequestParam Long id) {
     	if(id == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
     	try {
-            StorePinkMembers storePinkMembers = new StorePinkMembers();
-			storePinkMembers.setId(id);
-			storePinkMembers.setIsDelete(1);
-			storePinkMembersService.update(storePinkMembers);
+            StorePinkSummary storePinkSummary = new StorePinkSummary();
+			storePinkSummary.setId(id);
+			storePinkSummary.setIsDelete(1);
+			storePinkSummaryService.update(storePinkSummary);
 		} catch (Exception e) {
 			log.error("删除对象操作异常e:{}",e);
 			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -73,18 +73,18 @@ public class StorePinkMembersController {
     }
 
     @PutMapping("/update")
-	@ApiOperation(value = "storePinkMembers更新")
-	public Result update(@RequestBody StorePinkMembers storePinkMembers) {
-    	if(storePinkMembers == null){
+	@ApiOperation(value = "storePinkSummary更新")
+	public Result update(@RequestBody StorePinkSummary storePinkSummary) {
+    	if(storePinkSummary == null){
     		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
-    	if(storePinkMembers.getId() == null){
+    	if(storePinkSummary.getId() == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
     	try {
-    		storePinkMembers.setUpdateTime(new Date());
-//            storePinkMembers.setUpdateUserId(userId);
-    		storePinkMembersService.update(storePinkMembers);
+    		storePinkSummary.setUpdateTime(new Date());
+//            storePinkSummary.setUpdateUserId(userId);
+    		storePinkSummaryService.update(storePinkSummary);
 		} catch (Exception e) {
 			log.error("更新对象操作异常e:{}",e);
 			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
@@ -93,33 +93,33 @@ public class StorePinkMembersController {
     }
 
     @GetMapping("/detail")
-	@ApiOperation(value = "storePinkMembers获取详情")
-	public Result<StorePinkMembers> detail(@RequestParam Long id) {
+	@ApiOperation(value = "storePinkSummary获取详情")
+	public Result<StorePinkSummary> detail(@RequestParam Long id) {
     	if(id == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
-    	StorePinkMembers storePinkMembers = null;
+    	StorePinkSummary storePinkSummary = null;
     	try {
-    		storePinkMembers = storePinkMembersService.findById(id);
+    		storePinkSummary = storePinkSummaryService.findById(id);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);
 			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-        return Result.success(storePinkMembers);
+        return Result.success(storePinkSummary);
     }
 
     @PostMapping("/list")
-	@ApiOperation(value = "storePinkMembers获取列表")
-	public Result<List<StorePinkMembers>> list(@Validated @RequestBody StorePinkMembersDTO dto) {
+	@ApiOperation(value = "storePinkSummary获取列表")
+	public Result<List<StorePinkSummary>> list(@Validated @RequestBody StorePinkSummaryDTO dto) {
         PageHelper.startPage(dto.getPage(), dto.getSize());
 
-        Condition condition = new Condition(StorePinkMembers.class);
+        Condition condition = new Condition(StorePinkSummary.class);
         Criteria criteria = condition.createCriteria();
 		criteria.andEqualTo("isDelete", 0);
 		condition.setOrderByClause("create_time DESC");
 		PageInfo pageInfo = null;
 		try {
-    		 List<StorePinkMembers> list = storePinkMembersService.findByCondition(condition);
+    		 List<StorePinkSummary> list = storePinkSummaryService.findByCondition(condition);
     		 pageInfo = new PageInfo(list);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);

mall-service/src/main/resources/mapper/StorePinkMembersMapper.xml → mall-service/src/main/resources/mapper/StorePinkSummaryMapper.xml

@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.txz.mall.dao.StorePinkMembersMapper">
-  <resultMap id="BaseResultMap" type="com.txz.mall.model.StorePinkMembers">
+<mapper namespace="com.txz.mall.dao.StorePinkSummaryMapper">
+  <resultMap id="BaseResultMap" type="com.txz.mall.model.StorePinkSummary">
     <!--
       WARNING - @mbg.generated
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="store_pink_id" jdbcType="BIGINT" property="storePinkId" />
-    <result column="uid" jdbcType="BIGINT" property="uid" />
-    <result column="order_id" jdbcType="VARCHAR" property="orderId" />
-    <result column="order_id_key" jdbcType="BIGINT" property="orderIdKey" />
-    <result column="total_num" jdbcType="INTEGER" property="totalNum" />
     <result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
     <result column="cid" jdbcType="BIGINT" property="cid" />
     <result column="pid" jdbcType="BIGINT" property="pid" />
+    <result column="people" jdbcType="INTEGER" property="people" />
     <result column="price" jdbcType="DECIMAL" property="price" />
     <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
-    <result column="l_id" jdbcType="INTEGER" property="lId" />
-    <result column="k_id" jdbcType="INTEGER" property="kId" />
+    <result column="stop_time" jdbcType="TIMESTAMP" property="stopTime" />
+    <result column="l_id" jdbcType="BIGINT" property="lId" />
+    <result column="k_id" jdbcType="BIGINT" property="kId" />
     <result column="is_tpl" jdbcType="TINYINT" property="isTpl" />
     <result column="is_refund" jdbcType="TINYINT" property="isRefund" />
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="is_virtual" jdbcType="BIT" property="isVirtual" />
-    <result column="nickname" jdbcType="VARCHAR" property="nickname" />
-    <result column="avatar" jdbcType="VARCHAR" property="avatar" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="create_user_id" jdbcType="BIGINT" property="createUserId" />