Skip to content

O
order-group
Commit cbd88e83 by hanghang.wang
Options

订单状态增加英文

parent 071a6b22
Showing with 107 additions and 36 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -1227,6 +1227,7 @@ public class OrderAdapter {
ArrayList<QueryOrderResponseVo.OrderStatusFlow> orderChangeTime = getOrderTimeDesc(ordersBean);
responseVo.setOrderStatusFlows(orderChangeTime);
responseVo.setOrderStatusDesc(orderViewStatusDto.getOrderStatusDesc());
responseVo.setOrderStatusDescEn(orderViewStatusDto.getOrderStatusDescEn());
responseVo.setOrderStatusDescText(orderViewStatusDto.getOrderStatusDescText());
if (CollectionUtils.isNotEmpty(ordersBean.getRefundList())) {
responseVo.setRefundTips(orderViewStatusDto.getRefundStatusText());
......@@ -1610,21 +1611,26 @@ public class OrderAdapter {
orderViewStatusDto.setRiderName("");
orderViewStatusDto.setRiderText("");
orderViewStatusDto.setRiderPhoto("");
/**本次订单状态中英文翻译不考虑美业的业务**/
if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OrderType.EAT_IN.getCode().equals(orderBean.getType())) {
if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("待支付");
orderViewStatusDto.setOrderStatusDesc(OrderStatus.WAIT_PAY.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.WAIT_PAY.getDescEn());
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("已取消");
orderViewStatusDto.setOrderStatusDesc(OrderStatus.CALCEL.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.CALCEL.getDescEn());
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDesc(conventCreateOrderString(orderBean));
// orderViewStatusDto.setOrderStatusDesc(OrderStatus.TAKE_ORDER.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.TAKE_ORDER.getDescEn());
orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
......@@ -1649,6 +1655,8 @@ public class OrderAdapter {
if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.RECEIPT.getCode());
// orderViewStatusDto.setOrderStatusDesc(OrderStatus.RECEIPT.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.RECEIPT.getDescEn());
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
......@@ -1675,6 +1683,8 @@ public class OrderAdapter {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE_MAKE.getCode());
orderViewStatusDto.setOrderStatusDesc("待取餐");
//制作完成 中文返回待取餐 英文反回制作完成
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.COMPLETE_MAKE.getDescEn());
orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
orderViewStatusDto.setOrderStatusDescText("凭此页到店领取哦~");
......@@ -1693,31 +1703,26 @@ public class OrderAdapter {
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("待支付");
orderViewStatusDto.setOrderStatusDesc(OrderStatus.WAIT_PAY.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.WAIT_PAY.getDescEn());
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("正在为您匹配配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
} else {
orderViewStatusDto.setRiderName("处理中");
}
orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.TAKE_ORDER.getDescEn());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
orderViewStatusDto.setRiderName("处理中");
orderViewStatusDto.setRiderText("正在为您匹配配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
}
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
}
......@@ -1747,6 +1752,7 @@ public class OrderAdapter {
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean,wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
orderViewStatusDto.setOrderStatusDesc(OrderStatus.RECEIPT.getDescEn());
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
......@@ -1774,6 +1780,7 @@ public class OrderAdapter {
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonContactPartner(true);
}
orderViewStatusDto.setOrderStatusDesc(OrderStatus.COMPLETE_MAKE.getDescEn());
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
......@@ -1787,7 +1794,8 @@ public class OrderAdapter {
if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVER_OTHER.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("配送中");
orderViewStatusDto.setOrderStatusDesc(OrderStatus.DISTRIBUTION.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatus.DISTRIBUTION.getDescEn());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setRiderName("商家自配送");
......@@ -1800,6 +1808,7 @@ public class OrderAdapter {
|| DeliverStatus.DELIVERYCOLLECT.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderViewStatus.RIDERDELIVERY.getCode());
orderViewStatusDto.setOrderStatusDesc("骑手取餐中");
orderViewStatusDto.setOrderStatusDescEn("rider delivery");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonRefund(true);
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1810,6 +1819,7 @@ public class OrderAdapter {
|| DeliverStatus.DELIVERYCANCEL.getCode().equals(orderBean.getDeliverStatus())){
orderViewStatusDto.setOrderStatus(OrderViewStatus.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("配送中");
orderViewStatusDto.setOrderStatusDescEn("deliver");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactRider(true);
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1820,9 +1830,11 @@ public class OrderAdapter {
}
}
}
/**由于下方部分状态描述未找到枚举类，直接赋值英文字段**/
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescEn("refunded");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1830,6 +1842,7 @@ public class OrderAdapter {
if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescEn("A refund of");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("正在退款中，请稍等");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1837,13 +1850,15 @@ public class OrderAdapter {
if (OrderStatus.REFUSE.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescEn("already refund");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
}
if (PayStatus.HAVE_REFUND.getCode().equals(orderBean.getPayStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDesc(PayStatus.HAVE_REFUND.getDesc());
orderViewStatusDto.setOrderStatusDescEn(PayStatus.HAVE_REFUND.getDescEn());
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -1860,6 +1875,7 @@ public class OrderAdapter {
}
orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE.getCode());
orderViewStatusDto.setOrderStatusDesc("已完成");
orderViewStatusDto.setOrderStatusDesc(OrderStatus.COMPLETE.getDescEn());
orderViewStatusDto.setOrderStatusDescText("订单已完成，记得来评价一下哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setButtonEvaluate(true);
......@@ -2381,6 +2397,7 @@ public class OrderAdapter {
public void setApplyRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
orderViewStatusDto.setOrderStatus(orderBean.getStatus());
orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescEn("A refund of");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -2390,6 +2407,7 @@ public class OrderAdapter {
public void setAgreeRefundDesc(OrderViewStatusDto orderViewStatusDto, QueryOrdersResponse.DataBean.OrderBean orderBean) {
orderViewStatusDto.setOrderStatus(orderBean.getStatus());
orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescEn("A refund of");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
orderViewStatusDto.setButtonContactPartner(true);
......@@ -3143,7 +3161,9 @@ public class OrderAdapter {
Long warePrice = tableWareProducts.stream().mapToLong(var -> var.getFinalPrice()).sum();
ProductVo wareProductVo = new ProductVo();
wareProductVo.setName("餐具");
wareProductVo.setForeignName("tableware");
wareProductVo.setSpuName("餐具");
wareProductVo.setSpuForeignName("tableware");
wareProductVo.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode());
wareProductVo.setQty(tableWareProducts.get(0).getQty());
wareProductVo.setSaleTotalAmount(warePrice * tableWareProducts.get(0).getQty());
......@@ -3162,6 +3182,7 @@ public class OrderAdapter {
previewOrderInfoVo.setDiscountTotalAmount(queryOrderResponseVo.getDiscountTotalAmount());
previewOrderInfoVo.setOrderStatus(queryOrderResponseVo.getOrderStatus());
previewOrderInfoVo.setOrderStatusDesc(queryOrderResponseVo.getOrderStatusDesc());
previewOrderInfoVo.setOrderStatusDescEn(queryOrderResponseVo.getOrderStatusDescEn());
previewOrderInfoVo.setPayStatus(queryOrderResponseVo.getPayStatus());
previewOrderInfoVo.setPayStatusDesc(queryOrderResponseVo.getPayStatusDesc());
previewOrderInfoVo.setShopName(queryOrderResponseVo.getShopName());
......
order-application-service/src/main/java/cn/freemud/entities/dto/OrderViewStatusDto.java
......@@ -26,6 +26,10 @@ public class OrderViewStatusDto {
*/
private String orderStatusDesc;
/**
* 订单类型描述
*/
private String orderStatusDescEn;
/**
* 订单类型描述文案
*/
private String orderStatusDescText;
......
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
......@@ -147,6 +147,10 @@ public class QueryOrderResponseVo {
*/
private String orderStatusDesc;
/**
* 订单状态描述
*/
private String orderStatusDescEn;
/**
* 订单状态显示的对应描述
*/
private String orderStatusDescText;
......@@ -196,6 +200,10 @@ public class QueryOrderResponseVo {
*/
private String payStatusDesc;
/**
* 支付状态描述英文
*/
// private String payStatusDescEn;
/**
* 支付时间
*/
private String payCreateTime;
......
order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java
......@@ -65,6 +65,8 @@ public class PreviewOrderInfoVo {
*/
private String orderStatusDesc;
private String orderStatusDescEn;
/**
* 支付状态 enum PayStatus
*/
......@@ -73,6 +75,10 @@ public class PreviewOrderInfoVo {
* 支付状态描述
*/
private String payStatusDesc;
/**
* 支付状态描述英文
*/
private String payStatusDescEn;
/**
* 订单修改版本号
......
order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
......@@ -14,21 +14,23 @@ package cn.freemud.enums;
public enum OrderStatus {
TAKE_ORDER(1, "下单"),
WAIT_PAY(2, "待支付"),
RECEIPT(3, "接单"),
DISTRIBUTION(4, "配送中"),
COMPLETE(5, "完成"),
CALCEL(6, "取消"),
REFUSE(7,"拒单"),
COMPLETE_MAKE(31, "制作完成");
TAKE_ORDER(1, "下单","take order"),
WAIT_PAY(2, "待支付","wait pay"),
RECEIPT(3, "接单","receipt order"),
DISTRIBUTION(4, "配送中","deliver"),
COMPLETE(5, "完成","complete"),
CALCEL(6, "取消","cancel"),
REFUSE(7,"拒单","refuse order"),
COMPLETE_MAKE(31, "制作完成","complete make");
private Integer code;
private String desc;
private String descEn;
OrderStatus(Integer code, String desc) {
OrderStatus(Integer code, String desc,String descEn) {
this.code = code;
this.desc = desc;
this.descEn = descEn;
}
public static Integer[] getAllCodes() {
......@@ -53,6 +55,14 @@ public enum OrderStatus {
return null;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
public Integer getCode() {
return code;
}
......
order-application-service/src/main/java/cn/freemud/enums/PayStatus.java
......@@ -14,19 +14,21 @@ package cn.freemud.enums;
public enum PayStatus {
NOT_PAY(1, "未支付"),
HAVE_PAID(2, "已支付"),
HAVE_REFUND(3, "已退款"),
HAVE_PART_REFUND(4, "已经部分退款"),
COMPLETE(5, "完成");
NOT_PAY(1, "未支付","not pay"),
HAVE_PAID(2, "已支付","have paid"),
HAVE_REFUND(3, "已退款","have refund"),
HAVE_PART_REFUND(4, "已经部分退款","have part refund"),
COMPLETE(5, "完成","complete");
private Integer code;
private String desc;
private String descEn;
PayStatus(Integer code, String desc) {
PayStatus(Integer code, String desc,String descEn) {
this.code = code;
this.desc = desc;
this.descEn = descEn;
}
public static PayStatus getByCode(Integer code) {
......@@ -56,4 +58,12 @@ public enum PayStatus {
public void setDesc(String desc) {
this.desc = desc;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
}
order-application-service/src/main/java/cn/freemud/enums/RefundStatus.java
......@@ -14,19 +14,23 @@ package cn.freemud.enums;
public enum RefundStatus {
APPLY_REFUND(1, "申请退款"),
AGREE_REFUND(2, "同意退款"),
ALREADY_REFUND(3, "已退货"),
COMPLETE_REFUND(4, "退款完成"),
REFUSE_REFUND(5, "拒绝退款");
APPLY_REFUND(1, "申请退款","apply for a refund"),
AGREE_REFUND(2, "同意退款","Agree to refund"),
ALREADY_REFUND(3, "已退货","Returned"),
COMPLETE_REFUND(4, "退款完成","Refund complete"),
REFUSE_REFUND(5, "拒绝退款","Refuse refund");
/**编号**/
private Integer code;
/**中文**/
private String desc;
/**英文**/
private String descEn;
RefundStatus(Integer code, String desc) {
RefundStatus(Integer code, String desc, String descEn) {
this.code = code;
this.desc = desc;
this.descEn = descEn;
}
public static RefundStatus getByCode(Integer code) {
......@@ -53,4 +57,12 @@ public enum RefundStatus {
public void setDesc(String desc) {
this.desc = desc;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment