springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderPageVO.java
@@ -70,6 +70,10 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date deliveryTime; @ApiModelProperty(value = "收货时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date receivingTime; @ApiModelProperty(value = "订单下商品信息") private List<ComShopOrderGoodsVO> orderGoodsVOList; springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
@@ -139,6 +139,11 @@ private Date updateAt; /** * 收货时间 */ private Date receivingTime; /** * 订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消) */ public interface status{ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -513,6 +513,7 @@ } //订单确认收货 shopOrderDO.setStatus(ComShopOrderDO.status.ywc); shopOrderDO.setReceivingTime(new Date()); if(this.baseMapper.updateById(shopOrderDO) > 0){ //添加订单操作记录 ComShopOrderOperateDO orderOperateDO = new ComShopOrderOperateDO();