地址 拼单

mall-api/src/main/java/com/txz/mall/dto/StoreOrderDTO.java

@@ -0,0 +1,1268 @@
+/*
+ *
+ * StoreOrderDTO.java
+ * Copyright(C) 2017-2020 fendo公司
+ * @date 2025-07-15
+ */
+package com.txz.mall.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StoreOrderDTO implements Serializable {
+    /**
+     * m_store_order
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     * 订单ID
+     */
+    private Long id;
+    /**
+     * 订单号
+     */
+    private String orderId;
+    /**
+     * 用户id
+     */
+    private Long uid;
+    /**
+     * 用户姓名
+     */
+    private String realName;
+    /**
+     * 用户电话
+     */
+    private String userPhone;
+    /**
+     * 详细地址
+     */
+    private String userAddress;
+    /**
+     * 运费金额
+     */
+    private BigDecimal freightPrice;
+    /**
+     * 订单商品总数
+     */
+    private Integer totalNum;
+    /**
+     * 订单总价
+     */
+    private BigDecimal totalPrice;
+    /**
+     * 邮费
+     */
+    private BigDecimal totalPostage;
+    /**
+     * 实际支付金额
+     */
+    private BigDecimal payPrice;
+    /**
+     * 支付邮费
+     */
+    private BigDecimal payPostage;
+    /**
+     * 抵扣金额
+     */
+    private BigDecimal deductionPrice;
+    /**
+     * 优惠券id
+     */
+    private Long couponId;
+    /**
+     * 优惠券金额
+     */
+    private BigDecimal couponPrice;
+    /**
+     * 支付状态
+     */
+    private Byte paid;
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+    /**
+     * 支付方式
+     */
+    private String payType;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）
+     */
+    private Boolean status;
+    /**
+     * 0 未退款 1 申请中 2 已退款 3 退款中
+     */
+    private Byte refundStatus;
+    /**
+     * 退款图片
+     */
+    private String refundReasonWapImg;
+    /**
+     * 退款用户说明
+     */
+    private String refundReasonWapExplain;
+    /**
+     * 前台退款原因
+     */
+    private String refundReasonWap;
+    /**
+     * 不退款的理由
+     */
+    private String refundReason;
+    /**
+     * 退款时间
+     */
+    private Date refundReasonTime;
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundPrice;
+    /**
+     * 快递名称/送货人姓名
+     */
+    private String deliveryName;
+    /**
+     * 发货类型
+     */
+    private String deliveryType;
+    /**
+     * 快递单号/手机号
+     */
+    private String deliveryId;
+    /**
+     * 消费赚取积分
+     */
+    private Integer gainIntegral;
+    /**
+     * 使用积分
+     */
+    private Integer useIntegral;
+    /**
+     * 给用户退了多少积分
+     */
+    private Integer backIntegral;
+    /**
+     * 备注
+     */
+    private String mark;
+    /**
+     * 是否删除
+     */
+    private Byte isDelete;
+    /**
+     * 管理员备注
+     */
+    private String remark;
+    /**
+     * 商户ID
+     */
+    private Long merId;
+    /**
+     *
+     */
+    private Byte isMerCheck;
+    /**
+     * 拼团商品id0一般商品
+     */
+    private Integer combinationId;
+    /**
+     * 拼团id 0没有拼团
+     */
+    private Integer pinkId;
+    /**
+     * 成本价
+     */
+    private BigDecimal cost;
+    /**
+     * 秒杀商品ID
+     */
+    private Long seckillId;
+    /**
+     * 砍价id
+     */
+    private Long bargainId;
+    /**
+     * 核销码
+     */
+    private String verifyCode;
+    /**
+     * 门店id
+     */
+    private Long storeId;
+    /**
+     * 配送方式 1=快递 ，2=门店自提
+     */
+    private Boolean shippingType;
+    /**
+     * 店员id/核销员id
+     */
+    private Integer clerkId;
+    /**
+     * 支付渠道(0微信公众号1微信小程序2余额)
+     */
+    private Byte isChannel;
+    /**
+     * 消息提醒
+     */
+    private Byte isRemind;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 快递公司简称
+     */
+    private String deliveryCode;
+    /**
+     * 用户拼团活动id 0没有
+     */
+    private Integer bargainUserId;
+    /**
+     * 订单类型:0-普通订单，1-视频号订单
+     */
+    private Integer type;
+    /**
+     * 商品总价
+     */
+    private BigDecimal proTotalPrice;
+    /**
+     * 改价前支付金额
+     */
+    private BigDecimal beforePayPrice;
+    /**
+     * 是否改价,0-否，1-是
+     */
+    private Boolean isAlterPrice;
+    /**
+     * 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+     */
+    private String outTradeNo;
+
+    /**
+     * 订单ID
+     *
+     * @return id 订单ID
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 订单ID
+     *
+     * @param id 订单ID
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 订单号
+     *
+     * @return order_id 订单号
+     */
+    public String getOrderId() {
+        return orderId;
+    }
+
+    /**
+     * 订单号
+     *
+     * @param orderId 订单号
+     */
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    /**
+     * 用户id
+     *
+     * @return uid 用户id
+     */
+    public Long getUid() {
+        return uid;
+    }
+
+    /**
+     * 用户id
+     *
+     * @param uid 用户id
+     */
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    /**
+     * 用户姓名
+     *
+     * @return real_name 用户姓名
+     */
+    public String getRealName() {
+        return realName;
+    }
+
+    /**
+     * 用户姓名
+     *
+     * @param realName 用户姓名
+     */
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    /**
+     * 用户电话
+     *
+     * @return user_phone 用户电话
+     */
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    /**
+     * 用户电话
+     *
+     * @param userPhone 用户电话
+     */
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    /**
+     * 详细地址
+     *
+     * @return user_address 详细地址
+     */
+    public String getUserAddress() {
+        return userAddress;
+    }
+
+    /**
+     * 详细地址
+     *
+     * @param userAddress 详细地址
+     */
+    public void setUserAddress(String userAddress) {
+        this.userAddress = userAddress;
+    }
+
+    /**
+     * 运费金额
+     *
+     * @return freight_price 运费金额
+     */
+    public BigDecimal getFreightPrice() {
+        return freightPrice;
+    }
+
+    /**
+     * 运费金额
+     *
+     * @param freightPrice 运费金额
+     */
+    public void setFreightPrice(BigDecimal freightPrice) {
+        this.freightPrice = freightPrice;
+    }
+
+    /**
+     * 订单商品总数
+     *
+     * @return total_num 订单商品总数
+     */
+    public Integer getTotalNum() {
+        return totalNum;
+    }
+
+    /**
+     * 订单商品总数
+     *
+     * @param totalNum 订单商品总数
+     */
+    public void setTotalNum(Integer totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    /**
+     * 订单总价
+     *
+     * @return total_price 订单总价
+     */
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
+    }
+
+    /**
+     * 订单总价
+     *
+     * @param totalPrice 订单总价
+     */
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    /**
+     * 邮费
+     *
+     * @return total_postage 邮费
+     */
+    public BigDecimal getTotalPostage() {
+        return totalPostage;
+    }
+
+    /**
+     * 邮费
+     *
+     * @param totalPostage 邮费
+     */
+    public void setTotalPostage(BigDecimal totalPostage) {
+        this.totalPostage = totalPostage;
+    }
+
+    /**
+     * 实际支付金额
+     *
+     * @return pay_price 实际支付金额
+     */
+    public BigDecimal getPayPrice() {
+        return payPrice;
+    }
+
+    /**
+     * 实际支付金额
+     *
+     * @param payPrice 实际支付金额
+     */
+    public void setPayPrice(BigDecimal payPrice) {
+        this.payPrice = payPrice;
+    }
+
+    /**
+     * 支付邮费
+     *
+     * @return pay_postage 支付邮费
+     */
+    public BigDecimal getPayPostage() {
+        return payPostage;
+    }
+
+    /**
+     * 支付邮费
+     *
+     * @param payPostage 支付邮费
+     */
+    public void setPayPostage(BigDecimal payPostage) {
+        this.payPostage = payPostage;
+    }
+
+    /**
+     * 抵扣金额
+     *
+     * @return deduction_price 抵扣金额
+     */
+    public BigDecimal getDeductionPrice() {
+        return deductionPrice;
+    }
+
+    /**
+     * 抵扣金额
+     *
+     * @param deductionPrice 抵扣金额
+     */
+    public void setDeductionPrice(BigDecimal deductionPrice) {
+        this.deductionPrice = deductionPrice;
+    }
+
+    /**
+     * 优惠券id
+     *
+     * @return coupon_id 优惠券id
+     */
+    public Long getCouponId() {
+        return couponId;
+    }
+
+    /**
+     * 优惠券id
+     *
+     * @param couponId 优惠券id
+     */
+    public void setCouponId(Long couponId) {
+        this.couponId = couponId;
+    }
+
+    /**
+     * 优惠券金额
+     *
+     * @return coupon_price 优惠券金额
+     */
+    public BigDecimal getCouponPrice() {
+        return couponPrice;
+    }
+
+    /**
+     * 优惠券金额
+     *
+     * @param couponPrice 优惠券金额
+     */
+    public void setCouponPrice(BigDecimal couponPrice) {
+        this.couponPrice = couponPrice;
+    }
+
+    /**
+     * 支付状态
+     *
+     * @return paid 支付状态
+     */
+    public Byte getPaid() {
+        return paid;
+    }
+
+    /**
+     * 支付状态
+     *
+     * @param paid 支付状态
+     */
+    public void setPaid(Byte paid) {
+        this.paid = paid;
+    }
+
+    /**
+     * 支付时间
+     *
+     * @return pay_time 支付时间
+     */
+    public Date getPayTime() {
+        return payTime;
+    }
+
+    /**
+     * 支付时间
+     *
+     * @param payTime 支付时间
+     */
+    public void setPayTime(Date payTime) {
+        this.payTime = payTime;
+    }
+
+    /**
+     * 支付方式
+     *
+     * @return pay_type 支付方式
+     */
+    public String getPayType() {
+        return payType;
+    }
+
+    /**
+     * 支付方式
+     *
+     * @param payType 支付方式
+     */
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
+
+    /**
+     * 创建时间
+     *
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）
+     *
+     * @return status 订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）
+     */
+    public Boolean getStatus() {
+        return status;
+    }
+
+    /**
+     * 订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）
+     *
+     * @param status 订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）
+     */
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
+
+    /**
+     * 0 未退款 1 申请中 2 已退款 3 退款中
+     *
+     * @return refund_status 0 未退款 1 申请中 2 已退款 3 退款中
+     */
+    public Byte getRefundStatus() {
+        return refundStatus;
+    }
+
+    /**
+     * 0 未退款 1 申请中 2 已退款 3 退款中
+     *
+     * @param refundStatus 0 未退款 1 申请中 2 已退款 3 退款中
+     */
+    public void setRefundStatus(Byte refundStatus) {
+        this.refundStatus = refundStatus;
+    }
+
+    /**
+     * 退款图片
+     *
+     * @return refund_reason_wap_img 退款图片
+     */
+    public String getRefundReasonWapImg() {
+        return refundReasonWapImg;
+    }
+
+    /**
+     * 退款图片
+     *
+     * @param refundReasonWapImg 退款图片
+     */
+    public void setRefundReasonWapImg(String refundReasonWapImg) {
+        this.refundReasonWapImg = refundReasonWapImg;
+    }
+
+    /**
+     * 退款用户说明
+     *
+     * @return refund_reason_wap_explain 退款用户说明
+     */
+    public String getRefundReasonWapExplain() {
+        return refundReasonWapExplain;
+    }
+
+    /**
+     * 退款用户说明
+     *
+     * @param refundReasonWapExplain 退款用户说明
+     */
+    public void setRefundReasonWapExplain(String refundReasonWapExplain) {
+        this.refundReasonWapExplain = refundReasonWapExplain;
+    }
+
+    /**
+     * 前台退款原因
+     *
+     * @return refund_reason_wap 前台退款原因
+     */
+    public String getRefundReasonWap() {
+        return refundReasonWap;
+    }
+
+    /**
+     * 前台退款原因
+     *
+     * @param refundReasonWap 前台退款原因
+     */
+    public void setRefundReasonWap(String refundReasonWap) {
+        this.refundReasonWap = refundReasonWap;
+    }
+
+    /**
+     * 不退款的理由
+     *
+     * @return refund_reason 不退款的理由
+     */
+    public String getRefundReason() {
+        return refundReason;
+    }
+
+    /**
+     * 不退款的理由
+     *
+     * @param refundReason 不退款的理由
+     */
+    public void setRefundReason(String refundReason) {
+        this.refundReason = refundReason;
+    }
+
+    /**
+     * 退款时间
+     *
+     * @return refund_reason_time 退款时间
+     */
+    public Date getRefundReasonTime() {
+        return refundReasonTime;
+    }
+
+    /**
+     * 退款时间
+     *
+     * @param refundReasonTime 退款时间
+     */
+    public void setRefundReasonTime(Date refundReasonTime) {
+        this.refundReasonTime = refundReasonTime;
+    }
+
+    /**
+     * 退款金额
+     *
+     * @return refund_price 退款金额
+     */
+    public BigDecimal getRefundPrice() {
+        return refundPrice;
+    }
+
+    /**
+     * 退款金额
+     *
+     * @param refundPrice 退款金额
+     */
+    public void setRefundPrice(BigDecimal refundPrice) {
+        this.refundPrice = refundPrice;
+    }
+
+    /**
+     * 快递名称/送货人姓名
+     *
+     * @return delivery_name 快递名称/送货人姓名
+     */
+    public String getDeliveryName() {
+        return deliveryName;
+    }
+
+    /**
+     * 快递名称/送货人姓名
+     *
+     * @param deliveryName 快递名称/送货人姓名
+     */
+    public void setDeliveryName(String deliveryName) {
+        this.deliveryName = deliveryName;
+    }
+
+    /**
+     * 发货类型
+     *
+     * @return delivery_type 发货类型
+     */
+    public String getDeliveryType() {
+        return deliveryType;
+    }
+
+    /**
+     * 发货类型
+     *
+     * @param deliveryType 发货类型
+     */
+    public void setDeliveryType(String deliveryType) {
+        this.deliveryType = deliveryType;
+    }
+
+    /**
+     * 快递单号/手机号
+     *
+     * @return delivery_id 快递单号/手机号
+     */
+    public String getDeliveryId() {
+        return deliveryId;
+    }
+
+    /**
+     * 快递单号/手机号
+     *
+     * @param deliveryId 快递单号/手机号
+     */
+    public void setDeliveryId(String deliveryId) {
+        this.deliveryId = deliveryId;
+    }
+
+    /**
+     * 消费赚取积分
+     *
+     * @return gain_integral 消费赚取积分
+     */
+    public Integer getGainIntegral() {
+        return gainIntegral;
+    }
+
+    /**
+     * 消费赚取积分
+     *
+     * @param gainIntegral 消费赚取积分
+     */
+    public void setGainIntegral(Integer gainIntegral) {
+        this.gainIntegral = gainIntegral;
+    }
+
+    /**
+     * 使用积分
+     *
+     * @return use_integral 使用积分
+     */
+    public Integer getUseIntegral() {
+        return useIntegral;
+    }
+
+    /**
+     * 使用积分
+     *
+     * @param useIntegral 使用积分
+     */
+    public void setUseIntegral(Integer useIntegral) {
+        this.useIntegral = useIntegral;
+    }
+
+    /**
+     * 给用户退了多少积分
+     *
+     * @return back_integral 给用户退了多少积分
+     */
+    public Integer getBackIntegral() {
+        return backIntegral;
+    }
+
+    /**
+     * 给用户退了多少积分
+     *
+     * @param backIntegral 给用户退了多少积分
+     */
+    public void setBackIntegral(Integer backIntegral) {
+        this.backIntegral = backIntegral;
+    }
+
+    /**
+     * 备注
+     *
+     * @return mark 备注
+     */
+    public String getMark() {
+        return mark;
+    }
+
+    /**
+     * 备注
+     *
+     * @param mark 备注
+     */
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    /**
+     * 是否删除
+     *
+     * @return is_delete 是否删除
+     */
+    public Byte getIsDelete() {
+        return isDelete;
+    }
+
+    /**
+     * 是否删除
+     *
+     * @param isDelete 是否删除
+     */
+    public void setIsDelete(Byte isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    /**
+     * 管理员备注
+     *
+     * @return remark 管理员备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 管理员备注
+     *
+     * @param remark 管理员备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 商户ID
+     *
+     * @return mer_id 商户ID
+     */
+    public Long getMerId() {
+        return merId;
+    }
+
+    /**
+     * 商户ID
+     *
+     * @param merId 商户ID
+     */
+    public void setMerId(Long merId) {
+        this.merId = merId;
+    }
+
+    /**
+     * @return is_mer_check
+     */
+    public Byte getIsMerCheck() {
+        return isMerCheck;
+    }
+
+    /**
+     * @param isMerCheck
+     */
+    public void setIsMerCheck(Byte isMerCheck) {
+        this.isMerCheck = isMerCheck;
+    }
+
+    /**
+     * 拼团商品id0一般商品
+     *
+     * @return combination_id 拼团商品id0一般商品
+     */
+    public Integer getCombinationId() {
+        return combinationId;
+    }
+
+    /**
+     * 拼团商品id0一般商品
+     *
+     * @param combinationId 拼团商品id0一般商品
+     */
+    public void setCombinationId(Integer combinationId) {
+        this.combinationId = combinationId;
+    }
+
+    /**
+     * 拼团id 0没有拼团
+     *
+     * @return pink_id 拼团id 0没有拼团
+     */
+    public Integer getPinkId() {
+        return pinkId;
+    }
+
+    /**
+     * 拼团id 0没有拼团
+     *
+     * @param pinkId 拼团id 0没有拼团
+     */
+    public void setPinkId(Integer pinkId) {
+        this.pinkId = pinkId;
+    }
+
+    /**
+     * 成本价
+     *
+     * @return cost 成本价
+     */
+    public BigDecimal getCost() {
+        return cost;
+    }
+
+    /**
+     * 成本价
+     *
+     * @param cost 成本价
+     */
+    public void setCost(BigDecimal cost) {
+        this.cost = cost;
+    }
+
+    /**
+     * 秒杀商品ID
+     *
+     * @return seckill_id 秒杀商品ID
+     */
+    public Long getSeckillId() {
+        return seckillId;
+    }
+
+    /**
+     * 秒杀商品ID
+     *
+     * @param seckillId 秒杀商品ID
+     */
+    public void setSeckillId(Long seckillId) {
+        this.seckillId = seckillId;
+    }
+
+    /**
+     * 砍价id
+     *
+     * @return bargain_id 砍价id
+     */
+    public Long getBargainId() {
+        return bargainId;
+    }
+
+    /**
+     * 砍价id
+     *
+     * @param bargainId 砍价id
+     */
+    public void setBargainId(Long bargainId) {
+        this.bargainId = bargainId;
+    }
+
+    /**
+     * 核销码
+     *
+     * @return verify_code 核销码
+     */
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    /**
+     * 核销码
+     *
+     * @param verifyCode 核销码
+     */
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    /**
+     * 门店id
+     *
+     * @return store_id 门店id
+     */
+    public Long getStoreId() {
+        return storeId;
+    }
+
+    /**
+     * 门店id
+     *
+     * @param storeId 门店id
+     */
+    public void setStoreId(Long storeId) {
+        this.storeId = storeId;
+    }
+
+    /**
+     * 配送方式 1=快递 ，2=门店自提
+     *
+     * @return shipping_type 配送方式 1=快递 ，2=门店自提
+     */
+    public Boolean getShippingType() {
+        return shippingType;
+    }
+
+    /**
+     * 配送方式 1=快递 ，2=门店自提
+     *
+     * @param shippingType 配送方式 1=快递 ，2=门店自提
+     */
+    public void setShippingType(Boolean shippingType) {
+        this.shippingType = shippingType;
+    }
+
+    /**
+     * 店员id/核销员id
+     *
+     * @return clerk_id 店员id/核销员id
+     */
+    public Integer getClerkId() {
+        return clerkId;
+    }
+
+    /**
+     * 店员id/核销员id
+     *
+     * @param clerkId 店员id/核销员id
+     */
+    public void setClerkId(Integer clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    /**
+     * 支付渠道(0微信公众号1微信小程序2余额)
+     *
+     * @return is_channel 支付渠道(0微信公众号1微信小程序2余额)
+     */
+    public Byte getIsChannel() {
+        return isChannel;
+    }
+
+    /**
+     * 支付渠道(0微信公众号1微信小程序2余额)
+     *
+     * @param isChannel 支付渠道(0微信公众号1微信小程序2余额)
+     */
+    public void setIsChannel(Byte isChannel) {
+        this.isChannel = isChannel;
+    }
+
+    /**
+     * 消息提醒
+     *
+     * @return is_remind 消息提醒
+     */
+    public Byte getIsRemind() {
+        return isRemind;
+    }
+
+    /**
+     * 消息提醒
+     *
+     * @param isRemind 消息提醒
+     */
+    public void setIsRemind(Byte isRemind) {
+        this.isRemind = isRemind;
+    }
+
+    /**
+     * 更新时间
+     *
+     * @return update_time 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 快递公司简称
+     *
+     * @return delivery_code 快递公司简称
+     */
+    public String getDeliveryCode() {
+        return deliveryCode;
+    }
+
+    /**
+     * 快递公司简称
+     *
+     * @param deliveryCode 快递公司简称
+     */
+    public void setDeliveryCode(String deliveryCode) {
+        this.deliveryCode = deliveryCode;
+    }
+
+    /**
+     * 用户拼团活动id 0没有
+     *
+     * @return bargain_user_id 用户拼团活动id 0没有
+     */
+    public Integer getBargainUserId() {
+        return bargainUserId;
+    }
+
+    /**
+     * 用户拼团活动id 0没有
+     *
+     * @param bargainUserId 用户拼团活动id 0没有
+     */
+    public void setBargainUserId(Integer bargainUserId) {
+        this.bargainUserId = bargainUserId;
+    }
+
+    /**
+     * 订单类型:0-普通订单，1-视频号订单
+     *
+     * @return type 订单类型:0-普通订单，1-视频号订单
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * 订单类型:0-普通订单，1-视频号订单
+     *
+     * @param type 订单类型:0-普通订单，1-视频号订单
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * 商品总价
+     *
+     * @return pro_total_price 商品总价
+     */
+    public BigDecimal getProTotalPrice() {
+        return proTotalPrice;
+    }
+
+    /**
+     * 商品总价
+     *
+     * @param proTotalPrice 商品总价
+     */
+    public void setProTotalPrice(BigDecimal proTotalPrice) {
+        this.proTotalPrice = proTotalPrice;
+    }
+
+    /**
+     * 改价前支付金额
+     *
+     * @return before_pay_price 改价前支付金额
+     */
+    public BigDecimal getBeforePayPrice() {
+        return beforePayPrice;
+    }
+
+    /**
+     * 改价前支付金额
+     *
+     * @param beforePayPrice 改价前支付金额
+     */
+    public void setBeforePayPrice(BigDecimal beforePayPrice) {
+        this.beforePayPrice = beforePayPrice;
+    }
+
+    /**
+     * 是否改价,0-否，1-是
+     *
+     * @return is_alter_price 是否改价,0-否，1-是
+     */
+    public Boolean getIsAlterPrice() {
+        return isAlterPrice;
+    }
+
+    /**
+     * 是否改价,0-否，1-是
+     *
+     * @param isAlterPrice 是否改价,0-否，1-是
+     */
+    public void setIsAlterPrice(Boolean isAlterPrice) {
+        this.isAlterPrice = isAlterPrice;
+    }
+
+    /**
+     * 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+     *
+     * @return out_trade_no 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+     */
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    /**
+     * 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+     *
+     * @param outTradeNo 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+     */
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+}

mall-api/src/main/java/com/txz/mall/dto/StorePinkDTO.java

@@ -0,0 +1,546 @@
+/*
+ *
+ * StorePinkDTO.java
+ * Copyright(C) 2017-2020 fendo公司
+ * @date 2025-07-15
+ */
+package com.txz.mall.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StorePinkDTO implements Serializable {
+    /**
+     * m_store_pink
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     * 拼团ID
+     */
+    private Long id;
+    /**
+     * 用户id
+     */
+    private Long uid;
+    /**
+     * 订单id 生成
+     */
+    private String orderId;
+    /**
+     * 订单id  数据库
+     */
+    private Long orderIdKey;
+    /**
+     * 购买商品个数
+     */
+    private Integer totalNum;
+    /**
+     * 购买总金额
+     */
+    private BigDecimal totalPrice;
+    /**
+     * 拼团商品id
+     */
+    private Long cid;
+    /**
+     * 商品id
+     */
+    private Long pid;
+    /**
+     * 拼图总人数
+     */
+    private Integer people;
+    /**
+     * 拼团商品单价
+     */
+    private BigDecimal price;
+    /**
+     * 开始时间
+     */
+    private Long addTime;
+    /**
+     * 结束时间
+     */
+    private Long stopTime;
+    /**
+     * 团长id 0为团长
+     */
+    private Integer kId;
+    /**
+     * 是否发送模板消息0未发送1已发送
+     */
+    private Byte isTpl;
+    /**
+     * 是否退款 0未退款 1已退款
+     */
+    private Byte isRefund;
+    /**
+     * 状态1进行中2已完成3未完成
+     */
+    private Byte status;
+    /**
+     * 是否虚拟拼团
+     */
+    private Boolean isVirtual;
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+    /**
+     * 用户头像
+     */
+    private String avatar;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 创建人id
+     */
+    private Long createUserId;
+    /**
+     * 更新人id
+     */
+    private Long updateUserId;
+    /**
+     * 是否删除
+     */
+    private Byte isDelete;
+
+    /**
+     * 拼团ID
+     *
+     * @return id 拼团ID
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 拼团ID
+     *
+     * @param id 拼团ID
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 用户id
+     *
+     * @return uid 用户id
+     */
+    public Long getUid() {
+        return uid;
+    }
+
+    /**
+     * 用户id
+     *
+     * @param uid 用户id
+     */
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    /**
+     * 订单id 生成
+     *
+     * @return order_id 订单id 生成
+     */
+    public String getOrderId() {
+        return orderId;
+    }
+
+    /**
+     * 订单id 生成
+     *
+     * @param orderId 订单id 生成
+     */
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    /**
+     * 订单id  数据库
+     *
+     * @return order_id_key 订单id  数据库
+     */
+    public Long getOrderIdKey() {
+        return orderIdKey;
+    }
+
+    /**
+     * 订单id  数据库
+     *
+     * @param orderIdKey 订单id  数据库
+     */
+    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 购买总金额
+     */
+    public BigDecimal getTotalPrice() {
+        return totalPrice;
+    }
+
+    /**
+     * 购买总金额
+     *
+     * @param totalPrice 购买总金额
+     */
+    public void setTotalPrice(BigDecimal totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    /**
+     * 拼团商品id
+     *
+     * @return cid 拼团商品id
+     */
+    public Long getCid() {
+        return cid;
+    }
+
+    /**
+     * 拼团商品id
+     *
+     * @param cid 拼团商品id
+     */
+    public void setCid(Long cid) {
+        this.cid = cid;
+    }
+
+    /**
+     * 商品id
+     *
+     * @return pid 商品id
+     */
+    public Long getPid() {
+        return pid;
+    }
+
+    /**
+     * 商品id
+     *
+     * @param pid 商品id
+     */
+    public void setPid(Long pid) {
+        this.pid = pid;
+    }
+
+    /**
+     * 拼图总人数
+     *
+     * @return people 拼图总人数
+     */
+    public Integer getPeople() {
+        return people;
+    }
+
+    /**
+     * 拼图总人数
+     *
+     * @param people 拼图总人数
+     */
+    public void setPeople(Integer people) {
+        this.people = people;
+    }
+
+    /**
+     * 拼团商品单价
+     *
+     * @return price 拼团商品单价
+     */
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    /**
+     * 拼团商品单价
+     *
+     * @param price 拼团商品单价
+     */
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    /**
+     * 开始时间
+     *
+     * @return add_time 开始时间
+     */
+    public Long getAddTime() {
+        return addTime;
+    }
+
+    /**
+     * 开始时间
+     *
+     * @param addTime 开始时间
+     */
+    public void setAddTime(Long addTime) {
+        this.addTime = addTime;
+    }
+
+    /**
+     * 结束时间
+     *
+     * @return stop_time 结束时间
+     */
+    public Long getStopTime() {
+        return stopTime;
+    }
+
+    /**
+     * 结束时间
+     *
+     * @param stopTime 结束时间
+     */
+    public void setStopTime(Long stopTime) {
+        this.stopTime = stopTime;
+    }
+
+    /**
+     * 团长id 0为团长
+     *
+     * @return k_id 团长id 0为团长
+     */
+    public Integer getkId() {
+        return kId;
+    }
+
+    /**
+     * 团长id 0为团长
+     *
+     * @param kId 团长id 0为团长
+     */
+    public void setkId(Integer kId) {
+        this.kId = kId;
+    }
+
+    /**
+     * 是否发送模板消息0未发送1已发送
+     *
+     * @return is_tpl 是否发送模板消息0未发送1已发送
+     */
+    public Byte getIsTpl() {
+        return isTpl;
+    }
+
+    /**
+     * 是否发送模板消息0未发送1已发送
+     *
+     * @param isTpl 是否发送模板消息0未发送1已发送
+     */
+    public void setIsTpl(Byte isTpl) {
+        this.isTpl = isTpl;
+    }
+
+    /**
+     * 是否退款 0未退款 1已退款
+     *
+     * @return is_refund 是否退款 0未退款 1已退款
+     */
+    public Byte getIsRefund() {
+        return isRefund;
+    }
+
+    /**
+     * 是否退款 0未退款 1已退款
+     *
+     * @param isRefund 是否退款 0未退款 1已退款
+     */
+    public void setIsRefund(Byte isRefund) {
+        this.isRefund = isRefund;
+    }
+
+    /**
+     * 状态1进行中2已完成3未完成
+     *
+     * @return status 状态1进行中2已完成3未完成
+     */
+    public Byte getStatus() {
+        return status;
+    }
+
+    /**
+     * 状态1进行中2已完成3未完成
+     *
+     * @param status 状态1进行中2已完成3未完成
+     */
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    /**
+     * 是否虚拟拼团
+     *
+     * @return is_virtual 是否虚拟拼团
+     */
+    public Boolean getIsVirtual() {
+        return isVirtual;
+    }
+
+    /**
+     * 是否虚拟拼团
+     *
+     * @param isVirtual 是否虚拟拼团
+     */
+    public void setIsVirtual(Boolean isVirtual) {
+        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 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 更新时间
+     *
+     * @return update_time 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 创建人id
+     *
+     * @return create_user_id 创建人id
+     */
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+
+    /**
+     * 创建人id
+     *
+     * @param createUserId 创建人id
+     */
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 更新人id
+     *
+     * @return update_user_id 更新人id
+     */
+    public Long getUpdateUserId() {
+        return updateUserId;
+    }
+
+    /**
+     * 更新人id
+     *
+     * @param updateUserId 更新人id
+     */
+    public void setUpdateUserId(Long updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
+    /**
+     * 是否删除
+     *
+     * @return is_delete 是否删除
+     */
+    public Byte getIsDelete() {
+        return isDelete;
+    }
+
+    /**
+     * 是否删除
+     *
+     * @param isDelete 是否删除
+     */
+    public void setIsDelete(Byte isDelete) {
+        this.isDelete = isDelete;
+    }
+}

mall-api/src/main/java/com/txz/mall/dto/UserAddressDTO.java

@@ -0,0 +1,391 @@
+/*
+ *
+ * UserAddressDTO.java
+ * Copyright(C) 2017-2020 fendo公司
+ * @date 2025-07-15
+ */
+package com.txz.mall.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UserAddressDTO implements Serializable {
+    /**
+     * m_user_address
+     */
+    private static final long serialVersionUID = 1L;
+    /**
+     * 用户地址id
+     */
+    private Long id;
+    /**
+     * 用户id
+     */
+    private Long uid;
+    /**
+     * 收货人姓名
+     */
+    private String realName;
+    /**
+     * 收货人电话
+     */
+    private String phone;
+    /**
+     * 收货人所在省
+     */
+    private String province;
+    /**
+     * 收货人所在市
+     */
+    private String city;
+    /**
+     * 城市id
+     */
+    private Long cityId;
+    /**
+     * 收货人所在区
+     */
+    private String district;
+    /**
+     * 收货人详细地址
+     */
+    private String detail;
+    /**
+     * 经度
+     */
+    private String longitude;
+    /**
+     * 纬度
+     */
+    private String latitude;
+    /**
+     * 是否默认
+     */
+    private Byte isDefault;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 创建人id
+     */
+    private Long createUserId;
+    /**
+     * 更新人id
+     */
+    private Long updateUserId;
+    /**
+     * 是否删除
+     */
+    private Byte isDelete;
+
+    /**
+     * 用户地址id
+     *
+     * @return id 用户地址id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 用户地址id
+     *
+     * @param id 用户地址id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 用户id
+     *
+     * @return uid 用户id
+     */
+    public Long getUid() {
+        return uid;
+    }
+
+    /**
+     * 用户id
+     *
+     * @param uid 用户id
+     */
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    /**
+     * 收货人姓名
+     *
+     * @return real_name 收货人姓名
+     */
+    public String getRealName() {
+        return realName;
+    }
+
+    /**
+     * 收货人姓名
+     *
+     * @param realName 收货人姓名
+     */
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    /**
+     * 收货人电话
+     *
+     * @return phone 收货人电话
+     */
+    public String getPhone() {
+        return phone;
+    }
+
+    /**
+     * 收货人电话
+     *
+     * @param phone 收货人电话
+     */
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    /**
+     * 收货人所在省
+     *
+     * @return province 收货人所在省
+     */
+    public String getProvince() {
+        return province;
+    }
+
+    /**
+     * 收货人所在省
+     *
+     * @param province 收货人所在省
+     */
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    /**
+     * 收货人所在市
+     *
+     * @return city 收货人所在市
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * 收货人所在市
+     *
+     * @param city 收货人所在市
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    /**
+     * 城市id
+     *
+     * @return city_id 城市id
+     */
+    public Long getCityId() {
+        return cityId;
+    }
+
+    /**
+     * 城市id
+     *
+     * @param cityId 城市id
+     */
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    /**
+     * 收货人所在区
+     *
+     * @return district 收货人所在区
+     */
+    public String getDistrict() {
+        return district;
+    }
+
+    /**
+     * 收货人所在区
+     *
+     * @param district 收货人所在区
+     */
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    /**
+     * 收货人详细地址
+     *
+     * @return detail 收货人详细地址
+     */
+    public String getDetail() {
+        return detail;
+    }
+
+    /**
+     * 收货人详细地址
+     *
+     * @param detail 收货人详细地址
+     */
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    /**
+     * 经度
+     *
+     * @return longitude 经度
+     */
+    public String getLongitude() {
+        return longitude;
+    }
+
+    /**
+     * 经度
+     *
+     * @param longitude 经度
+     */
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    /**
+     * 纬度
+     *
+     * @return latitude 纬度
+     */
+    public String getLatitude() {
+        return latitude;
+    }
+
+    /**
+     * 纬度
+     *
+     * @param latitude 纬度
+     */
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    /**
+     * 是否默认
+     *
+     * @return is_default 是否默认
+     */
+    public Byte getIsDefault() {
+        return isDefault;
+    }
+
+    /**
+     * 是否默认
+     *
+     * @param isDefault 是否默认
+     */
+    public void setIsDefault(Byte isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    /**
+     * 创建时间
+     *
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 更新时间
+     *
+     * @return update_time 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 创建人id
+     *
+     * @return create_user_id 创建人id
+     */
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+
+    /**
+     * 创建人id
+     *
+     * @param createUserId 创建人id
+     */
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 更新人id
+     *
+     * @return update_user_id 更新人id
+     */
+    public Long getUpdateUserId() {
+        return updateUserId;
+    }
+
+    /**
+     * 更新人id
+     *
+     * @param updateUserId 更新人id
+     */
+    public void setUpdateUserId(Long updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
+    /**
+     * 是否删除
+     *
+     * @return is_delete 是否删除
+     */
+    public Byte getIsDelete() {
+        return isDelete;
+    }
+
+    /**
+     * 是否删除
+     *
+     * @param isDelete 是否删除
+     */
+    public void setIsDelete(Byte isDelete) {
+        this.isDelete = isDelete;
+    }
+}

mall-api/src/main/java/com/txz/mall/vo/StorePinkDetailVO.java

@@ -0,0 +1,44 @@
+package com.txz.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "StorePinkDetailResponse对象", description = "拼团详情响应对象")
+public class StorePinkDetailVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "拼团ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer uid;
+
+    @ApiModelProperty(value = "订单id 生成")
+    private String orderId;
+
+    @ApiModelProperty(value = "购买总金额")
+    private BigDecimal totalPrice;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickname;
+
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）")
+    private Integer orderStatus;
+
+    @ApiModelProperty(value = "0 未退款 1 申请中 2 已退款 3退款中")
+    private Integer refundStatus;
+
+}

mall-interface/src/main/java/com/txz/mall/service/StoreOrderServiceClient.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 StoreOrderServiceClient {
+
+	@RequestMapping( value = {"/store/order/add"}, method = {RequestMethod.POST} )
+    public Result add(@RequestBody StoreOrderDPO storeOrder,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/order/delete"}, method = {RequestMethod.POST} )
+	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/order/update"}, method = {RequestMethod.POST} )
+	public Result update(@RequestBody StoreOrderDPO storeOrder,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/order/detail"}, method = {RequestMethod.POST} )
+	public Result<StoreOrderDPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/order/list"}, method = {RequestMethod.POST} )
+	public Result<List<StoreOrderDPO>> list(@RequestBody StoreOrderDPO storeOrder, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
+}

mall-interface/src/main/java/com/txz/mall/service/StorePinkServiceClient.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 StorePinkServiceClient {
+
+	@RequestMapping( value = {"/store/pink/add"}, method = {RequestMethod.POST} )
+    public Result add(@RequestBody StorePinkDPO storePink,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/delete"}, method = {RequestMethod.POST} )
+	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/update"}, method = {RequestMethod.POST} )
+	public Result update(@RequestBody StorePinkDPO storePink,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/detail"}, method = {RequestMethod.POST} )
+	public Result<StorePinkDPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/store/pink/list"}, method = {RequestMethod.POST} )
+	public Result<List<StorePinkDPO>> list(@RequestBody StorePinkDPO storePink, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
+}

mall-interface/src/main/java/com/txz/mall/service/UserAddressServiceClient.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 UserAddressServiceClient {
+
+	@RequestMapping( value = {"/user/address/add"}, method = {RequestMethod.POST} )
+    public Result add(@RequestBody UserAddressDPO userAddress,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/user/address/delete"}, method = {RequestMethod.POST} )
+	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/user/address/update"}, method = {RequestMethod.POST} )
+	public Result update(@RequestBody UserAddressDPO userAddress,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/user/address/detail"}, method = {RequestMethod.POST} )
+	public Result<UserAddressDPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
+
+	@RequestMapping( value = {"/user/address/list"}, method = {RequestMethod.POST} )
+	public Result<List<UserAddressDPO>> list(@RequestBody UserAddressDPO userAddress, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
+}

mall-service/src/main/java/com/txz/mall/controller/CategoryController.java

@@ -104,14 +104,14 @@ public class CategoryController {
 
     @PostMapping("/list")
     @ApiOperation(value = "类目获取列表")
-    public Result<List<Category>> list(@RequestBody Category category, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<Category>> list(@RequestBody Category category, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
 
         Condition condition = new Condition(category.getClass());
 //        Criteria criteria = condition.createCriteria();
 //        criteria.andEqualTo("name", city.getName());
         PageInfo pageInfo = null;
         try {
+            PageHelper.startPage(page, size);
             List<Category> list = categoryService.findByCondition(condition);
             pageInfo = new PageInfo(list);
         } catch (Exception e) {

mall-service/src/main/java/com/txz/mall/controller/StoreCombinationController.java

@@ -7,6 +7,8 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StoreCombination;
 import com.txz.mall.service.StoreCombinationService;
+import com.txz.mall.service.StorePinkService;
+import com.txz.mall.vo.StorePinkDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -30,6 +32,8 @@ public class StoreCombinationController {
 
     @Resource
     private StoreCombinationService storeCombinationService;
+    @Resource
+    private StorePinkService storePinkService;
 
     @PostMapping("/add")
     @ApiOperation(value = "拼团商品表新增")
@@ -105,7 +109,7 @@ public class StoreCombinationController {
 
     @PostMapping("/list")
     @ApiOperation(value = "拼团商品表获取列表")
-    public Result<List<StoreCombination>> list(@RequestBody StoreCombination storeCombination, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+    public Result<List<StoreCombination>> list(@RequestBody StoreCombination storeCombination, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(storeCombination.getClass());
@@ -139,4 +143,13 @@ public class StoreCombinationController {
         }
         return Result.success();
     }
+
+    /**
+     * 拼团订单列表
+     */
+    @ApiOperation(value = "拼团订单列表")
+    @GetMapping(value = "/order_pink/{id}")
+    public Result<List<StorePinkDetailVO>> getPinkList(@PathVariable(value = "id") Integer id) {
+        return Result.success(storePinkService.getAdminList(id));
+    }
 }

mall-service/src/main/java/com/txz/mall/controller/StoreFlashActivityController.java

@@ -104,7 +104,7 @@ public class StoreFlashActivityController {
 
     @PostMapping("/list")
     @ApiOperation(value = "限时活动获取列表")
-    public Result<List<StoreFlashActivity>> list(@RequestBody StoreFlashActivity storeFlashActivity, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+    public Result<List<StoreFlashActivity>> list(@RequestBody StoreFlashActivity storeFlashActivity, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(storeFlashActivity.getClass());

mall-service/src/main/java/com/txz/mall/controller/StoreOrderController.java

@@ -0,0 +1,122 @@
+package com.txz.mall.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.txz.mall.core.Result;
+import com.txz.mall.core.ResultCode;
+import com.txz.mall.model.StoreOrder;
+import com.txz.mall.service.StoreOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Api(tags = "[后台]storeOrder管理")
+@RestController
+@RequestMapping("/store/order")
+public class StoreOrderController {
+
+    private static Logger log = LoggerFactory.getLogger(StoreOrderController.class);
+
+    @Resource
+    private StoreOrderService storeOrderService;
+
+    @PostMapping("/add")
+    @ApiOperation(value = "storeOrder新增")
+    public Result add(@RequestBody StoreOrder storeOrder) {
+        if (storeOrder == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        try {
+            storeOrder.setCreateTime(new Date());
+//    		storeOrder.setCreateUserId(userId);
+            storeOrderService.save(storeOrder);
+        } catch (Exception e) {
+            log.error("新增对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/delete")
+    @ApiOperation(value = "storeOrder删除")
+    public Result delete(@RequestParam Long id) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        try {
+            StoreOrder storeOrder = new StoreOrder();
+            storeOrder.setId(id);
+            storeOrder.setIsDelete(1);
+            storeOrderService.update(storeOrder);
+        } catch (Exception e) {
+            log.error("删除对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "storeOrder更新")
+    public Result update(@RequestBody StoreOrder storeOrder) {
+        if (storeOrder == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (storeOrder.getId() == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        try {
+            storeOrder.setUpdateTime(new Date());
+//    		storeOrder.setUpdateUserId(userId);
+            storeOrderService.update(storeOrder);
+        } catch (Exception e) {
+            log.error("更新对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation(value = "storeOrder获取详情")
+    public Result<StoreOrder> detail(@RequestParam Long id) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        StoreOrder storeOrder = null;
+        try {
+            storeOrder = storeOrderService.findById(id);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(storeOrder);
+    }
+
+    @PostMapping("/list")
+    @ApiOperation(value = "storeOrder获取列表")
+    public Result<List<StoreOrder>> list(@RequestBody StoreOrder storeOrder, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(storeOrder.getClass());
+//        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+        PageInfo pageInfo = null;
+        try {
+            List<StoreOrder> list = storeOrderService.findByCondition(condition);
+            pageInfo = new PageInfo(list);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(pageInfo);
+    }
+}

mall-service/src/main/java/com/txz/mall/controller/StorePinkController.java

@@ -0,0 +1,122 @@
+package com.txz.mall.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.txz.mall.core.Result;
+import com.txz.mall.core.ResultCode;
+import com.txz.mall.model.StorePink;
+import com.txz.mall.service.StorePinkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Api(tags = "[后台]storePink管理")
+@RestController
+@RequestMapping("/store/pink")
+public class StorePinkController {
+
+    private static Logger log = LoggerFactory.getLogger(StorePinkController.class);
+
+    @Resource
+    private StorePinkService storePinkService;
+
+    @PostMapping("/add")
+    @ApiOperation(value = "storePink新增")
+    public Result add(@RequestBody StorePink storePink) {
+        if (storePink == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        try {
+            storePink.setCreateTime(new Date());
+//    		storePink.setCreateUserId(userId);
+            storePinkService.save(storePink);
+        } catch (Exception e) {
+            log.error("新增对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/delete")
+    @ApiOperation(value = "storePink删除")
+    public Result delete(@RequestParam Long id) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        try {
+            StorePink storePink = new StorePink();
+            storePink.setId(id);
+            storePink.setIsDelete(1);
+            storePinkService.update(storePink);
+        } catch (Exception e) {
+            log.error("删除对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "storePink更新")
+    public Result update(@RequestBody StorePink storePink) {
+        if (storePink == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (storePink.getId() == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        try {
+            storePink.setUpdateTime(new Date());
+//    		storePink.setUpdateUserId(userId);
+            storePinkService.update(storePink);
+        } catch (Exception e) {
+            log.error("更新对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation(value = "storePink获取详情")
+    public Result<StorePink> detail(@RequestParam Long id) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        StorePink storePink = null;
+        try {
+            storePink = storePinkService.findById(id);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(storePink);
+    }
+
+    @PostMapping("/list")
+    @ApiOperation(value = "storePink获取列表")
+    public Result<List<StorePink>> list(@RequestBody StorePink storePink, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(storePink.getClass());
+//        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+        PageInfo pageInfo = null;
+        try {
+            List<StorePink> list = storePinkService.findByCondition(condition);
+            pageInfo = new PageInfo(list);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(pageInfo);
+    }
+}

mall-service/src/main/java/com/txz/mall/controller/StoreProductAttrResultController.java

@@ -107,7 +107,7 @@ public class StoreProductAttrResultController {
 
     @PostMapping("/list")
     @ApiOperation(value = "商品属性获取列表")
-    public Result<List<StoreProductAttrResult>> list(@RequestBody StoreProductAttrResult storeProductAttrResult, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+    public Result<List<StoreProductAttrResult>> list(@RequestBody StoreProductAttrResult storeProductAttrResult, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
        
         PageHelper.startPage(page, size);
 

mall-service/src/main/java/com/txz/mall/controller/StoreProductController.java

@@ -161,7 +161,7 @@ public class StoreProductController {
 
     @PostMapping("/list")
     @ApiOperation(value = "商品获取列表")
-    public Result<List<StoreProduct>> list(@RequestBody StoreProduct storeProduct, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+    public Result<List<StoreProduct>> list(@RequestBody StoreProduct storeProduct, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
        
         PageHelper.startPage(page, size);
 

mall-service/src/main/java/com/txz/mall/controller/StoreProductRuleController.java

@@ -107,7 +107,7 @@ public class StoreProductRuleController {
 
     @PostMapping("/list")
     @ApiOperation(value = "商品规则获取列表")
-    public Result<List<StoreProductRule>> list(@RequestBody StoreProductRule storeProductRule, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+    public Result<List<StoreProductRule>> list(@RequestBody StoreProductRule storeProductRule, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         
         PageHelper.startPage(page, size);
 

mall-service/src/main/java/com/txz/mall/controller/SystemDictDataController.java

@@ -1,128 +1,128 @@
-package com.txz.mall.controller;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.txz.mall.core.Result;
-import com.txz.mall.core.ResultCode;
-import com.txz.mall.model.SystemDictData;
-import com.txz.mall.service.SystemDictDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Condition;
-import tk.mybatis.mapper.entity.Example.Criteria;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by CodeGenerator on 2025/07/14.
- */
-@Api(tags = "[后台]字典数据管理")
-@RestController
-@RequestMapping("/system/dict/data")
-public class SystemDictDataController {
-
-    private static Logger log = LoggerFactory.getLogger(SystemDictDataController.class);
-
-    @Resource
-    private SystemDictDataService systemDictDataService;
-
-    @PostMapping("/add")
-    @ApiOperation(value = "字典数据新增")
-    public Result add(@RequestBody SystemDictData systemDictData) {
-        if (systemDictData == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-
-        try {
-            systemDictData.setCreateTime(new Date());
-//            systemDictData.setCreateUserId(userId);
-            systemDictDataService.save(systemDictData);
-        } catch (Exception e) {
-            log.error("新增对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "字典数据删除")
-    public Result delete(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            SystemDictData systemDictData = new SystemDictData();
-            systemDictData.setDictCode(id);
-            systemDictData.setIsDelete(1);
-            systemDictDataService.update(systemDictData);
-        } catch (Exception e) {
-            log.error("删除对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "字典数据更新")
-    public Result update(@RequestBody SystemDictData systemDictData) {
-        if (systemDictData == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-        if (systemDictData.getDictCode() == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            systemDictData.setUpdateTime(new Date());
-//            systemDictData.setUpdateUserId(userId);
-            systemDictDataService.update(systemDictData);
-        } catch (Exception e) {
-            log.error("更新对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "字典数据获取详情")
-    public Result<SystemDictData> detail(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        SystemDictData systemDictData = null;
-        try {
-            systemDictData = systemDictDataService.findById(id);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(systemDictData);
-    }
-
-    @PostMapping("/list")
-    @ApiOperation(value = "字典数据获取列表")
-    public Result<List<SystemDictData>> list(@RequestBody SystemDictData systemDictData, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-       
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(systemDictData.getClass());
-        Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("dictType", systemDictData.getDictType());
-        PageInfo pageInfo = null;
-        try {
-            List<SystemDictData> list = systemDictDataService.findByCondition(condition);
-            pageInfo = new PageInfo(list);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(pageInfo);
-    }
-}
+//package com.txz.mall.controller;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageInfo;
+//import com.txz.mall.core.Result;
+//import com.txz.mall.core.ResultCode;
+//import com.txz.mall.model.SystemDictData;
+//import com.txz.mall.service.SystemDictDataService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.web.bind.annotation.*;
+//import tk.mybatis.mapper.entity.Condition;
+//import tk.mybatis.mapper.entity.Example.Criteria;
+//
+//import javax.annotation.Resource;
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * Created by CodeGenerator on 2025/07/14.
+// */
+//@Api(tags = "[后台]字典数据管理")
+//@RestController
+//@RequestMapping("/system/dict/data")
+//public class SystemDictDataController {
+//
+//    private static Logger log = LoggerFactory.getLogger(SystemDictDataController.class);
+//
+//    @Resource
+//    private SystemDictDataService systemDictDataService;
+//
+//    @PostMapping("/add")
+//    @ApiOperation(value = "字典数据新增")
+//    public Result add(@RequestBody SystemDictData systemDictData) {
+//        if (systemDictData == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//
+//        try {
+//            systemDictData.setCreateTime(new Date());
+////            systemDictData.setCreateUserId(userId);
+//            systemDictDataService.save(systemDictData);
+//        } catch (Exception e) {
+//            log.error("新增对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    @ApiOperation(value = "字典数据删除")
+//    public Result delete(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            SystemDictData systemDictData = new SystemDictData();
+//            systemDictData.setDictCode(id);
+//            systemDictData.setIsDelete(1);
+//            systemDictDataService.update(systemDictData);
+//        } catch (Exception e) {
+//            log.error("删除对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/update")
+//    @ApiOperation(value = "字典数据更新")
+//    public Result update(@RequestBody SystemDictData systemDictData) {
+//        if (systemDictData == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//        if (systemDictData.getDictCode() == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            systemDictData.setUpdateTime(new Date());
+////            systemDictData.setUpdateUserId(userId);
+//            systemDictDataService.update(systemDictData);
+//        } catch (Exception e) {
+//            log.error("更新对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/detail")
+//    @ApiOperation(value = "字典数据获取详情")
+//    public Result<SystemDictData> detail(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        SystemDictData systemDictData = null;
+//        try {
+//            systemDictData = systemDictDataService.findById(id);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(systemDictData);
+//    }
+//
+//    @PostMapping("/list")
+//    @ApiOperation(value = "字典数据获取列表")
+//    public Result<List<SystemDictData>> list(@RequestBody SystemDictData systemDictData,@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+//
+//        PageHelper.startPage(page, size);
+//
+//        Condition condition = new Condition(systemDictData.getClass());
+//        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("dictType", systemDictData.getDictType());
+//        PageInfo pageInfo = null;
+//        try {
+//            List<SystemDictData> list = systemDictDataService.findByCondition(condition);
+//            pageInfo = new PageInfo(list);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(pageInfo);
+//    }
+//}

mall-service/src/main/java/com/txz/mall/controller/SystemDictTypeController.java

@@ -1,127 +1,127 @@
-package com.txz.mall.controller;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.txz.mall.core.Result;
-import com.txz.mall.core.ResultCode;
-import com.txz.mall.model.SystemDictType;
-import com.txz.mall.service.SystemDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by CodeGenerator on 2025/07/14.
- */
-@Api(tags = "[后台]字典类型管理")
-@RestController
-@RequestMapping("/system/dict/type")
-public class SystemDictTypeController {
-
-    private static Logger log = LoggerFactory.getLogger(SystemDictTypeController.class);
-
-    @Resource
-    private SystemDictTypeService systemDictTypeService;
-
-    @PostMapping("/add")
-    @ApiOperation(value = "字典类型新增")
-    public Result add(@RequestBody SystemDictType systemDictType) {
-        if (systemDictType == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-
-        try {
-            systemDictType.setCreateTime(new Date());
-//            systemDictType.setCreateUserId(userId);
-            systemDictTypeService.save(systemDictType);
-        } catch (Exception e) {
-            log.error("新增对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "字典类型删除")
-    public Result delete(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            SystemDictType systemDictType = new SystemDictType();
-            systemDictType.setDictId(id);
-            systemDictType.setIsDelete(1);
-            systemDictTypeService.update(systemDictType);
-        } catch (Exception e) {
-            log.error("删除对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "字典类型更新")
-    public Result update(@RequestBody SystemDictType systemDictType) {
-        if (systemDictType == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-        if (systemDictType.getDictId() == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            systemDictType.setUpdateTime(new Date());
-//            systemDictType.setUpdateUserId(userId);
-            systemDictTypeService.update(systemDictType);
-        } catch (Exception e) {
-            log.error("更新对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "字典类型获取详情")
-    public Result<SystemDictType> detail(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        SystemDictType systemDictType = null;
-        try {
-            systemDictType = systemDictTypeService.findById(id);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(systemDictType);
-    }
-
-    @PostMapping("/list")
-    @ApiOperation(value = "字典类型获取列表")
-    public Result<List<SystemDictType>> list(@RequestBody SystemDictType systemDictType, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-        
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(systemDictType.getClass());
-//        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
-        PageInfo pageInfo = null;
-        try {
-            List<SystemDictType> list = systemDictTypeService.findByCondition(condition);
-            pageInfo = new PageInfo(list);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(pageInfo);
-    }
-}
+//package com.txz.mall.controller;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageInfo;
+//import com.txz.mall.core.Result;
+//import com.txz.mall.core.ResultCode;
+//import com.txz.mall.model.SystemDictType;
+//import com.txz.mall.service.SystemDictTypeService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.web.bind.annotation.*;
+//import tk.mybatis.mapper.entity.Condition;
+//
+//import javax.annotation.Resource;
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * Created by CodeGenerator on 2025/07/14.
+// */
+//@Api(tags = "[后台]字典类型管理")
+//@RestController
+//@RequestMapping("/system/dict/type")
+//public class SystemDictTypeController {
+//
+//    private static Logger log = LoggerFactory.getLogger(SystemDictTypeController.class);
+//
+//    @Resource
+//    private SystemDictTypeService systemDictTypeService;
+//
+//    @PostMapping("/add")
+//    @ApiOperation(value = "字典类型新增")
+//    public Result add(@RequestBody SystemDictType systemDictType) {
+//        if (systemDictType == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//
+//        try {
+//            systemDictType.setCreateTime(new Date());
+////            systemDictType.setCreateUserId(userId);
+//            systemDictTypeService.save(systemDictType);
+//        } catch (Exception e) {
+//            log.error("新增对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    @ApiOperation(value = "字典类型删除")
+//    public Result delete(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            SystemDictType systemDictType = new SystemDictType();
+//            systemDictType.setDictId(id);
+//            systemDictType.setIsDelete(1);
+//            systemDictTypeService.update(systemDictType);
+//        } catch (Exception e) {
+//            log.error("删除对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/update")
+//    @ApiOperation(value = "字典类型更新")
+//    public Result update(@RequestBody SystemDictType systemDictType) {
+//        if (systemDictType == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//        if (systemDictType.getDictId() == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            systemDictType.setUpdateTime(new Date());
+////            systemDictType.setUpdateUserId(userId);
+//            systemDictTypeService.update(systemDictType);
+//        } catch (Exception e) {
+//            log.error("更新对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/detail")
+//    @ApiOperation(value = "字典类型获取详情")
+//    public Result<SystemDictType> detail(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        SystemDictType systemDictType = null;
+//        try {
+//            systemDictType = systemDictTypeService.findById(id);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(systemDictType);
+//    }
+//
+//    @PostMapping("/list")
+//    @ApiOperation(value = "字典类型获取列表")
+//    public Result<List<SystemDictType>> list(@RequestBody SystemDictType systemDictType,@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+//
+//        PageHelper.startPage(page, size);
+//
+//        Condition condition = new Condition(systemDictType.getClass());
+////        Criteria criteria = condition.createCriteria();
+////        criteria.andEqualTo("name", city.getName());
+//        PageInfo pageInfo = null;
+//        try {
+//            List<SystemDictType> list = systemDictTypeService.findByCondition(condition);
+//            pageInfo = new PageInfo(list);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(pageInfo);
+//    }
+//}

mall-service/src/main/java/com/txz/mall/controller/SystemFormTempController.java

@@ -1,127 +1,127 @@
-package com.txz.mall.controller;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.txz.mall.core.Result;
-import com.txz.mall.core.ResultCode;
-import com.txz.mall.model.SystemFormTemp;
-import com.txz.mall.service.SystemFormTempService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by CodeGenerator on 2025/07/11.
- */
-@Api(tags = "[后台]表单管理")
-@RestController
-@RequestMapping("/system/form/temp")
-public class SystemFormTempController {
-
-	private static Logger log = LoggerFactory.getLogger(SystemFormTempController.class);
-
-    @Resource
-    private SystemFormTempService systemFormTempService;
-
-    @PostMapping("/add")
-    @ApiOperation(value = "表单新增")
-    public Result add(@RequestBody SystemFormTemp systemFormTemp) {
-		if (systemFormTemp == null) {
-			return Result.fail(ResultCode.OBJECT_IS_NULL);
-		}
-
-        try {
-			systemFormTemp.setCreateTime(new Date());
-//			systemFormTemp.setCreateUserId(userId);
-			systemFormTempService.save(systemFormTemp);
-		} catch (Exception e) {
-			log.error("新增对象操作异常e:{}", e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "表单删除")
-    public Result delete(@RequestParam Long id) {
-		if (id == null) {
-			return Result.fail(ResultCode.ID_IS_NULL);
-		}
-
-        try {
-            SystemFormTemp systemFormTemp = new SystemFormTemp();
-			systemFormTemp.setId(id);
-			systemFormTemp.setIsDelete(1);
-			systemFormTempService.update(systemFormTemp);
-		} catch (Exception e) {
-			log.error("删除对象操作异常e:{}", e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "表单更新")
-    public Result update(@RequestBody SystemFormTemp systemFormTemp) {
-		if (systemFormTemp == null) {
-			return Result.fail(ResultCode.OBJECT_IS_NULL);
-		}
-		if (systemFormTemp.getId() == null) {
-			return Result.fail(ResultCode.ID_IS_NULL);
-		}
-
-        try {
-			systemFormTemp.setUpdateTime(new Date());
-//			systemFormTemp.setUpdateUserId(userId);
-			systemFormTempService.update(systemFormTemp);
-		} catch (Exception e) {
-			log.error("更新对象操作异常e:{}", e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success();
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "表单获取详情")
-    public Result<SystemFormTemp> detail(@RequestParam Long id) {
-		if (id == null) {
-			return Result.fail(ResultCode.ID_IS_NULL);
-		}
-
-        SystemFormTemp systemFormTemp = null;
-		try {
-			systemFormTemp = systemFormTempService.findById(id);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}", e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success(systemFormTemp);
-    }
-
-    @PostMapping("/list")
-    @ApiOperation(value = "表单获取列表")
-    public Result<List<SystemFormTemp>> list(@RequestBody SystemFormTemp systemFormTemp, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-		
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(systemFormTemp.getClass());
-//        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
-		PageInfo pageInfo = null;
-		try {
-			List<SystemFormTemp> list = systemFormTempService.findByCondition(condition);
-			pageInfo = new PageInfo(list);
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}", e);
-			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return Result.success(pageInfo);
-    }
-}
+//package com.txz.mall.controller;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageInfo;
+//import com.txz.mall.core.Result;
+//import com.txz.mall.core.ResultCode;
+//import com.txz.mall.model.SystemFormTemp;
+//import com.txz.mall.service.SystemFormTempService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.web.bind.annotation.*;
+//import tk.mybatis.mapper.entity.Condition;
+//
+//import javax.annotation.Resource;
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * Created by CodeGenerator on 2025/07/11.
+// */
+//@Api(tags = "[后台]表单管理")
+//@RestController
+//@RequestMapping("/system/form/temp")
+//public class SystemFormTempController {
+//
+//	private static Logger log = LoggerFactory.getLogger(SystemFormTempController.class);
+//
+//    @Resource
+//    private SystemFormTempService systemFormTempService;
+//
+//    @PostMapping("/add")
+//    @ApiOperation(value = "表单新增")
+//    public Result add(@RequestBody SystemFormTemp systemFormTemp) {
+//		if (systemFormTemp == null) {
+//			return Result.fail(ResultCode.OBJECT_IS_NULL);
+//		}
+//
+//        try {
+//			systemFormTemp.setCreateTime(new Date());
+////			systemFormTemp.setCreateUserId(userId);
+//			systemFormTempService.save(systemFormTemp);
+//		} catch (Exception e) {
+//			log.error("新增对象操作异常e:{}", e);
+//			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    @ApiOperation(value = "表单删除")
+//    public Result delete(@RequestParam Long id) {
+//		if (id == null) {
+//			return Result.fail(ResultCode.ID_IS_NULL);
+//		}
+//
+//        try {
+//            SystemFormTemp systemFormTemp = new SystemFormTemp();
+//			systemFormTemp.setId(id);
+//			systemFormTemp.setIsDelete(1);
+//			systemFormTempService.update(systemFormTemp);
+//		} catch (Exception e) {
+//			log.error("删除对象操作异常e:{}", e);
+//			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/update")
+//    @ApiOperation(value = "表单更新")
+//    public Result update(@RequestBody SystemFormTemp systemFormTemp) {
+//		if (systemFormTemp == null) {
+//			return Result.fail(ResultCode.OBJECT_IS_NULL);
+//		}
+//		if (systemFormTemp.getId() == null) {
+//			return Result.fail(ResultCode.ID_IS_NULL);
+//		}
+//
+//        try {
+//			systemFormTemp.setUpdateTime(new Date());
+////			systemFormTemp.setUpdateUserId(userId);
+//			systemFormTempService.update(systemFormTemp);
+//		} catch (Exception e) {
+//			log.error("更新对象操作异常e:{}", e);
+//			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/detail")
+//    @ApiOperation(value = "表单获取详情")
+//    public Result<SystemFormTemp> detail(@RequestParam Long id) {
+//		if (id == null) {
+//			return Result.fail(ResultCode.ID_IS_NULL);
+//		}
+//
+//        SystemFormTemp systemFormTemp = null;
+//		try {
+//			systemFormTemp = systemFormTempService.findById(id);
+//		} catch (Exception e) {
+//			log.error("查询对象操作异常e:{}", e);
+//			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//        return Result.success(systemFormTemp);
+//    }
+//
+//    @PostMapping("/list")
+//    @ApiOperation(value = "表单获取列表")
+//    public Result<List<SystemFormTemp>> list(@RequestBody SystemFormTemp systemFormTemp,@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+//
+//        PageHelper.startPage(page, size);
+//
+//        Condition condition = new Condition(systemFormTemp.getClass());
+////        Criteria criteria = condition.createCriteria();
+////        criteria.andEqualTo("name", city.getName());
+//		PageInfo pageInfo = null;
+//		try {
+//			List<SystemFormTemp> list = systemFormTempService.findByCondition(condition);
+//			pageInfo = new PageInfo(list);
+//		} catch (Exception e) {
+//			log.error("查询对象操作异常e:{}", e);
+//			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//		}
+//        return Result.success(pageInfo);
+//    }
+//}

mall-service/src/main/java/com/txz/mall/controller/SystemGroupController.java

@@ -1,127 +1,127 @@
-package com.txz.mall.controller;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.txz.mall.core.Result;
-import com.txz.mall.core.ResultCode;
-import com.txz.mall.model.SystemGroup;
-import com.txz.mall.service.SystemGroupService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by CodeGenerator on 2025/07/11.
- */
-@Api(tags = "[后台]配置表管理")
-@RestController
-@RequestMapping("/system/group")
-public class SystemGroupController {
-
-    private static Logger log = LoggerFactory.getLogger(SystemGroupController.class);
-
-    @Resource
-    private SystemGroupService systemGroupService;
-
-    @PostMapping("/add")
-    @ApiOperation(value = "配置表新增")
-    public Result add(@RequestBody SystemGroup systemGroup) {
-        if (systemGroup == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-
-        try {
-            systemGroup.setCreateTime(new Date());
-//            systemGroup.setCreateUserId(userId);
-            systemGroupService.save(systemGroup);
-        } catch (Exception e) {
-            log.error("新增对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "配置表删除")
-    public Result delete(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            SystemGroup systemGroup = new SystemGroup();
-            systemGroup.setId(id);
-            systemGroup.setIsDelete(1);
-            systemGroupService.update(systemGroup);
-        } catch (Exception e) {
-            log.error("删除对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "配置表更新")
-    public Result update(@RequestBody SystemGroup systemGroup) {
-        if (systemGroup == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-        if (systemGroup.getId() == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            systemGroup.setUpdateTime(new Date());
-//            systemGroup.setUpdateUserId(userId);
-            systemGroupService.update(systemGroup);
-        } catch (Exception e) {
-            log.error("更新对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "配置表获取详情")
-    public Result<SystemGroup> detail(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        SystemGroup systemGroup = null;
-        try {
-            systemGroup = systemGroupService.findById(id);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(systemGroup);
-    }
-
-    @PostMapping("/list")
-    @ApiOperation(value = "配置表获取列表")
-    public Result<List<SystemGroup>> list(@RequestBody SystemGroup systemGroup, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-        
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(systemGroup.getClass());
-//        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
-        PageInfo pageInfo = null;
-        try {
-            List<SystemGroup> list = systemGroupService.findByCondition(condition);
-            pageInfo = new PageInfo(list);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(pageInfo);
-    }
-}
+//package com.txz.mall.controller;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageInfo;
+//import com.txz.mall.core.Result;
+//import com.txz.mall.core.ResultCode;
+//import com.txz.mall.model.SystemGroup;
+//import com.txz.mall.service.SystemGroupService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.web.bind.annotation.*;
+//import tk.mybatis.mapper.entity.Condition;
+//
+//import javax.annotation.Resource;
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * Created by CodeGenerator on 2025/07/11.
+// */
+//@Api(tags = "[后台]配置表管理")
+//@RestController
+//@RequestMapping("/system/group")
+//public class SystemGroupController {
+//
+//    private static Logger log = LoggerFactory.getLogger(SystemGroupController.class);
+//
+//    @Resource
+//    private SystemGroupService systemGroupService;
+//
+//    @PostMapping("/add")
+//    @ApiOperation(value = "配置表新增")
+//    public Result add(@RequestBody SystemGroup systemGroup) {
+//        if (systemGroup == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//
+//        try {
+//            systemGroup.setCreateTime(new Date());
+////            systemGroup.setCreateUserId(userId);
+//            systemGroupService.save(systemGroup);
+//        } catch (Exception e) {
+//            log.error("新增对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    @ApiOperation(value = "配置表删除")
+//    public Result delete(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            SystemGroup systemGroup = new SystemGroup();
+//            systemGroup.setId(id);
+//            systemGroup.setIsDelete(1);
+//            systemGroupService.update(systemGroup);
+//        } catch (Exception e) {
+//            log.error("删除对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/update")
+//    @ApiOperation(value = "配置表更新")
+//    public Result update(@RequestBody SystemGroup systemGroup) {
+//        if (systemGroup == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//        if (systemGroup.getId() == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            systemGroup.setUpdateTime(new Date());
+////            systemGroup.setUpdateUserId(userId);
+//            systemGroupService.update(systemGroup);
+//        } catch (Exception e) {
+//            log.error("更新对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/detail")
+//    @ApiOperation(value = "配置表获取详情")
+//    public Result<SystemGroup> detail(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        SystemGroup systemGroup = null;
+//        try {
+//            systemGroup = systemGroupService.findById(id);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(systemGroup);
+//    }
+//
+//    @PostMapping("/list")
+//    @ApiOperation(value = "配置表获取列表")
+//    public Result<List<SystemGroup>> list(@RequestBody SystemGroup systemGroup,@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+//
+//        PageHelper.startPage(page, size);
+//
+//        Condition condition = new Condition(systemGroup.getClass());
+////        Criteria criteria = condition.createCriteria();
+////        criteria.andEqualTo("name", city.getName());
+//        PageInfo pageInfo = null;
+//        try {
+//            List<SystemGroup> list = systemGroupService.findByCondition(condition);
+//            pageInfo = new PageInfo(list);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(pageInfo);
+//    }
+//}

mall-service/src/main/java/com/txz/mall/controller/SystemGroupDataController.java

@@ -1,143 +1,143 @@
-package com.txz.mall.controller;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.txz.mall.core.Result;
-import com.txz.mall.core.ResultCode;
-import com.txz.mall.model.SystemGroupData;
-import com.txz.mall.service.SystemGroupDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by CodeGenerator on 2025/07/11.
- */
-@Api(tags = "[后台]配置详情表管理")
-@RestController
-@RequestMapping("/system/group/data")
-public class SystemGroupDataController {
-
-    private static Logger log = LoggerFactory.getLogger(SystemGroupDataController.class);
-
-    @Resource
-    private SystemGroupDataService systemGroupDataService;
-
-    @PostMapping("/add")
-    @ApiOperation(value = "配置详情表新增")
-    public Result add(@RequestBody SystemGroupData systemGroupData) {
-        if (systemGroupData == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-
-        try {
-            systemGroupData.setCreateTime(new Date());
-//            systemGroupData.setCreateUserId(userId);
-            systemGroupDataService.save(systemGroupData);
-        } catch (Exception e) {
-            log.error("新增对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "配置详情表删除")
-    public Result delete(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            SystemGroupData systemGroupData = new SystemGroupData();
-            systemGroupData.setId(id);
-            systemGroupData.setIsDelete(1);
-            systemGroupDataService.update(systemGroupData);
-        } catch (Exception e) {
-            log.error("删除对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "配置详情表更新")
-    public Result update(@RequestBody SystemGroupData systemGroupData) {
-        if (systemGroupData == null) {
-            return Result.fail(ResultCode.OBJECT_IS_NULL);
-        }
-        if (systemGroupData.getId() == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        try {
-            systemGroupData.setUpdateTime(new Date());
-//            systemGroupData.setUpdateUserId(userId);
-            systemGroupDataService.update(systemGroupData);
-        } catch (Exception e) {
-            log.error("更新对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "配置详情表获取详情")
-    public Result<SystemGroupData> detail(@RequestParam Long id) {
-        if (id == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-
-        SystemGroupData systemGroupData = null;
-        try {
-            systemGroupData = systemGroupDataService.findById(id);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(systemGroupData);
-    }
-
-    @PostMapping("/list")
-    @ApiOperation(value = "配置详情表获取列表")
-    public Result<List<SystemGroupData>> list(@RequestBody SystemGroupData systemGroupData, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
-       
-        PageHelper.startPage(page, size);
-
-        Condition condition = new Condition(systemGroupData.getClass());
-//        Criteria criteria = condition.createCriteria();
-//        criteria.andEqualTo("name", city.getName());
-        PageInfo pageInfo = null;
-        try {
-            List<SystemGroupData> list = systemGroupDataService.findByCondition(condition);
-            pageInfo = new PageInfo(list);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(pageInfo);
-    }
-
-    @PostMapping("/configDetail")
-    @ApiOperation(value = "根据groupId获取配置详情")
-    public Result<List<SystemGroupData>> configDetail(@RequestParam Long groupId, Integer status) {
-        if (groupId == null) {
-            return Result.fail(ResultCode.ID_IS_NULL);
-        }
-        List<SystemGroupData> systemGroupData = null;
-        try {
-            systemGroupData = systemGroupDataService.configDetail(groupId, status);
-        } catch (Exception e) {
-            log.error("查询对象操作异常e:{}", e);
-            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
-        }
-        return Result.success(systemGroupData);
-    }
-}
+//package com.txz.mall.controller;
+//
+//import com.github.pagehelper.PageHelper;
+//import com.github.pagehelper.PageInfo;
+//import com.txz.mall.core.Result;
+//import com.txz.mall.core.ResultCode;
+//import com.txz.mall.model.SystemGroupData;
+//import com.txz.mall.service.SystemGroupDataService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.web.bind.annotation.*;
+//import tk.mybatis.mapper.entity.Condition;
+//
+//import javax.annotation.Resource;
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * Created by CodeGenerator on 2025/07/11.
+// */
+//@Api(tags = "[后台]配置详情表管理")
+//@RestController
+//@RequestMapping("/system/group/data")
+//public class SystemGroupDataController {
+//
+//    private static Logger log = LoggerFactory.getLogger(SystemGroupDataController.class);
+//
+//    @Resource
+//    private SystemGroupDataService systemGroupDataService;
+//
+//    @PostMapping("/add")
+//    @ApiOperation(value = "配置详情表新增")
+//    public Result add(@RequestBody SystemGroupData systemGroupData) {
+//        if (systemGroupData == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//
+//        try {
+//            systemGroupData.setCreateTime(new Date());
+////            systemGroupData.setCreateUserId(userId);
+//            systemGroupDataService.save(systemGroupData);
+//        } catch (Exception e) {
+//            log.error("新增对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    @ApiOperation(value = "配置详情表删除")
+//    public Result delete(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            SystemGroupData systemGroupData = new SystemGroupData();
+//            systemGroupData.setId(id);
+//            systemGroupData.setIsDelete(1);
+//            systemGroupDataService.update(systemGroupData);
+//        } catch (Exception e) {
+//            log.error("删除对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/update")
+//    @ApiOperation(value = "配置详情表更新")
+//    public Result update(@RequestBody SystemGroupData systemGroupData) {
+//        if (systemGroupData == null) {
+//            return Result.fail(ResultCode.OBJECT_IS_NULL);
+//        }
+//        if (systemGroupData.getId() == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        try {
+//            systemGroupData.setUpdateTime(new Date());
+////            systemGroupData.setUpdateUserId(userId);
+//            systemGroupDataService.update(systemGroupData);
+//        } catch (Exception e) {
+//            log.error("更新对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success();
+//    }
+//
+//    @PostMapping("/detail")
+//    @ApiOperation(value = "配置详情表获取详情")
+//    public Result<SystemGroupData> detail(@RequestParam Long id) {
+//        if (id == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//
+//        SystemGroupData systemGroupData = null;
+//        try {
+//            systemGroupData = systemGroupDataService.findById(id);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(systemGroupData);
+//    }
+//
+//    @PostMapping("/list")
+//    @ApiOperation(value = "配置详情表获取列表")
+//    public Result<List<SystemGroupData>> list(@RequestBody SystemGroupData systemGroupData,@RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+//
+//        PageHelper.startPage(page, size);
+//
+//        Condition condition = new Condition(systemGroupData.getClass());
+////        Criteria criteria = condition.createCriteria();
+////        criteria.andEqualTo("name", city.getName());
+//        PageInfo pageInfo = null;
+//        try {
+//            List<SystemGroupData> list = systemGroupDataService.findByCondition(condition);
+//            pageInfo = new PageInfo(list);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(pageInfo);
+//    }
+//
+//    @PostMapping("/configDetail")
+//    @ApiOperation(value = "根据groupId获取配置详情")
+//    public Result<List<SystemGroupData>> configDetail(@RequestParam Long groupId, Integer status) {
+//        if (groupId == null) {
+//            return Result.fail(ResultCode.ID_IS_NULL);
+//        }
+//        List<SystemGroupData> systemGroupData = null;
+//        try {
+//            systemGroupData = systemGroupDataService.configDetail(groupId, status);
+//        } catch (Exception e) {
+//            log.error("查询对象操作异常e:{}", e);
+//            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+//        }
+//        return Result.success(systemGroupData);
+//    }
+//}

mall-service/src/main/java/com/txz/mall/controller/UserAddressController.java

@@ -0,0 +1,142 @@
+package com.txz.mall.controller;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.txz.mall.core.Result;
+import com.txz.mall.core.ResultCode;
+import com.txz.mall.model.UserAddress;
+import com.txz.mall.service.UserAddressService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Api(tags = "[后台]userAddress管理")
+@RestController
+@RequestMapping("/user/address")
+public class UserAddressController {
+
+    private static Logger log = LoggerFactory.getLogger(UserAddressController.class);
+
+    @Resource
+    private UserAddressService userAddressService;
+
+    @PostMapping("/add")
+    @ApiOperation(value = "userAddress新增")
+    public Result add(@RequestBody UserAddress userAddress) {
+        if (userAddress == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        try {
+            userAddress.setCreateTime(new Date());
+//    		userAddress.setCreateUserId(userId);
+            userAddressService.save(userAddress);
+        } catch (Exception e) {
+            log.error("新增对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/delete")
+    @ApiOperation(value = "userAddress删除")
+    public Result delete(@RequestParam Long id) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        try {
+            UserAddress userAddress = new UserAddress();
+            userAddress.setId(id);
+            userAddress.setIsDelete(1);
+            userAddressService.update(userAddress);
+        } catch (Exception e) {
+            log.error("删除对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/update")
+    @ApiOperation(value = "userAddress更新")
+    public Result update(@RequestBody UserAddress userAddress) {
+        if (userAddress == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        if (userAddress.getId() == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        try {
+            userAddress.setUpdateTime(new Date());
+//    		userAddress.setUpdateUserId(userId);
+            userAddressService.update(userAddress);
+        } catch (Exception e) {
+            log.error("更新对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/detail")
+    @ApiOperation(value = "userAddress获取详情")
+    public Result<UserAddress> detail(@RequestParam Long id) {
+        if (id == null) {
+            return Result.fail(ResultCode.ID_IS_NULL);
+        }
+        UserAddress userAddress = null;
+        try {
+            userAddress = userAddressService.findById(id);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(userAddress);
+    }
+
+    @PostMapping("/list")
+    @ApiOperation(value = "userAddress获取列表")
+    public Result<List<UserAddress>> list(@RequestBody UserAddress userAddress, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(userAddress.getClass());
+//        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+        PageInfo pageInfo = null;
+        try {
+            List<UserAddress> list = userAddressService.findByCondition(condition);
+            pageInfo = new PageInfo(list);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success(pageInfo);
+    }
+
+    @PostMapping("/default")
+    @ApiOperation(value = "userAddress更新")
+    public Result defaultAddress(@RequestParam("id") Long id) {
+        if (id == null) {
+            return Result.fail(ResultCode.OBJECT_IS_NULL);
+        }
+        try {
+            UserAddress userAddress = new UserAddress();
+            userAddress.setUpdateTime(new Date());
+//    		userAddress.setUpdateUserId(userId);
+            userAddress.setId(id);
+            userAddress.setIsDefault(1);
+            userAddressService.update(userAddress);
+        } catch (Exception e) {
+            log.error("更新对象操作异常e:{}", e);
+            return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return Result.success();
+    }
+}

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

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

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

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

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

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

mall-service/src/main/java/com/txz/mall/model/StoreOrder.java

@@ -0,0 +1,404 @@
+package com.txz.mall.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Table(name = "m_store_order")
+public class StoreOrder {
+    /**
+     * 订单ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @Column(name = "order_id")
+    @ApiModelProperty(value = "订单号")
+    private String orderId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long uid;
+
+    /**
+     * 用户姓名
+     */
+    @Column(name = "real_name")
+    @ApiModelProperty(value = "用户姓名")
+    private String realName;
+
+    /**
+     * 用户电话
+     */
+    @Column(name = "user_phone")
+    @ApiModelProperty(value = "用户电话")
+    private String userPhone;
+
+    /**
+     * 详细地址
+     */
+    @Column(name = "user_address")
+    @ApiModelProperty(value = "详细地址")
+    private String userAddress;
+
+    /**
+     * 运费金额
+     */
+    @Column(name = "freight_price")
+    @ApiModelProperty(value = "运费金额")
+    private BigDecimal freightPrice;
+
+    /**
+     * 订单商品总数
+     */
+    @Column(name = "total_num")
+    @ApiModelProperty(value = "订单商品总数")
+    private Integer totalNum;
+
+    /**
+     * 订单总价
+     */
+    @Column(name = "total_price")
+    @ApiModelProperty(value = "订单总价")
+    private BigDecimal totalPrice;
+
+    /**
+     * 邮费
+     */
+    @Column(name = "total_postage")
+    @ApiModelProperty(value = "邮费")
+    private BigDecimal totalPostage;
+
+    /**
+     * 实际支付金额
+     */
+    @Column(name = "pay_price")
+    @ApiModelProperty(value = "实际支付金额")
+    private BigDecimal payPrice;
+
+    /**
+     * 支付邮费
+     */
+    @Column(name = "pay_postage")
+    @ApiModelProperty(value = "支付邮费")
+    private BigDecimal payPostage;
+
+    /**
+     * 抵扣金额
+     */
+    @Column(name = "deduction_price")
+    @ApiModelProperty(value = "抵扣金额")
+    private BigDecimal deductionPrice;
+
+    /**
+     * 优惠券id
+     */
+    @Column(name = "coupon_id")
+    @ApiModelProperty(value = "优惠券id")
+    private Long couponId;
+
+    /**
+     * 优惠券金额
+     */
+    @Column(name = "coupon_price")
+    @ApiModelProperty(value = "优惠券金额")
+    private BigDecimal couponPrice;
+
+    /**
+     * 支付状态
+     */
+    @ApiModelProperty(value = "支付状态")
+    private Integer paid;
+
+    /**
+     * 支付时间
+     */
+    @Column(name = "pay_time")
+    @ApiModelProperty(value = "支付时间")
+    private Date payTime;
+
+    /**
+     * 支付方式
+     */
+    @Column(name = "pay_type")
+    @ApiModelProperty(value = "支付方式")
+    private String payType;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）
+     */
+    @ApiModelProperty(value = "订单状态（0：待发货；1：待收货；2：已收货，待评价；3：已完成；）")
+    private Integer status;
+
+    /**
+     * 0 未退款 1 申请中 2 已退款 3 退款中
+     */
+    @ApiModelProperty(value = "0 未退款 1 申请中 2 已退款 3 退款中")
+    @Column(name = "refund_status")
+    private Integer refundStatus;
+
+    /**
+     * 退款图片
+     */
+    @ApiModelProperty(value = "退款图片")
+    @Column(name = "refund_reason_wap_img")
+    private String refundReasonWapImg;
+
+    /**
+     * 退款用户说明
+     */
+    @ApiModelProperty(value = "退款用户说明")
+    @Column(name = "refund_reason_wap_explain")
+    private String refundReasonWapExplain;
+
+    /**
+     * 前台退款原因
+     */
+    @ApiModelProperty(value = "前台退款原因")
+    @Column(name = "refund_reason_wap")
+    private String refundReasonWap;
+
+    /**
+     * 不退款的理由
+     */
+    @ApiModelProperty(value = "不退款的理由")
+    @Column(name = "refund_reason")
+    private String refundReason;
+
+    /**
+     * 退款时间
+     */
+    @ApiModelProperty(value = "退款时间")
+    @Column(name = "refund_reason_time")
+    private Date refundReasonTime;
+
+    /**
+     * 退款金额
+     */
+    @ApiModelProperty(value = "退款金额")
+    @Column(name = "refund_price")
+    private BigDecimal refundPrice;
+
+    /**
+     * 快递名称/送货人姓名
+     */
+    @ApiModelProperty(value = "快递名称/送货人姓名")
+    @Column(name = "delivery_name")
+    private String deliveryName;
+
+    /**
+     * 发货类型
+     */
+    @ApiModelProperty(value = "发货类型")
+    @Column(name = "delivery_type")
+    private String deliveryType;
+
+    /**
+     * 快递单号/手机号
+     */
+    @ApiModelProperty(value = "快递单号/手机号")
+    @Column(name = "delivery_id")
+    private String deliveryId;
+
+    /**
+     * 消费赚取积分
+     */
+    @ApiModelProperty(value = "消费赚取积分")
+    @Column(name = "gain_integral")
+    private Integer gainIntegral;
+
+    /**
+     * 使用积分
+     */
+    @ApiModelProperty(value = "使用积分")
+    @Column(name = "use_integral")
+    private Integer useIntegral;
+
+    /**
+     * 给用户退了多少积分
+     */
+    @ApiModelProperty(value = "给用户退了多少积分")
+    @Column(name = "back_integral")
+    private Integer backIntegral;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String mark;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete")
+    private Integer isDelete;
+
+    /**
+     * 管理员备注
+     */
+    @ApiModelProperty(value = "管理员备注")
+    private String remark;
+
+    /**
+     * 商户ID
+     */
+    @ApiModelProperty(value = "商户ID")
+    @Column(name = "mer_id")
+    private Long merId;
+
+    /**
+     * 是否是商户商品
+     */
+    @ApiModelProperty(value = "是否是商户商品")
+    @Column(name = "is_mer_check")
+    private Integer isMerCheck;
+
+    /**
+     * 拼团商品id0一般商品
+     */
+    @ApiModelProperty(value = "拼团商品id0一般商品")
+    @Column(name = "combination_id")
+    private Integer combinationId;
+
+    /**
+     * 拼团id 0没有拼团
+     */
+    @ApiModelProperty(value = "拼团id 0没有拼团")
+    @Column(name = "pink_id")
+    private Integer pinkId;
+
+    /**
+     * 成本价
+     */
+    @ApiModelProperty(value = "成本价")
+    private BigDecimal cost;
+
+    /**
+     * 秒杀商品ID
+     */
+    @ApiModelProperty(value = "秒杀商品ID")
+    @Column(name = "seckill_id")
+    private Long seckillId;
+
+    /**
+     * 砍价id
+     */
+    @ApiModelProperty(value = "砍价id")
+    @Column(name = "bargain_id")
+    private Long bargainId;
+
+    /**
+     * 核销码
+     */
+    @ApiModelProperty(value = "核销码")
+    @Column(name = "verify_code")
+    private String verifyCode;
+
+    /**
+     * 门店id
+     */
+    @ApiModelProperty(value = "门店id")
+    @Column(name = "store_id")
+    private Long storeId;
+
+    /**
+     * 配送方式 1=快递 ，2=门店自提
+     */
+    @ApiModelProperty(value = "配送方式 1=快递 ，2=门店自提")
+    @Column(name = "shipping_type")
+    private Integer shippingType;
+
+    /**
+     * 店员id/核销员id
+     */
+    @ApiModelProperty(value = "店员id/核销员id")
+    @Column(name = "clerk_id")
+    private Integer clerkId;
+
+    /**
+     * 支付渠道(0微信公众号1微信小程序2余额)
+     */
+    @ApiModelProperty(value = "支付渠道(0微信公众号1微信小程序2余额)")
+    @Column(name = "is_channel")
+    private Integer isChannel;
+
+    /**
+     * 消息提醒
+     */
+    @ApiModelProperty(value = "消息提醒")
+    @Column(name = "is_remind")
+    private Integer isRemind;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 快递公司简称
+     */
+    @ApiModelProperty(value = "快递公司简称")
+    @Column(name = "delivery_code")
+    private String deliveryCode;
+
+    /**
+     * 用户拼团活动id 0没有
+     */
+    @ApiModelProperty(value = "用户拼团活动id 0没有")
+    @Column(name = "bargain_user_id")
+    private Integer bargainUserId;
+
+    /**
+     * 订单类型:0-普通订单，1-视频号订单
+     */
+    @ApiModelProperty(value = "订单类型:0-普通订单，1-视频号订单")
+    private Integer type;
+
+    /**
+     * 商品总价
+     */
+    @ApiModelProperty(value = "商品总价")
+    @Column(name = "pro_total_price")
+    private BigDecimal proTotalPrice;
+
+    /**
+     * 改价前支付金额
+     */
+    @ApiModelProperty(value = "改价前支付金额")
+    @Column(name = "before_pay_price")
+    private BigDecimal beforePayPrice;
+
+    /**
+     * 是否改价,0-否，1-是
+     */
+    @ApiModelProperty(value = "是否改价,0-否，1-是")
+    @Column(name = "is_alter_price")
+    private Integer isAlterPrice;
+
+    /**
+     * 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+     */
+    @ApiModelProperty(value = "商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号")
+    @Column(name = "out_trade_no")
+    private String outTradeNo;
+
+
+}

mall-service/src/main/java/com/txz/mall/model/StorePink.java

@@ -0,0 +1,168 @@
+package com.txz.mall.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Table(name = "m_store_pink")
+public class StorePink {
+    /**
+     * 拼团ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long uid;
+
+    /**
+     * 订单id 生成
+     */
+    @ApiModelProperty(value = "订单id 生成")
+    @Column(name = "order_id")
+    private Long orderId;
+
+    /**
+     * 订单id  数据库
+     */
+    @ApiModelProperty(value = "订单id  数据库")
+    @Column(name = "order_id_key")
+    private Long orderIdKey;
+
+    /**
+     * 购买商品个数
+     */
+    @ApiModelProperty(value = "购买商品个数")
+    @Column(name = "total_num")
+    private Integer totalNum;
+
+    /**
+     * 购买总金额
+     */
+    @ApiModelProperty(value = "购买总金额")
+    @Column(name = "total_price")
+    private BigDecimal totalPrice;
+
+    /**
+     * 拼团商品id
+     */
+    @ApiModelProperty(value = "拼团商品id")
+    private Long cid;
+
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(value = "商品id")
+    private Long pid;
+
+    /**
+     * 拼图总人数
+     */
+    @ApiModelProperty(value = "拼图总人数")
+    private Integer people;
+
+    /**
+     * 拼团商品单价
+     */
+    @ApiModelProperty(value = "拼团商品单价")
+    private BigDecimal price;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(value = "开始时间")
+    @Column(name = "add_time")
+    private Date addTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    @Column(name = "stop_time")
+    private Date stopTime;
+
+    /**
+     * 团长id 0为团长
+     */
+    @ApiModelProperty(value = "团长id 0为团长")
+    @Column(name = "k_id")
+    private Integer kId;
+
+    /**
+     * 是否发送模板消息0未发送1已发送
+     */
+    @ApiModelProperty(value = "是否发送模板消息0未发送1已发送")
+    @Column(name = "is_tpl")
+    private Integer isTpl;
+
+    /**
+     * 是否退款 0未退款 1已退款
+     */
+    @ApiModelProperty(value = "是否退款 0未退款 1已退款")
+    @Column(name = "is_refund")
+    private Integer isRefund;
+
+    /**
+     * 状态1进行中2已完成3未完成
+     */
+    @ApiModelProperty(value = "状态1进行中2已完成3未完成")
+    private Integer status;
+
+    /**
+     * 是否虚拟拼团
+     */
+    @ApiModelProperty(value = "是否虚拟拼团")
+    @Column(name = "is_virtual")
+    private Integer isVirtual;
+
+    /**
+     * 用户昵称
+     */
+    @ApiModelProperty(value = "用户昵称")
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete")
+    private Integer isDelete;
+
+}

mall-service/src/main/java/com/txz/mall/model/UserAddress.java

@@ -0,0 +1,423 @@
+package com.txz.mall.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data
+@Table(name = "m_user_address")
+public class UserAddress {
+    /**
+     * 用户地址id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long uid;
+
+    /**
+     * 收货人姓名
+     */
+    @ApiModelProperty(value = "收货人姓名")
+    @Column(name = "real_name")
+    private String realName;
+
+    /**
+     * 收货人电话
+     */
+    @ApiModelProperty(value = "收货人电话")
+    private String phone;
+
+    /**
+     * 收货人所在省
+     */
+    @ApiModelProperty(value = "收货人所在省")
+    private String province;
+
+    /**
+     * 收货人所在市
+     */
+    @ApiModelProperty(value = "收货人所在市")
+    private String city;
+
+    /**
+     * 城市id
+     */
+    @ApiModelProperty(value = "城市id")
+    @Column(name = "city_id")
+    private Long cityId;
+
+    /**
+     * 收货人所在区
+     */
+    @ApiModelProperty(value = "收货人所在区")
+    private String district;
+
+    /**
+     * 收货人详细地址
+     */
+    @ApiModelProperty(value = "收货人详细地址")
+    private String detail;
+
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    /**
+     * 是否默认
+     */
+    @ApiModelProperty(value = "是否默认")
+    @Column(name = "is_default")
+    private Integer isDefault;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @Column(name = "create_user_id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @Column(name = "update_user_id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @Column(name = "is_delete")
+    private Integer isDelete;
+
+    /**
+     * 获取用户地址id
+     *
+     * @return id - 用户地址id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置用户地址id
+     *
+     * @param id 用户地址id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取用户id
+     *
+     * @return uid - 用户id
+     */
+    public Long getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置用户id
+     *
+     * @param uid 用户id
+     */
+    public void setUid(Long uid) {
+        this.uid = uid;
+    }
+
+    /**
+     * 获取收货人姓名
+     *
+     * @return real_name - 收货人姓名
+     */
+    public String getRealName() {
+        return realName;
+    }
+
+    /**
+     * 设置收货人姓名
+     *
+     * @param realName 收货人姓名
+     */
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    /**
+     * 获取收货人电话
+     *
+     * @return phone - 收货人电话
+     */
+    public String getPhone() {
+        return phone;
+    }
+
+    /**
+     * 设置收货人电话
+     *
+     * @param phone 收货人电话
+     */
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    /**
+     * 获取收货人所在省
+     *
+     * @return province - 收货人所在省
+     */
+    public String getProvince() {
+        return province;
+    }
+
+    /**
+     * 设置收货人所在省
+     *
+     * @param province 收货人所在省
+     */
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    /**
+     * 获取收货人所在市
+     *
+     * @return city - 收货人所在市
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * 设置收货人所在市
+     *
+     * @param city 收货人所在市
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    /**
+     * 获取城市id
+     *
+     * @return city_id - 城市id
+     */
+    public Long getCityId() {
+        return cityId;
+    }
+
+    /**
+     * 设置城市id
+     *
+     * @param cityId 城市id
+     */
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    /**
+     * 获取收货人所在区
+     *
+     * @return district - 收货人所在区
+     */
+    public String getDistrict() {
+        return district;
+    }
+
+    /**
+     * 设置收货人所在区
+     *
+     * @param district 收货人所在区
+     */
+    public void setDistrict(String district) {
+        this.district = district;
+    }
+
+    /**
+     * 获取收货人详细地址
+     *
+     * @return detail - 收货人详细地址
+     */
+    public String getDetail() {
+        return detail;
+    }
+
+    /**
+     * 设置收货人详细地址
+     *
+     * @param detail 收货人详细地址
+     */
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    /**
+     * 获取经度
+     *
+     * @return longitude - 经度
+     */
+    public String getLongitude() {
+        return longitude;
+    }
+
+    /**
+     * 设置经度
+     *
+     * @param longitude 经度
+     */
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    /**
+     * 获取纬度
+     *
+     * @return latitude - 纬度
+     */
+    public String getLatitude() {
+        return latitude;
+    }
+
+    /**
+     * 设置纬度
+     *
+     * @param latitude 纬度
+     */
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    /**
+     * 获取是否默认
+     *
+     * @return is_default - 是否默认
+     */
+    public Integer getIsDefault() {
+        return isDefault;
+    }
+
+    /**
+     * 设置是否默认
+     *
+     * @param isDefault 是否默认
+     */
+    public void setIsDefault(Integer isDefault) {
+        this.isDefault = isDefault;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return create_time - 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return update_time - 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建人id
+     *
+     * @return create_user_id - 创建人id
+     */
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+
+    /**
+     * 设置创建人id
+     *
+     * @param createUserId 创建人id
+     */
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 获取更新人id
+     *
+     * @return update_user_id - 更新人id
+     */
+    public Long getUpdateUserId() {
+        return updateUserId;
+    }
+
+    /**
+     * 设置更新人id
+     *
+     * @param updateUserId 更新人id
+     */
+    public void setUpdateUserId(Long updateUserId) {
+        this.updateUserId = updateUserId;
+    }
+
+    /**
+     * 获取是否删除
+     *
+     * @return is_delete - 是否删除
+     */
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    /**
+     * 设置是否删除
+     *
+     * @param isDelete 是否删除
+     */
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.txz.mall.service;
+
+import com.txz.mall.core.Service;
+import com.txz.mall.model.StoreOrder;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+public interface StoreOrderService extends Service<StoreOrder> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.txz.mall.service;
+
+import com.txz.mall.core.Service;
+import com.txz.mall.model.StorePink;
+import com.txz.mall.vo.StorePinkDetailVO;
+
+import java.util.List;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+public interface StorePinkService extends Service<StorePink> {
+
+    /**
+     * PC拼团详情列表
+     *
+     * @param pinkId 团长pinkId
+     * @return
+     */
+    List<StorePinkDetailVO> getAdminList(Integer pinkId);
+}

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

@@ -0,0 +1,12 @@
+package com.txz.mall.service;
+
+import com.txz.mall.core.Service;
+import com.txz.mall.model.UserAddress;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+public interface UserAddressService extends Service<UserAddress> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.txz.mall.service.impl;
+
+import com.txz.mall.core.AbstractService;
+import com.txz.mall.dao.StoreOrderMapper;
+import com.txz.mall.model.StoreOrder;
+import com.txz.mall.service.StoreOrderService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Service
+@Transactional
+public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implements StoreOrderService {
+    @Resource
+    private StoreOrderMapper mStoreOrderMapper;
+
+}

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

@@ -0,0 +1,57 @@
+package com.txz.mall.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.txz.mall.core.AbstractService;
+import com.txz.mall.dao.StorePinkMapper;
+import com.txz.mall.model.StoreOrder;
+import com.txz.mall.model.StorePink;
+import com.txz.mall.service.StoreOrderService;
+import com.txz.mall.service.StorePinkService;
+import com.txz.mall.vo.StorePinkDetailVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Condition;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Service
+@Transactional
+public class StorePinkServiceImpl extends AbstractService<StorePink> implements StorePinkService {
+    @Resource
+    private StorePinkMapper storePinkMapper;
+    @Resource
+    private StoreOrderService storeOrderService;
+
+    @Override
+    public List<StorePinkDetailVO> getAdminList(Integer pinkId) {
+        Condition condition = new Condition(StorePink.class);
+        Example.Criteria criteria = condition.createCriteria();
+        criteria.andEqualTo("id", pinkId);
+        criteria.andEqualTo("kId", pinkId);
+        List<StorePink> pinkList = findByCondition(condition);
+        pinkList = pinkList.stream()
+                .sorted(Comparator.comparing(StorePink::getId).reversed())
+                .collect(Collectors.toList());
+        // 将拼团状态提换为订单状态
+        List<StorePinkDetailVO> responseList = pinkList.stream().map(pink -> {
+            StorePinkDetailVO response = new StorePinkDetailVO();
+            BeanUtils.copyProperties(pink, response);
+            StoreOrder storeOrder = storeOrderService.findById(pink.getOrderId());
+            if (ObjectUtil.isNotNull(storeOrder)) {
+                response.setOrderStatus(storeOrder.getStatus());
+                response.setRefundStatus(storeOrder.getRefundStatus());
+            }
+            return response;
+        }).collect(Collectors.toList());
+        return responseList;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.txz.mall.service.impl;
+
+import com.txz.mall.core.AbstractService;
+import com.txz.mall.dao.UserAddressMapper;
+import com.txz.mall.model.UserAddress;
+import com.txz.mall.service.UserAddressService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Service
+@Transactional
+public class UserAddressServiceImpl extends AbstractService<UserAddress> implements UserAddressService {
+    @Resource
+    private UserAddressMapper mUserAddressMapper;
+
+}

mall-service/src/main/resources/mapper/StoreOrderMapper.xml

@@ -0,0 +1,67 @@
+<?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.StoreOrderMapper">
+    <resultMap id="BaseResultMap" type="com.txz.mall.model.StoreOrder">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="order_id" jdbcType="VARCHAR" property="orderId"/>
+        <result column="uid" jdbcType="BIGINT" property="uid"/>
+        <result column="real_name" jdbcType="VARCHAR" property="realName"/>
+        <result column="user_phone" jdbcType="VARCHAR" property="userPhone"/>
+        <result column="user_address" jdbcType="VARCHAR" property="userAddress"/>
+        <result column="freight_price" jdbcType="DECIMAL" property="freightPrice"/>
+        <result column="total_num" jdbcType="INTEGER" property="totalNum"/>
+        <result column="total_price" jdbcType="DECIMAL" property="totalPrice"/>
+        <result column="total_postage" jdbcType="DECIMAL" property="totalPostage"/>
+        <result column="pay_price" jdbcType="DECIMAL" property="payPrice"/>
+        <result column="pay_postage" jdbcType="DECIMAL" property="payPostage"/>
+        <result column="deduction_price" jdbcType="DECIMAL" property="deductionPrice"/>
+        <result column="coupon_id" jdbcType="BIGINT" property="couponId"/>
+        <result column="coupon_price" jdbcType="DECIMAL" property="couponPrice"/>
+        <result column="paid" jdbcType="INTEGER" property="paid"/>
+        <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
+        <result column="pay_type" jdbcType="VARCHAR" property="payType"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="status" jdbcType="BIT" property="status"/>
+        <result column="refund_status" jdbcType="INTEGER" property="refundStatus"/>
+        <result column="refund_reason_wap_img" jdbcType="VARCHAR" property="refundReasonWapImg"/>
+        <result column="refund_reason_wap_explain" jdbcType="VARCHAR" property="refundReasonWapExplain"/>
+        <result column="refund_reason_wap" jdbcType="VARCHAR" property="refundReasonWap"/>
+        <result column="refund_reason" jdbcType="VARCHAR" property="refundReason"/>
+        <result column="refund_reason_time" jdbcType="TIMESTAMP" property="refundReasonTime"/>
+        <result column="refund_price" jdbcType="DECIMAL" property="refundPrice"/>
+        <result column="delivery_name" jdbcType="VARCHAR" property="deliveryName"/>
+        <result column="delivery_type" jdbcType="VARCHAR" property="deliveryType"/>
+        <result column="delivery_id" jdbcType="VARCHAR" property="deliveryId"/>
+        <result column="gain_integral" jdbcType="INTEGER" property="gainIntegral"/>
+        <result column="use_integral" jdbcType="INTEGER" property="useIntegral"/>
+        <result column="back_integral" jdbcType="INTEGER" property="backIntegral"/>
+        <result column="mark" jdbcType="VARCHAR" property="mark"/>
+        <result column="is_del" jdbcType="INTEGER" property="isDel"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="mer_id" jdbcType="BIGINT" property="merId"/>
+        <result column="is_mer_check" jdbcType="INTEGER" property="isMerCheck"/>
+        <result column="combination_id" jdbcType="INTEGER" property="combinationId"/>
+        <result column="pink_id" jdbcType="INTEGER" property="pinkId"/>
+        <result column="cost" jdbcType="DECIMAL" property="cost"/>
+        <result column="seckill_id" jdbcType="BIGINT" property="seckillId"/>
+        <result column="bargain_id" jdbcType="BIGINT" property="bargainId"/>
+        <result column="verify_code" jdbcType="VARCHAR" property="verifyCode"/>
+        <result column="store_id" jdbcType="BIGINT" property="storeId"/>
+        <result column="shipping_type" jdbcType="BIT" property="shippingType"/>
+        <result column="clerk_id" jdbcType="INTEGER" property="clerkId"/>
+        <result column="is_channel" jdbcType="INTEGER" property="isChannel"/>
+        <result column="is_remind" jdbcType="INTEGER" property="isRemind"/>
+        <result column="is_delete" jdbcType="INTEGER" property="isDelete"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="delivery_code" jdbcType="VARCHAR" property="deliveryCode"/>
+        <result column="bargain_user_id" jdbcType="INTEGER" property="bargainUserId"/>
+        <result column="type" jdbcType="INTEGER" property="type"/>
+        <result column="pro_total_price" jdbcType="DECIMAL" property="proTotalPrice"/>
+        <result column="before_pay_price" jdbcType="DECIMAL" property="beforePayPrice"/>
+        <result column="is_alter_price" jdbcType="INTEGER" property="isAlterPrice"/>
+        <result column="out_trade_no" jdbcType="VARCHAR" property="outTradeNo"/>
+    </resultMap>
+</mapper>

mall-service/src/main/resources/mapper/StorePinkMapper.xml

@@ -0,0 +1,33 @@
+<?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.StorePinkMapper">
+    <resultMap id="BaseResultMap" type="com.txz.mall.model.StorePink">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <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="stop_time" jdbcType="TIMESTAMP" property="stopTime"/>
+        <result column="k_id" jdbcType="INTEGER" property="kId"/>
+        <result column="is_tpl" jdbcType="INTEGER" property="isTpl"/>
+        <result column="is_refund" jdbcType="INTEGER" property="isRefund"/>
+        <result column="status" jdbcType="INTEGER" 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"/>
+        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
+        <result column="is_delete" jdbcType="INTEGER" property="isDelete"/>
+    </resultMap>
+</mapper>

mall-service/src/main/resources/mapper/UserAddressMapper.xml

@@ -0,0 +1,26 @@
+<?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.UserAddressMapper">
+    <resultMap id="BaseResultMap" type="com.txz.mall.model.UserAddress">
+        <!--
+          WARNING - @mbg.generated
+        -->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="uid" jdbcType="BIGINT" property="uid"/>
+        <result column="real_name" jdbcType="VARCHAR" property="realName"/>
+        <result column="phone" jdbcType="VARCHAR" property="phone"/>
+        <result column="province" jdbcType="VARCHAR" property="province"/>
+        <result column="city" jdbcType="VARCHAR" property="city"/>
+        <result column="city_id" jdbcType="BIGINT" property="cityId"/>
+        <result column="district" jdbcType="VARCHAR" property="district"/>
+        <result column="detail" jdbcType="VARCHAR" property="detail"/>
+        <result column="longitude" jdbcType="VARCHAR" property="longitude"/>
+        <result column="latitude" jdbcType="VARCHAR" property="latitude"/>
+        <result column="is_default" jdbcType="INTEGER" property="isDefault"/>
+        <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"/>
+        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
+        <result column="is_delete" jdbcType="INTEGER" property="isDelete"/>
+    </resultMap>
+</mapper>

mall-service/src/test/resources/generator/template/controller.ftl

@@ -38,17 +38,14 @@ public class ${modelNameUpperCamel}Controller {
     private ${modelNameUpperCamel}Service ${modelNameLowerCamel}Service;
 
     @PostMapping("/add")
-	@ApiOperation(value = "${modelNameLowerCamel}新增",httpMethod = "POST")
-    public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel},Long userId) {
+@ApiOperation(value = "${modelNameLowerCamel}新增")
+public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) {
     	if(${modelNameLowerCamel} == null){
     		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
-    	if(userId == null){
-    		return Result.fail(ResultCode.USERID_IS_NULL);
-    	}
     	try {
     		${modelNameLowerCamel}.setCreateTime(new Date());
-    		${modelNameLowerCamel}.setCreateUserId(userId);
+//            ${modelNameLowerCamel}.setCreateUserId(userId);
     		${modelNameLowerCamel}Service.save(${modelNameLowerCamel});
 		} catch (Exception e) {
 			log.error("新增对象操作异常e:{}",e);
@@ -58,14 +55,11 @@ public class ${modelNameUpperCamel}Controller {
     }
 
     @PostMapping("/delete")
-	@ApiOperation(value = "${modelNameLowerCamel}删除",httpMethod = "POST")
-    public Result delete(@RequestParam Long id,Long userId) {
+@ApiOperation(value = "${modelNameLowerCamel}删除")
+public Result delete(@RequestParam Long id) {
     	if(id == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
-    	if(userId == null){
-    		return Result.fail(ResultCode.USERID_IS_NULL);
-    	}
     	try {
             ${modelNameUpperCamel} ${modelNameLowerCamel} = new ${modelNameUpperCamel}();
 			${modelNameLowerCamel}.setId(id);
@@ -79,20 +73,17 @@ public class ${modelNameUpperCamel}Controller {
     }
 
     @PostMapping("/update")
-	@ApiOperation(value = "${modelNameLowerCamel}更新",httpMethod = "POST")
-    public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel},Long userId) {
+@ApiOperation(value = "${modelNameLowerCamel}更新")
+public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}) {
     	if(${modelNameLowerCamel} == null){
     		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
     	if(${modelNameLowerCamel}.getId() == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
-    	if(userId == null){
-    		return Result.fail(ResultCode.USERID_IS_NULL);
-    	}
     	try {
     		${modelNameLowerCamel}.setUpdateTime(new Date());
-    		${modelNameLowerCamel}.setUpdateUserId(userId);
+//            ${modelNameLowerCamel}.setUpdateUserId(userId);
     		${modelNameLowerCamel}Service.update(${modelNameLowerCamel});
 		} catch (Exception e) {
 			log.error("更新对象操作异常e:{}",e);
@@ -102,14 +93,11 @@ public class ${modelNameUpperCamel}Controller {
     }
 
     @PostMapping("/detail")
-	@ApiOperation(value = "${modelNameLowerCamel}获取详情",httpMethod = "POST")
-    public Result<${modelNameUpperCamel}> detail(@RequestParam Long id,Long userId) {
+@ApiOperation(value = "${modelNameLowerCamel}获取详情")
+public Result<${modelNameUpperCamel}> detail(@RequestParam Long id) {
     	if(id == null){
     		return Result.fail(ResultCode.ID_IS_NULL);
     	}
-    	if(userId == null){
-    		return Result.fail(ResultCode.USERID_IS_NULL);
-    	}
     	${modelNameUpperCamel} ${modelNameLowerCamel} = null;
     	try {
     		${modelNameLowerCamel} = ${modelNameLowerCamel}Service.findById(id);
@@ -121,11 +109,9 @@ public class ${modelNameUpperCamel}Controller {
     }
 
     @PostMapping("/list")
-	@ApiOperation(value = "${modelNameLowerCamel}获取列表",httpMethod = "POST")
-    public Result<List<${modelNameUpperCamel}>> list(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size,Long userId) {
-        if(userId == null){
-    		return Result.fail(ResultCode.USERID_IS_NULL);
-    	}
+@ApiOperation(value = "${modelNameLowerCamel}获取列表")
+public Result
+<List<${modelNameUpperCamel}>> list(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(${modelNameLowerCamel}.getClass());