Commit 771c6879 by ping.wu

订单下单、支付成功,申请退款保存操作人

parent 6609e09d
......@@ -495,6 +495,7 @@ public class OrderAdapter {
createOrderDto.setAddInfo(deliveryTypeInfo);
createOrderDto.setAmount(0L);
createOrderDto.setBarCounter(createOrderVo.getTableNumber());
createOrderDto.setOperator(createOrderVo.getUserName());
return createOrderDto;
}
......
......@@ -339,6 +339,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setStoreId(storeId);
var1.setOrderId(orderBean.getOid());
var1.setOrderType(orderBean.getType());
var1.setOperator(orderBean.getUserName());
// 订单支付成功
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
......@@ -594,6 +595,7 @@ public class OrderServiceImpl implements Orderservice {
request.setOrderId(requestVo.getTransId());
request.setAfterSalesCode(afterSalesCode);
request.setRefundSerialNo(requestVo.getRefundId());
request.setOperator("admin");
request.setTrackingNo(trackingNo);
BaseOrderResponse response = orderCenterSdkService.orderRefundComplete(request);
if (response == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getErrcode())) {
......@@ -1135,6 +1137,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setPartnerId(orderRefundVo.getPartnerId());
var1.setStoreId(orderBean.getShopId());
var1.setOrderStatus(orderBean.getStatus());
var1.setOperator(orderBean.getUserName());
BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg());
......@@ -1181,6 +1184,7 @@ public class OrderServiceImpl implements Orderservice {
cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
}
cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
cancelOrderRequest.setOperator(orderBean.getUserName());
BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
......@@ -1530,6 +1534,8 @@ public class OrderServiceImpl implements Orderservice {
orderRefundVo.setOid(orderBean.getOid());
orderRefundVo.setPartnerId(orderBean.getCompanyId());
orderRefundVo.setReason(refundReason);
//系统异常取消订单
orderBean.setUserName("admin");
partnerNoTakeOrder(orderRefundVo, orderBean, oid);
// 发送消息到消息中心推送给pos前端
PushMessageNoticeDto pushMessageNoticeDto = messageNoticeAdapter.convent2PushMessageNoticeDto(2, partnerId, storeId,
......
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