cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

统一订单状态

Browse Source
This commit is contained in:
LIONCITYS\lioncity
2020-11-27 23:37:27 +08:00
parent 104400f5cd
commit b9872d4db8
4 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxOrderNowOrderStatusDto.java
View File

@ -16,35 +16,21 @@ import java.util.Date;
*/
@Data
public class YxOrderNowOrderStatusDto implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8"
)
private Date cache_key_create_order;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8"
)
private Date pay_success;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8"
)
private Date delivery_goods;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8"
)
private Date order_verific;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8"
)
private Date user_take_delivery;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8"
)
private Date check_order_over;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date cacheKeyCreateOrder;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date paySuccess;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date deliveryGoods;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date orderVerific;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date userTakeDelivery;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date checkOrderOver;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date applyRefund;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date refundOrderSuccess;
private int size;
}

9
yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -687,11 +687,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
price.doubleValue(),
NumberUtil.add(price,userQueryVo.getNowMoney()).doubleValue(),
"订单退款到余额"+price+"元",orderQueryVo.getId().toString());
orderStatusService.create(orderQueryVo.getId(),"order_edit","退款给用户："+price +"元");
}
orderStatusService.create(orderQueryVo.getId(),OrderLogEnum.REFUND_ORDER_SUCCESS.getValue(),"退款给用户："+price +"元");
TemplateBean templateBean = TemplateBean.builder()
.orderId(orderQueryVo.getOrderId())
.price(orderQueryVo.getPayPrice().toString())
@ -750,7 +749,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
yxStoreOrderMapper.updateById(storeOrder);
//增加状态
orderStatusService.create(orderQueryVo.getId(),"delivery_goods",
orderStatusService.create(orderQueryVo.getId(),OrderLogEnum.DELIVERY_GOODS.getValue(),
"已发货 快递公司："+expressQueryVo.getName()+"快递单号：" +deliveryId);
//模板消息发布事件
@ -810,7 +809,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
yxStoreOrderMapper.updateById(storeOrder);
//增加状态
orderStatusService.create(storeOrder.getId(),"order_edit","修改实际支付金额");
orderStatusService.create(storeOrder.getId(),OrderLogEnum.ORDER_EDIT.getValue(),"修改实际支付金额");
}