feat(shop/order): 添加企业微信id字段到店铺和订单相关实体
在店铺和订单相关的DTO、Entity及查询类中添加corpid字段,用于存储企业微信id信息 同时更新数据库表结构,为shop、shop_order和shop_order_goods表添加corpid字段
This commit is contained in:
parent
72fdac0083
commit
909f61fdd5
|
@ -65,6 +65,10 @@ public class ShopOrderEntity extends BaseEntity<ShopOrderEntity> {
|
|||
@TableField("biz_order_id")
|
||||
private String bizOrderId;
|
||||
|
||||
@ApiModelProperty("企业微信id")
|
||||
@TableField("corpid")
|
||||
private String corpid;
|
||||
|
||||
@ApiModelProperty("订单总金额")
|
||||
@TableField("total_amount")
|
||||
private BigDecimal totalAmount;
|
||||
|
|
|
@ -68,6 +68,9 @@ public class ShopOrderGoodsEntity extends BaseEntity<ShopOrderGoodsEntity> {
|
|||
@TableField("`status`")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty("企业微信id")
|
||||
@TableField("corpid")
|
||||
private String corpid;
|
||||
|
||||
@Override
|
||||
public Serializable pkVal() {
|
||||
|
|
|
@ -54,4 +54,7 @@ public class ShopOrderDTO {
|
|||
private Integer isInternal;
|
||||
@ApiModelProperty("业务系统订单ID(对接外部系统)")
|
||||
private String bizOrderId;
|
||||
|
||||
@ApiModelProperty("企业微信id")
|
||||
private String corpid;
|
||||
}
|
|
@ -25,6 +25,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
|
|||
private Date endTime;
|
||||
private Date payTime;
|
||||
private String paymentMethod;
|
||||
private String corpid;
|
||||
|
||||
@Override
|
||||
public QueryWrapper<T> addQueryCondition() {
|
||||
|
@ -44,6 +45,7 @@ public class SearchShopOrderQuery<T> extends AbstractPageQuery<T> {
|
|||
.eq(status != null, "o.status", status)
|
||||
.eq(payStatus != null, "o.pay_status", payStatus)
|
||||
.eq(StrUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod)
|
||||
.eq(StrUtil.isNotBlank(corpid), "o.corpid", corpid)
|
||||
.between(startTime != null && endTime != null, "o.create_time", startTime, endTime)
|
||||
.between(payTime != null, "o.pay_time",
|
||||
payTime == null ? null : DateUtil.beginOfDay(payTime).toJdkDate(),
|
||||
|
|
|
@ -35,6 +35,9 @@ public class ShopEntity extends BaseEntity<ShopEntity> {
|
|||
@TableField("shop_name")
|
||||
private String shopName;
|
||||
|
||||
@ApiModelProperty("企业微信id")
|
||||
@TableField("corpid")
|
||||
private String corpid;
|
||||
|
||||
@Override
|
||||
public Serializable pkVal() {
|
||||
|
|
|
@ -24,4 +24,6 @@ public class ShopDTO {
|
|||
@ExcelColumn(name = "商店名称")
|
||||
private String shopName;
|
||||
|
||||
@ExcelColumn(name = "企业微信id")
|
||||
private String corpid;
|
||||
}
|
|
@ -15,6 +15,7 @@ public class SearchShopQuery<T> extends AbstractPageQuery<T> {
|
|||
private String enable;
|
||||
private Date startTime;
|
||||
private Date endTime;
|
||||
private String corpid;
|
||||
|
||||
@Override
|
||||
public QueryWrapper<T> addQueryCondition() {
|
||||
|
@ -23,6 +24,7 @@ public class SearchShopQuery<T> extends AbstractPageQuery<T> {
|
|||
queryWrapper
|
||||
.like(StrUtil.isNotEmpty(shopName), "shop_name", shopName)
|
||||
.eq(StrUtil.isNotEmpty(enable), "enable", enable)
|
||||
.eq(StrUtil.isNotEmpty(corpid), "corpid", corpid)
|
||||
.between(startTime != null && endTime != null, "create_time", startTime, endTime);
|
||||
|
||||
this.timeRangeColumn = "create_time";
|
||||
|
|
|
@ -55,4 +55,14 @@ CREATE TABLE `approval_goods` (
|
|||
KEY `idx_external_goods_id` (`external_goods_id`),
|
||||
KEY `idx_corpid` (`corpid`),
|
||||
KEY `idx_update_time` (`update_time`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=87 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='申请领用商品信息表';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=87 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='申请领用商品信息表';
|
||||
|
||||
ALTER TABLE `shop`
|
||||
ADD COLUMN `corpid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '企业微信id'
|
||||
AFTER `shop_name`;
|
||||
|
||||
ALTER TABLE `shop_order`
|
||||
ADD COLUMN `corpid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '企业微信id';
|
||||
|
||||
ALTER TABLE `shop_order_goods`
|
||||
ADD COLUMN `corpid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '企业微信id';
|
Loading…
Reference in New Issue