feat(订单): 添加手机号码、内部用户标识和企业微信用户ID字段
为了支持更多用户信息的存储和识别,新增了手机号码、内部用户标识和企业微信用户ID字段。这些字段将用于订单管理和用户身份验证。
This commit is contained in:
parent
17f5807af6
commit
14b32f6d07
|
@ -128,6 +128,9 @@ public class OrderApplicationService {
|
||||||
orderModel.generateOrderNumber();
|
orderModel.generateOrderNumber();
|
||||||
orderModel.setTotalAmount(BigDecimal.valueOf(0));
|
orderModel.setTotalAmount(BigDecimal.valueOf(0));
|
||||||
orderModel.setPaymentMethod(command.getPaymentType());
|
orderModel.setPaymentMethod(command.getPaymentType());
|
||||||
|
orderModel.setMobile(command.getMobile());
|
||||||
|
orderModel.setIsInternal(command.getIsInternal());
|
||||||
|
orderModel.setUserid(command.getQyUserid());
|
||||||
orderModel.insert();
|
orderModel.insert();
|
||||||
|
|
||||||
processOrderGoods(orderModel, goodsList);
|
processOrderGoods(orderModel, goodsList);
|
||||||
|
|
|
@ -3,15 +3,34 @@ package com.agileboot.domain.shop.order.command;
|
||||||
import com.agileboot.domain.shop.order.db.ShopOrderEntity;
|
import com.agileboot.domain.shop.order.db.ShopOrderEntity;
|
||||||
import com.agileboot.domain.shop.order.db.ShopOrderGoodsEntity;
|
import com.agileboot.domain.shop.order.db.ShopOrderGoodsEntity;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class SubmitOrderCommand {
|
public class SubmitOrderCommand {
|
||||||
|
@ApiModelProperty("微信用户唯一标识")
|
||||||
private String openid;
|
private String openid;
|
||||||
|
@ApiModelProperty("系统用户ID")
|
||||||
private String userid;
|
private String userid;
|
||||||
|
@ApiModelProperty("企业ID")
|
||||||
private String corpid;
|
private String corpid;
|
||||||
|
@ApiModelProperty("订单主体信息")
|
||||||
private ShopOrderEntity order;
|
private ShopOrderEntity order;
|
||||||
// 支付类型'wechat' | 'balance'
|
|
||||||
|
@ApiModelProperty("支付类型 wechat:微信 balance:余额")
|
||||||
private String paymentType;
|
private String paymentType;
|
||||||
|
|
||||||
|
@ApiModelProperty("订单商品明细列表")
|
||||||
private List<ShopOrderGoodsEntity> goodsList;
|
private List<ShopOrderGoodsEntity> goodsList;
|
||||||
|
|
||||||
|
@ApiModelProperty("联系电话")
|
||||||
|
private String mobile;
|
||||||
|
|
||||||
|
@ApiModelProperty("企业微信用户ID或汇邦云用户ID")
|
||||||
|
private String qyUserid;
|
||||||
|
|
||||||
|
@ApiModelProperty("是否内部订单 0否 1汇邦云用户 2企业微信用户")
|
||||||
|
private Integer isInternal;
|
||||||
}
|
}
|
|
@ -45,6 +45,18 @@ public class ShopOrderEntity extends BaseEntity<ShopOrderEntity> {
|
||||||
@TableField("trade_id")
|
@TableField("trade_id")
|
||||||
private String tradeId;
|
private String tradeId;
|
||||||
|
|
||||||
|
@ApiModelProperty("手机号码")
|
||||||
|
@TableField("mobile")
|
||||||
|
private String mobile;
|
||||||
|
|
||||||
|
@ApiModelProperty("企业微信用户ID或汇邦云用户ID")
|
||||||
|
@TableField("userid")
|
||||||
|
private String userid;
|
||||||
|
|
||||||
|
@ApiModelProperty("是否内部用户(0否 1汇邦云用户 2企业微信用户)")
|
||||||
|
@TableField("is_internal")
|
||||||
|
private Integer isInternal;
|
||||||
|
|
||||||
@ApiModelProperty("业务系统订单ID(对接外部系统)")
|
@ApiModelProperty("业务系统订单ID(对接外部系统)")
|
||||||
@TableField("biz_order_id")
|
@TableField("biz_order_id")
|
||||||
private String bizOrderId;
|
private String bizOrderId;
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
package com.agileboot.domain.shop.order.dto;
|
package com.agileboot.domain.shop.order.dto;
|
||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
|
||||||
import com.agileboot.domain.shop.order.db.ShopOrderEntity;
|
import com.agileboot.domain.shop.order.db.ShopOrderEntity;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
|
@ApiModel(value = "ShopOrderDTO对象", description = "商品订单DTO")
|
||||||
public class ShopOrderDTO {
|
public class ShopOrderDTO {
|
||||||
|
|
||||||
public ShopOrderDTO(ShopOrderEntity entity) {
|
public ShopOrderDTO(ShopOrderEntity entity) {
|
||||||
|
@ -23,14 +27,29 @@ public class ShopOrderDTO {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiModelProperty("订单唯一ID")
|
||||||
private Long orderId;
|
private Long orderId;
|
||||||
|
@ApiModelProperty("ucid")
|
||||||
private String ucid;
|
private String ucid;
|
||||||
|
@ApiModelProperty("openid")
|
||||||
private String openid;
|
private String openid;
|
||||||
|
@ApiModelProperty("支付网关交易id")
|
||||||
private String tradeId;
|
private String tradeId;
|
||||||
|
@ApiModelProperty("订单总金额")
|
||||||
private BigDecimal totalAmount;
|
private BigDecimal totalAmount;
|
||||||
|
@ApiModelProperty("订单状态(1待付款 2已付款 3已发货 4已完成 5已取消)")
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
@ApiModelProperty("支付状态(1未支付 2已支付 3退款中 4已退款)")
|
||||||
private Integer payStatus;
|
private Integer payStatus;
|
||||||
|
@ApiModelProperty("支付方式")
|
||||||
private String paymentMethod;
|
private String paymentMethod;
|
||||||
|
@ApiModelProperty("支付时间")
|
||||||
private Date payTime;
|
private Date payTime;
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
@ApiModelProperty("手机号码")
|
||||||
|
private String mobile;
|
||||||
|
@ApiModelProperty("是否内部用户(0否 1是)")
|
||||||
|
private Integer isInternal;
|
||||||
|
@ApiModelProperty("业务系统订单ID(对接外部系统)")
|
||||||
|
private String bizOrderId;
|
||||||
}
|
}
|
|
@ -58,4 +58,11 @@ ADD COLUMN cover_img VARCHAR(512) COMMENT '封面图URL';
|
||||||
UPDATE shop_order_goods sog
|
UPDATE shop_order_goods sog
|
||||||
INNER JOIN shop_goods sg ON sog.goods_id = sg.goods_id
|
INNER JOIN shop_goods sg ON sog.goods_id = sg.goods_id
|
||||||
SET sog.goods_name = sg.goods_name,
|
SET sog.goods_name = sg.goods_name,
|
||||||
sog.cover_img = sg.cover_img;
|
sog.cover_img = sg.cover_img;
|
||||||
|
|
||||||
|
ALTER TABLE `shop_order`
|
||||||
|
ADD COLUMN `mobile` varchar(30) DEFAULT NULL COMMENT '手机号码' AFTER `trade_id`,
|
||||||
|
ADD COLUMN `is_internal` TINYINT(1) DEFAULT 0 COMMENT '是否内部用户(0否 1是)';
|
||||||
|
|
||||||
|
ALTER TABLE `shop_order`
|
||||||
|
ADD COLUMN `userid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '企业微信用户ID或汇邦云用户ID' AFTER `mobile`;
|
||||||
|
|
Loading…
Reference in New Issue