diff --git a/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java index e7c7d75..96fd380 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/MemberMapper.java @@ -1,7 +1,5 @@ package com.ycwl.basic.mapper.pc; -import com.ycwl.basic.model.pc.broker.entity.BrokerEntity; -import com.ycwl.basic.model.pc.broker.req.BrokerReqQuery; import com.ycwl.basic.model.pc.member.entity.MemberEntity; import com.ycwl.basic.model.pc.member.req.MemberReqQuery; @@ -10,6 +8,7 @@ import java.util.List; /** * @Author:longbinbin * @Date:2024/11/29 15:57 + * 用户(前台) */ public interface MemberMapper { List list(MemberReqQuery memberReqQuery); diff --git a/src/main/java/com/ycwl/basic/mapper/pc/MenuMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/MenuMapper.java index 1d7e6e6..e78b848 100644 --- a/src/main/java/com/ycwl/basic/mapper/pc/MenuMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/pc/MenuMapper.java @@ -14,4 +14,6 @@ public interface MenuMapper { int add(MenuEntity menuEntity); ListgetListByType(@Param("type")Integer type); + + int update(MenuEntity menuEntity); } diff --git a/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java b/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java new file mode 100644 index 0000000..2a1b34f --- /dev/null +++ b/src/main/java/com/ycwl/basic/mapper/pc/OrderMapper.java @@ -0,0 +1,21 @@ +package com.ycwl.basic.mapper.pc; + +import com.ycwl.basic.model.pc.order.entity.OrderEntity; +import com.ycwl.basic.model.pc.order.req.OrderReqQuery; +import com.ycwl.basic.model.pc.order.resp.OrderRespVO; + +import java.util.List; + +/** + * @Author:longbinbin + * @Date:2024/11/29 16:32 + * 订单 + */ +public interface OrderMapper { + List list(OrderReqQuery orderReqQuery); + OrderEntity getById(Long id); + int add(OrderEntity order); +// int deleteById(Long id); + int update(OrderEntity order); + +} diff --git a/src/main/java/com/ycwl/basic/model/pc/order/entity/OrderEntity.java b/src/main/java/com/ycwl/basic/model/pc/order/entity/OrderEntity.java new file mode 100644 index 0000000..6f98fae --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/entity/OrderEntity.java @@ -0,0 +1,80 @@ +package com.ycwl.basic.model.pc.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/11/29 16:33 + */ +@Data +@TableName("order") +public class OrderEntity { + @TableId + private Long id; + /** + * 用户id + */ + private Long memberId; + /** + * 微信openId + */ + private Long openId; + /** + * 价格 + */ + private BigDecimal price; + /** + * 实际支付价格 + */ + private BigDecimal payPrice; + /** + * 备注 + */ + private String remark; + /** + * 推客id + */ + private Long brokerId; + /** + * 推客优惠码 + */ + private String promoCode; + /** + * 退款原因 + */ + private String refundReason; + /** + * 退款状态,0未提出,1已通过,2待审核 + */ + private Integer refundStatus; + /** + * 状态,0未支付,1已支付,2已退款,9已取消 + */ + private Integer status; + /** + * 订单创建时间 + */ + private Date createAt; + /** + * 订单更新时间 + */ + private Date updateAt; + /** + * 订单支付时间 + */ + private Date payAt; + /** + * 订单取消时间 + */ + private Date cancelAt; + /** + * 订单退款时间 + */ + private Date refundAt; + +} diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java new file mode 100644 index 0000000..f40ff5c --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java @@ -0,0 +1,93 @@ +package com.ycwl.basic.model.pc.order.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/11/29 16:33 + */ +@Data +@ApiModel(value = "订单查询对象") +public class OrderReqQuery { + @ApiModelProperty("用户昵称") + private String memberNickname; + @ApiModelProperty("用户真实名称") + private String memberRealName; + /** + * 微信openId + */ + @ApiModelProperty("微信openId") + private Long openId; + /** + * 价格 + */ + @ApiModelProperty("价格") + private BigDecimal price; + /** + * 实际支付价格 + */ + @ApiModelProperty("实际支付价格") + private BigDecimal payPrice; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String remark; + /** + * 推客id + */ + @ApiModelProperty("推客id") + private Long brokerId; + /** + * 推客优惠码 + */ + @ApiModelProperty("推客优惠码") + private String promoCode; + /** + * 退款原因 + */ + @ApiModelProperty("退款原因") + private String refundReason; + /** + * 退款状态,0未提出,1已通过,2待审核 + */ + @ApiModelProperty("退款状态,0未提出,1已通过,2待审核") + private Integer refundStatus; + /** + * 状态,0未支付,1已支付,2已退款,9已取消 + */ + @ApiModelProperty("状态,0未支付,1已支付,2已退款,9已取消") + private Integer status; + /** + * 订单创建时间 + */ + @ApiModelProperty("订单创建时间") + private Date startCreateTime; + private Date endCreateTime; + /** + * 订单支付时间 + */ + @ApiModelProperty("订单支付时间") + private Date startPayTime; + private Date endPayTime; + /** + * 订单取消时间 + */ + @ApiModelProperty("订单取消时间") + private Date startCancelTime; + private Date endCancelTime; + /** + * 订单退款时间 + */ + @ApiModelProperty("订单退款时间") + private Date startRefundTime; + private Date endRefundTime; + +} diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java new file mode 100644 index 0000000..6b1c19e --- /dev/null +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java @@ -0,0 +1,93 @@ +package com.ycwl.basic.model.pc.order.resp; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author:longbinbin + * @Date:2024/11/29 15:59 + */ +@Data +@ApiModel("查询订单信息响应参数") +public class OrderRespVO { + private Long id; + private Long memberId; + @ApiModelProperty("用户昵称") + private String memberNickname; + @ApiModelProperty("用户真实名称") + private String memberRealName; + /** + * 微信openId + */ + @ApiModelProperty("微信openId") + private Long openId; + /** + * 价格 + */ + @ApiModelProperty("价格") + private BigDecimal price; + /** + * 实际支付价格 + */ + @ApiModelProperty("实际支付价格") + private BigDecimal payPrice; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String remark; + /** + * 推客id + */ + @ApiModelProperty("推客id") + private Long brokerId; + /** + * 推客优惠码 + */ + @ApiModelProperty("推客优惠码") + private String promoCode; + /** + * 退款原因 + */ + @ApiModelProperty("退款原因") + private String refundReason; + /** + * 退款状态,0未提出,1已通过,2待审核 + */ + @ApiModelProperty("退款状态,0未提出,1已通过,2待审核") + private Integer refundStatus; + /** + * 状态,0未支付,1已支付,2已退款,9已取消 + */ + @ApiModelProperty("状态,0未支付,1已支付,2已退款,9已取消") + private Integer status; + /** + * 订单创建时间 + */ + @ApiModelProperty("订单创建时间") + private Date createAt; + /** + * 订单更新时间 + */ + @ApiModelProperty("订单更新时间") + private Date updateAt; + /** + * 订单支付时间 + */ + @ApiModelProperty("订单支付时间") + private Date payAt; + /** + * 订单取消时间 + */ + @ApiModelProperty("订单取消时间") + private Date cancelAt; + /** + * 订单退款时间 + */ + @ApiModelProperty("订单退款时间") + private Date refundAt; +} diff --git a/src/main/resources/mapper/pc/MenuMapper.xml b/src/main/resources/mapper/pc/MenuMapper.xml index 2421b2c..ab4c57c 100644 --- a/src/main/resources/mapper/pc/MenuMapper.xml +++ b/src/main/resources/mapper/pc/MenuMapper.xml @@ -13,6 +13,36 @@ values (#{id}, #{parentId}, #{target}, #{name}, #{type}, #{sort}, #{permissionUrl}, #{isRemove}, #{businessType}, #{icon}) + + update menu + + + parent_id = #{parentId}, + + + target = #{target}, + + + `name` = #{name}, + + + `type` = #{type}, + + + sort = #{sort}, + + + permission_url = #{permissionUrl}, + + + business_type = #{businessType}, + + + icon = #{icon}, + + + where id = #{id} + delete diff --git a/src/main/resources/mapper/pc/OrderMapper.xml b/src/main/resources/mapper/pc/OrderMapper.xml new file mode 100644 index 0000000..46ac8e5 --- /dev/null +++ b/src/main/resources/mapper/pc/OrderMapper.xml @@ -0,0 +1,118 @@ + + + + + insert into `order`(id, member_id, openid,price, pay_price, remark, broker_id, promo_code) + VALUES (#{id}, #{memberId}, #{openid},#{price}, #{payPrice}, #{remark}, #{brokerId}, #{promoCode}) + + + update `order` + + + price = #{price}, + + + pay_price = #{payPrice}, + + + remark = #{remark}, + + + refund_reason = #{refundReason}, + + + refund_status = #{refundStatus}, + + + `status` = #{status}, + + + refund_at = #{refundAt}, + + + pay_at = #{payAt}, + + + cancel_at = #{cancelAt}, + + + where id = #{id} + + + delete from `order` where id = #{id} + + + + \ No newline at end of file