Skip to content

O
order-group
Commit 749d4ab3 by zhiheng.zhang
Options

支付金额小于0判断

parent bbba45f6
Showing with 70 additions and 54 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -1922,59 +1922,61 @@ public class OrderAdapter { ...@@ -1922,59 +1922,61 @@ public class OrderAdapter {
} }
} }
} }
if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) { if (! OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) {
orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode()); if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatusDesc("已退款"); orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~"); orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~"); orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
} orderViewStatusDto.setButtonContactPartner(true);
if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("正在退款中，请稍等");
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatus.REFUSE.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
}
if (PayStatus.HAVE_REFUND.getCode().equals(orderBean.getPayStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
// TODO: 2019/9/9 获取商户退款配置
if (refundBean != null && refundBean.getStatus() != null) {
orderViewStatusDto.setButtonRefund(false);
orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
} else {
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
} }
orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE.getCode()); if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
orderViewStatusDto.setOrderStatusDesc("已完成"); orderViewStatusDto.setOrderStatus(OrderStatus.CALCEL.getCode());
orderViewStatusDto.setOrderStatusDescText("订单已完成，记得来评价一下哦~"); orderViewStatusDto.setOrderStatusDesc("退款中");
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setButtonEvaluate(true); orderViewStatusDto.setRefundStatusText("正在退款中，请稍等");
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { orderViewStatusDto.setButtonContactPartner(true);
if (orderBean.getDeliverStatus() == null) { }
orderViewStatusDto.setRiderName("商家自配送"); if (OrderStatus.REFUSE.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setRiderText("配送员已配送完"); orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto()); orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
}
if (PayStatus.HAVE_REFUND.getCode().equals(orderBean.getPayStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.REFUSE.getCode());
orderViewStatusDto.setOrderStatusDesc("已退款");
orderViewStatusDto.setOrderStatusDescText("感谢您对我们的信任，期待再次光临~");
orderViewStatusDto.setRefundStatusText("订单金额已原路退还，请及时查看~");
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
// TODO: 2019/9/9 获取商户退款配置
if (refundBean != null && refundBean.getStatus() != null) {
orderViewStatusDto.setButtonRefund(false);
orderViewStatusDto.setRefundStatusText("商家会处理退款申请，请稍后");
} else { } else {
//TODO 如果是第三方配送，设置骑手信息 orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "商家自配送" : orderBean.getRiderName()); }
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "配送员已配送完" : "配送员"); orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE.getCode());
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto()); orderViewStatusDto.setOrderStatusDesc("已完成");
orderViewStatusDto.setOrderStatusDescText("订单已完成，记得来评价一下哦~");
orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setButtonEvaluate(true);
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("配送员已配送完");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
} else {
//TODO 如果是第三方配送，设置骑手信息
orderViewStatusDto.setRiderName(StringUtils.isEmpty(orderBean.getRiderName()) ? "商家自配送" : orderBean.getRiderName());
orderViewStatusDto.setRiderText(StringUtils.isEmpty(orderBean.getRiderName()) ? "配送员已配送完" : "配送员");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
}
} }
} }
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
...@@ -1032,9 +1032,9 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -1032,9 +1032,9 @@ public class MallOrderServiceImpl implements MallOrderService {
request.setOrderState(NewOrderStatus.COMPLETE.getIndex()); request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
request.setOperator(baseQueryOrderRequest.getOperator()); request.setOperator(baseQueryOrderRequest.getOperator());
request.setRemark("已完成"); request.setRemark("已完成");
com.freemud.application.sdk.api.ordercenter.response.BaseResponse orderCenterResponse = orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo()); orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
result.setCode(orderCenterResponse.getCode()); orderSdkService.completeBookingTask(request, baseQueryOrderRequest.getTrackingNo());
result.setMessage(orderCenterResponse.getMessage()); return ResponseUtil.success();
}catch (Exception e){ }catch (Exception e){
result.setCode(ResponseResult.ORDER_RECEIVE_ERR.getCode()); result.setCode(ResponseResult.ORDER_RECEIVE_ERR.getCode());
result.setMessage(ResponseResult.ORDER_RECEIVE_ERR.getMessage()); result.setMessage(ResponseResult.ORDER_RECEIVE_ERR.getMessage());
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
...@@ -249,5 +249,9 @@ public class InterfaceAddressConstant { ...@@ -249,5 +249,9 @@ public class InterfaceAddressConstant {
* 查询当前门店24小时内的订单 * 查询当前门店24小时内的订单
*/ */
public static final String QUERY_LINEUP_ORDER = "order/v2/queryLineUpOrder"; public static final String QUERY_LINEUP_ORDER = "order/v2/queryLineUpOrder";
/**
* 手动完成进行中的流程
*/
public static final String COMPLETE_BOOKING_TASK = "/task/v2/completeBookingTask";
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
...@@ -962,4 +962,14 @@ public class OrderSdkService { ...@@ -962,4 +962,14 @@ public class OrderSdkService {
return responseHandle(responseDTO); return responseHandle(responseDTO);
} }
/**
* 手动完成进行中的流程
*/
public BaseResponse completeBookingTask(OrderChangeStateReq request, String trackingNo) {
OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, InterfaceAddressConstant.COMPLETE_BOOKING_TASK,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
});
return responseHandle(responseDTO);
}
} }
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