Skip to content

O
order-group
Commit f9564940 by ping.wu
Options

微商城订单类型从外卖变到店订单状态描述同步修改

parent d6e73f92
Showing with 170 additions and 172 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -1491,197 +1491,144 @@ public class OrderAdapter { ...@@ -1491,197 +1491,144 @@ public class OrderAdapter {
} }
} }
if (OrderTypeV1.TAKE_OUT.getCode().equals(orderBean.getOrderType())) { if (OrderTypeV1.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if (BizTypeEnum.MALL.getBizType() ==orderBean.getBizType()) { if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) {
if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) { orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode()); orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.WAIT_PAY.getDesc());
orderViewStatusDto.setOrderStatusDesc("待支付"); orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.WAIT_PAY.getDescEn());
orderViewStatusDto.setOrderStatusDescText(""); orderViewStatusDto.setOrderStatusDescText("");
} }
if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) { if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode()); if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatusDesc("已支付"); if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setOrderStatusDescText(""); orderViewStatusDto.setRiderName("商家自配送");
} } else {
if (OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())) { orderViewStatusDto.setRiderName("处理中");
orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode()); }
orderViewStatusDto.setOrderStatusDesc("待发货"); orderViewStatusDto.setOrderStatus(OrderStatusV1.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品即将发货哦~"); orderViewStatusDto.setOrderStatusDesc(conventCreateOrderString(orderBean));
orderViewStatusDto.setRiderName("商品即将发货"); orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.TAKE_ORDER.getDescEn());
orderViewStatusDto.setRiderText("正在为您商品打包"); orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.DISTRIBUTION.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("已发货");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品已经发货哦~");
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("商品运输中");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId)); orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setRiderText("正在为您匹配配送员");
}
if (OrderStatusV1.COMPLETE.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE.getCode());
orderViewStatusDto.setOrderStatusDesc("已完成");
orderViewStatusDto.setOrderStatusDescText("订单已经完成，记得来评价一下哦~");
orderViewStatusDto.setRiderName("订单已完成");
orderViewStatusDto.setRiderText("订单已经完成，记得来评价一下哦");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto()); orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
} }
if (OrderStatusV1.CANCEL.getV2Code().equals(orderBean.getStatusV2())) { if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.CANCEL.getCode()); setApplyRefundDesc(orderViewStatusDto, orderBean);
orderViewStatusDto.setOrderStatusDesc("已取消");
orderViewStatusDto.setOrderStatusDescText("订单已经取消~");
orderViewStatusDto.setRiderName("订单已取消");
orderViewStatusDto.setRiderText("订单已经取消");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
} }
} else { if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) { setAgreeRefundDesc(orderViewStatusDto, orderBean);
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode()); }
orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.WAIT_PAY.getDesc()); //拒绝退款
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.WAIT_PAY.getDescEn()); if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatusDescText(""); orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
} }
if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) { }
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) { if (OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())) {
if (orderBean.getDeliverStatus() == null) { if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRiderName("商家自配送"); if (orderBean.getDeliverStatus() == null) {
} else { orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode());
orderViewStatusDto.setRiderName("处理中"); orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
}
orderViewStatusDto.setOrderStatus(OrderStatusV1.TAKE_ORDER.getCode());
orderViewStatusDto.setOrderStatusDesc(conventCreateOrderString(orderBean));
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.TAKE_ORDER.getDescEn());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~"); orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setRiderText("正在为您匹配配送员"); orderViewStatusDto.setRiderText("正在为您匹配配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto()); orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
} else {
orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "处理中" : orderBean.getRiderName());
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "正在为您匹配配送员" : "配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
} }
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) { //制作中
setApplyRefundDesc(orderViewStatusDto, orderBean); orderViewStatusDto.setOrderStatusDescEn("In production");
}
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
} }
if (OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())) { if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) { setApplyRefundDesc(orderViewStatusDto, orderBean);
if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("正在为您匹配配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
} else {
orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc(conventProduceString(orderBean));
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "处理中" : orderBean.getRiderName());
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "正在为您匹配配送员" : "配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
//制作中
orderViewStatusDto.setOrderStatusDescEn("In production");
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
}
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
} }
if (OrderStatusV1.COMPLETE_MAKE.getV2Code().equals(orderBean.getStatusV2())) { if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) { setAgreeRefundDesc(orderViewStatusDto, orderBean);
if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE_MAKE.getCode());
orderViewStatusDto.setOrderStatusDesc("配送中");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("配送员已送出");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonContactPartner(true);
} else {
orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE_MAKE.getCode());
orderViewStatusDto.setOrderStatusDesc("配送中");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "处理中" : orderBean.getRiderName());
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "正在为您匹配配送员" : "配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonContactPartner(true);
}
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.DISTRIBUTION.getDescEn());
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
}
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
} }
//TODO 判断配送中的逻辑 如果是有第三方配送，要查询第三方配送信息，显示骑手信息 如果有骑手信息 显示 联系骑手 //拒绝退款
if (OrderStatusV1.DISTRIBUTION.getV2Code().equals(orderBean.getStatusV2())) { if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus()) orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
|| DeliverStatus.DELIVER_OTHER.getCode().equals(orderBean.getDeliverStatus())) { }
orderViewStatusDto.setOrderStatus(OrderStatusV1.DISTRIBUTION.getCode()); }
orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.DISTRIBUTION.getDesc()); if (OrderStatusV1.COMPLETE_MAKE.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.DISTRIBUTION.getDescEn()); if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE_MAKE.getCode());
orderViewStatusDto.setOrderStatusDesc("配送中");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~"); orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setRiderName("商家自配送"); orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("配送员已送出"); orderViewStatusDto.setRiderText("配送员已送出");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto()); orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonContactPartner(true);
} else { } else {
if (DeliverStatus.WATINGORDER.getCode().equals(orderBean.getDeliverStatus()) || DeliverStatus.SYSTEMGETORDER.getCode().equals(orderBean.getDeliverStatus()) orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE_MAKE.getCode());
|| DeliverStatus.ALLOTRIDER.getCode().equals(orderBean.getDeliverStatus()) orderViewStatusDto.setOrderStatusDesc("配送中");
|| DeliverStatus.RIDERARRIVESTORE.getCode().equals(orderBean.getDeliverStatus()) orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
|| DeliverStatus.DELIVERYCOLLECT.getCode().equals(orderBean.getDeliverStatus())) { orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "处理中" : orderBean.getRiderName());
orderViewStatusDto.setOrderStatus(OrderViewStatus.RIDERDELIVERY.getCode()); orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "正在为您匹配配送员" : "配送员");
orderViewStatusDto.setOrderStatusDesc("骑手取餐中");
orderViewStatusDto.setOrderStatusDescEn("Rider goes to collect goods");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonRefund(true);
orderViewStatusDto.setButtonContactPartner(true);
}
if (DeliverStatus.RIDERDELIVERY.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.RIDERSTARTDELIVERY.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVERYERROR.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVERYCANCEL.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderViewStatus.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.DISTRIBUTION.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.DISTRIBUTION.getDescEn());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactRider(true);
orderViewStatusDto.setButtonContactPartner(true);
}
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "商家自配送" : orderBean.getRiderName());
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "配送员已送出" : "配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto()); orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonContactPartner(true);
} }
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.DISTRIBUTION.getDescEn());
}
if (refundBean != null && RefundStatus.APPLY_REFUND.getCode().equals(refundBean.getStatus())) {
setApplyRefundDesc(orderViewStatusDto, orderBean);
}
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
setAgreeRefundDesc(orderViewStatusDto, orderBean);
}
//拒绝退款
if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
}
}
//TODO 判断配送中的逻辑 如果是有第三方配送，要查询第三方配送信息，显示骑手信息 如果有骑手信息 显示 联系骑手
if (OrderStatusV1.DISTRIBUTION.getV2Code().equals(orderBean.getStatusV2())) {
if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVER_OTHER.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.DISTRIBUTION.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.DISTRIBUTION.getDescEn());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("配送员已送出");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
} else {
if (DeliverStatus.WATINGORDER.getCode().equals(orderBean.getDeliverStatus()) || DeliverStatus.SYSTEMGETORDER.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.ALLOTRIDER.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.RIDERARRIVESTORE.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVERYCOLLECT.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderViewStatus.RIDERDELIVERY.getCode());
orderViewStatusDto.setOrderStatusDesc("骑手取餐中");
orderViewStatusDto.setOrderStatusDescEn("Rider goes to collect goods");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonRefund(true);
orderViewStatusDto.setButtonContactPartner(true);
}
if (DeliverStatus.RIDERDELIVERY.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.RIDERSTARTDELIVERY.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVERYERROR.getCode().equals(orderBean.getDeliverStatus())
|| DeliverStatus.DELIVERYCANCEL.getCode().equals(orderBean.getDeliverStatus())) {
orderViewStatusDto.setOrderStatus(OrderViewStatus.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.DISTRIBUTION.getDesc());
orderViewStatusDto.setOrderStatusDescEn(OrderStatusV1.DISTRIBUTION.getDescEn());
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");
orderViewStatusDto.setButtonContactRider(true);
orderViewStatusDto.setButtonContactPartner(true);
}
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "商家自配送" : orderBean.getRiderName());
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "配送员已送出" : "配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
} }
} }
} }
...@@ -1745,6 +1692,57 @@ public class OrderAdapter { ...@@ -1745,6 +1692,57 @@ public class OrderAdapter {
} }
} }
} }
} else {//微商城订单
if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("待支付");
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("已支付");
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc("待发货");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品即将发货哦~");
orderViewStatusDto.setRiderName("商品即将发货");
orderViewStatusDto.setRiderText("正在为您商品打包");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.DISTRIBUTION.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("已发货");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品已经发货哦~");
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("商品运输中");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.COMPLETE.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE.getCode());
orderViewStatusDto.setOrderStatusDesc("已完成");
orderViewStatusDto.setOrderStatusDescText("订单已经完成，记得来评价一下哦~");
orderViewStatusDto.setRiderName("订单已完成");
orderViewStatusDto.setRiderText("订单已经完成，记得来评价一下哦");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.CANCEL.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.CANCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("已取消");
orderViewStatusDto.setOrderStatusDescText("订单已经取消~");
orderViewStatusDto.setRiderName("订单已取消");
orderViewStatusDto.setRiderText("订单已经取消");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
} }
return orderViewStatusDto; return orderViewStatusDto;
} }
......
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