Skip to content

O
order-group
Commit e2090f17 by ping.wu
Options

Merge branches 'feature/20200421_申请退款任务_wuping' and 'qa' of… 

Merge branches 'feature/20200421_申请退款任务_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
parents 3856a9dd 71bb5786
Showing with 164 additions and 23 deletions
assortment-ordercenter-sdk/readme.md
...@@ -32,3 +32,5 @@ ...@@ -32,3 +32,5 @@
| 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 | | 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
| 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 | | 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
| 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 | | 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
| 1.5.5-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
| 1.5.6-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
\ No newline at end of file
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
...@@ -760,6 +760,7 @@ public class OrderSdkAdapter { ...@@ -760,6 +760,7 @@ public class OrderSdkAdapter {
refundBean.setRid(afterSalesOrderResp.getAfterSalesCode()); refundBean.setRid(afterSalesOrderResp.getAfterSalesCode());
//售后单状态 1:待处理 2:退货中 3:拒绝退款 4:已退货 5:完成 6:取消 //售后单状态 1:待处理 2:退货中 3:拒绝退款 4:已退货 5:完成 6:取消
refundBean.setStatus(getOldOrderRefundStatus(afterSalesOrderResp.getAfterSalesStatus())); refundBean.setStatus(getOldOrderRefundStatus(afterSalesOrderResp.getAfterSalesStatus()));
refundBean.setCreateTime(afterSalesOrderResp.getCreateTime());
refundBeans.add(refundBean); refundBeans.add(refundBean);
} }
return refundBeans; return refundBeans;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java
...@@ -23,6 +23,8 @@ public class CancelOrderRequest extends BaseConfig { ...@@ -23,6 +23,8 @@ public class CancelOrderRequest extends BaseConfig {
private String partnerId; private String partnerId;
private String storeId;
private AfterSalesType afterSalesType; private AfterSalesType afterSalesType;
/** /**
* 订单ID * 订单ID
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
...@@ -536,6 +536,9 @@ public class QueryOrdersResponse { ...@@ -536,6 +536,9 @@ public class QueryOrdersResponse {
//商家退单审核 备注 //商家退单审核 备注
private String decisionReason; private String decisionReason;
//创建时间
private String createTime;
} }
@NoArgsConstructor @NoArgsConstructor
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
...@@ -362,11 +362,33 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -362,11 +362,33 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
&& !ObjectUtils.equals("0", configuration.getAutoChargebackOrderTime())) { && !ObjectUtils.equals("0", configuration.getAutoChargebackOrderTime())) {
request.setTimeOut(AutoOrderConfigTime.getTime(configuration.getAutoChargebackOrderTime())); request.setTimeOut(AutoOrderConfigTime.getTime(configuration.getAutoChargebackOrderTime()));
} }
OrderTaskReq orderTask = setAfterSalesOrderTimeOutTask();
request.setOrderTask(orderTask);
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.createAfterSalesOrder(request, orderRefundRequest.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.createAfterSalesOrder(request, orderRefundRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response); return orderSdkAdapter.convent2BaseOrderResponse(response);
} }
/** /**
* 设置申请退款48小时后回调任务
*/
private OrderTaskReq setAfterSalesOrderTimeOutTask() {
OrderTaskReq orderTask = new OrderTaskReq();
orderTask.setTaskType(4);
orderTask.setTimeout(1);
//1000*60*60*24*2 毫秒（48小时）
long timeout = 172800000;
long timeMillis = System.currentTimeMillis();
Date processingDate = new Date(timeMillis + timeout - 60000);
Date taskTime = new Date(timeMillis + timeout);
orderTask.setTaskTime(DateUtil.convert2String(taskTime, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
//处理时间，当前时间加48小时减1分钟
orderTask.setProcessingTime(DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
return orderTask;
// request.setOrderTask(orderTask);
}
/**
* 获取门店自动配置信息 * 获取门店自动配置信息
* *
* @param partnerId * @param partnerId
...@@ -464,6 +486,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -464,6 +486,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setCreateEvent(cancelOrderRequest.getCreateEvent()); request.setCreateEvent(cancelOrderRequest.getCreateEvent());
request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo()); request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
request.setOperator(cancelOrderRequest.getOperator()); request.setOperator(cancelOrderRequest.getOperator());
//为空发起售后单
if(cancelOrderRequest.getCreateEvent() == null){
// 查询门店服务配置，退单模式为2为自动退款，判断自动退款时间,设置为0则不传入timeout,
StoreResponse.Configuration configuration = getStoreAutoConfiguration(cancelOrderRequest.getPartnerId(), cancelOrderRequest.getStoreId(), cancelOrderRequest.getTrackingNo());
if (configuration != null && ObjectUtils.equals("2", configuration.getAutoChargebackOrderType())
&& !ObjectUtils.equals("0", configuration.getAutoChargebackOrderTime())) {
request.setTimeOut(AutoOrderConfigTime.getTime(configuration.getAutoChargebackOrderTime()));
}
OrderTaskReq orderTask = setAfterSalesOrderTimeOutTask();
request.setOrderTask(orderTask);
}
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response); return orderSdkAdapter.convent2BaseOrderResponse(response);
} }
......
order-application-service/pom.xml
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
<artifactId>storecenter-sdk</artifactId> <artifactId>storecenter-sdk</artifactId>
<version>2.6.1-SNAPSHOT</version> <version>2.6.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -999,6 +999,8 @@ public class OrderAdapter { ...@@ -999,6 +999,8 @@ public class OrderAdapter {
responseVo.setRefundStatusDesc(Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus())) responseVo.setRefundStatusDesc(Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus()))
.map(RefundStatus::getDesc).orElse("")); .map(RefundStatus::getDesc).orElse(""));
responseVo.setRefundReason(refundBean.getReason()); responseVo.setRefundReason(refundBean.getReason());
String refundCreateTime = DateUtil.convert2String(new Date(Long.parseLong(refundBean.getCreateTime())),DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
responseVo.setRefundCreateTime(refundCreateTime);
} }
} }
//商品信息转换 //商品信息转换
...@@ -2782,4 +2784,52 @@ public class OrderAdapter { ...@@ -2782,4 +2784,52 @@ public class OrderAdapter {
createOrderOperateDto.getCardAmount() == null ? 0 : createOrderOperateDto.getCardAmount(), orderExtInfoDTO); createOrderOperateDto.getCardAmount() == null ? 0 : createOrderOperateDto.getCardAmount(), orderExtInfoDTO);
} }
public Integer getNewOrderClient(String name) {
String _name = OrderSourceType.SAAS.getCode();
Integer orderClientType;
switch (name) {
case "saas":
orderClientType = 2;
break;
case "alipay":
orderClientType=3;
break;
case "jdwm":
orderClientType = 10;
break;
case "mtwm":
orderClientType = 11;
break;
case "eleme":
orderClientType = 8;
break;
case "bdwm":
orderClientType = 9;
break;
case "ebwm":
orderClientType = 9;
break;
case "saas_member":
orderClientType = 13;
break;
case "saas_order":
orderClientType = 14;
break;
case "pos":
orderClientType = 15;
break;
case "meal":
orderClientType = 19;
break;
case "saasmall":
orderClientType = 23;
break;
default:
orderClientType = OrderClientType.SAAS.getIndex();
break;
}
return orderClientType;
}
} }
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
...@@ -199,6 +199,16 @@ public class QueryOrderResponseVo { ...@@ -199,6 +199,16 @@ public class QueryOrderResponseVo {
private String rid; private String rid;
/** /**
* 申请退款时间 yyyy-MM-dd HH:mm:ss
*/
private String refundCreateTime;
/**
* 退款文案提示 若48小时后商家未处理，自动同意/拒绝退款
*/
private String refundTips;
/**
* 订单备注 * 订单备注
*/ */
private String orderRemark; private String orderRemark;
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -46,7 +46,6 @@ import cn.freemud.redis.RedisCache; ...@@ -46,7 +46,6 @@ import cn.freemud.redis.RedisCache;
import cn.freemud.service.BuriedPointService; import cn.freemud.service.BuriedPointService;
import cn.freemud.service.CouponActivityService; import cn.freemud.service.CouponActivityService;
import cn.freemud.service.Orderservice; import cn.freemud.service.Orderservice;
import cn.freemud.service.process.WechatPush.WechatPushProcessor;
import cn.freemud.service.thirdparty.*; import cn.freemud.service.thirdparty.*;
import cn.freemud.utils.*; import cn.freemud.utils.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -96,6 +95,7 @@ import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest; ...@@ -96,6 +95,7 @@ import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService; import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
import com.freemud.sdk.api.assortment.order.adapter.ActivitySdkAdapter; import com.freemud.sdk.api.assortment.order.adapter.ActivitySdkAdapter;
import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO; import com.freemud.sdk.api.assortment.order.entities.OrderExtInfoDTO;
import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
import com.freemud.sdk.api.assortment.order.request.order.*; import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*; import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse; import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
...@@ -934,6 +934,17 @@ public class OrderServiceImpl implements Orderservice { ...@@ -934,6 +934,17 @@ public class OrderServiceImpl implements Orderservice {
throw new ServiceException(ResponseResult.ORDER_QUERYORDER_ERROR); throw new ServiceException(ResponseResult.ORDER_QUERYORDER_ERROR);
} }
QueryOrderResponseVo queryOrderResponseVo = queryOrderResponseVos.get(0); QueryOrderResponseVo queryOrderResponseVo = queryOrderResponseVos.get(0);
//48小时自动退款描述
if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig()!= null
&& queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
Integer automaticRefund = storeInfo.getBizVO().getStoreConfig().getAutomaticRefund();
if(automaticRefund != null && automaticRefund == 1){
queryOrderResponseVo.setRefundTips("若48小时后商家未处理，自动同意");
}else {
queryOrderResponseVo.setRefundTips("若48小时后商家未处理，拒绝退款");
}
}
if (IappIdType.WC_XCX.getCode().equals(userInfo.getIappId())) { if (IappIdType.WC_XCX.getCode().equals(userInfo.getIappId())) {
queryOrderResponseVo.getProducts().stream().forEach(each -> { queryOrderResponseVo.getProducts().stream().forEach(each -> {
orderBean.getProductList().forEach(var -> { orderBean.getProductList().forEach(var -> {
...@@ -1071,8 +1082,6 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1071,8 +1082,6 @@ public class OrderServiceImpl implements Orderservice {
} }
String memberId = userInfo.getMemberId(); String memberId = userInfo.getMemberId();
String partnerId = userInfo.getPartnerId(); String partnerId = userInfo.getPartnerId();
// String openid = map.get("openid").toString();
// String wxappId = map.get("wxAppid").toString();
if (StringUtils.isBlank(orderRefundVo.getOid())) { if (StringUtils.isBlank(orderRefundVo.getOid())) {
return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "oid不能为空"); return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "oid不能为空");
...@@ -1094,14 +1103,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1094,14 +1103,10 @@ public class OrderServiceImpl implements Orderservice {
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "不能操作非本人的订单"); return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "不能操作非本人的订单");
} }
OrderBean orderBean = orderByIdResponseDto.getData(); OrderBean orderBean = orderByIdResponseDto.getData();
//orderBean.setOid(orderId);
if (PayStatus.NOT_PAY.getCode().equals(orderByIdResponseDto.getData().getPayStatus()) if (PayStatus.NOT_PAY.getCode().equals(orderByIdResponseDto.getData().getPayStatus())
|| OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) { || OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单未支付，无法退款"); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单未支付，无法退款");
} }
// if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
// return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已完成，无法退款");
// }
if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) { if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已取消，无法退款"); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已取消，无法退款");
} }
...@@ -1141,18 +1146,37 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1141,18 +1146,37 @@ public class OrderServiceImpl implements Orderservice {
return baseResponse; return baseResponse;
} }
// 删除订单 通知活动添加商品库存 // 删除订单 通知活动添加商品库存
//backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.ACTIVITY.getCode(), TransTypeEnum.COUPON.getCode(), TransTypeEnum.PRODUCT.getCode()));
backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus()); backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
} else { } else {
com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest var1 = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest(); // com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest var1 = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();
OrderRefundRequestDto orderRefundRequestDto = orderAdapter.convent2OrderRefundRequestDto(orderRefundVo, orderBean.getOid()); // OrderRefundRequestDto orderRefundRequestDto = orderAdapter.convent2OrderRefundRequestDto(orderRefundVo, orderBean.getOid());
BeanUtil.convertBean(orderRefundRequestDto, var1); // BeanUtil.convertBean(orderRefundRequestDto, var1);
var1.setTrackingNo(LogTreadLocal.getTrackingNo()); // var1.setTrackingNo(LogTreadLocal.getTrackingNo());
var1.setPartnerId(orderRefundVo.getPartnerId()); // var1.setPartnerId(orderRefundVo.getPartnerId());
var1.setStoreId(orderBean.getShopId()); // var1.setStoreId(orderBean.getShopId());
var1.setOrderStatus(orderBean.getStatus()); // var1.setOrderStatus(orderBean.getStatus());
var1.setOperator(orderBean.getUserName()); // var1.setOperator(orderBean.getUserName());
BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1); // BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
cancelOrderRequest.setStoreId(orderBean.getShopId());
cancelOrderRequest.setOrderId(orderBean.getOid());
cancelOrderRequest.setOrderClient(orderAdapter.getNewOrderClient(orderBean.getSource()));
//传入的售后单类型为：2：售中用户取消 8：售后申请
cancelOrderRequest.setAfterSalesType(AfterSalesType.USER_CANCEL);
if (OldOrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
cancelOrderRequest.setAfterSalesType(AfterSalesType.USER_SALE_RETURN);
}
// cancelOrderRequest.setCreateEvent(null);
cancelOrderRequest.setReason(orderRefundVo.getReason());
cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
cancelOrderRequest.setOperator(orderBean.getUserName());
cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) { if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg()); return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg());
} }
...@@ -1160,7 +1184,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1160,7 +1184,7 @@ public class OrderServiceImpl implements Orderservice {
sendPosMessage(partnerId, orderBean.getShopId()); sendPosMessage(partnerId, orderBean.getShopId());
} }
//通知小助手发送申请退款公众号订阅消息 //通知小助手发送申请退款公众号订阅消息
sendApplyRefundSubscriptionNotice(orderBean,var1); sendApplyRefundSubscriptionNotice(orderBean,orderRefundVo);
//已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票 //已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
printApplyRefundSmallTicket(orderBean, orderRefundVo); printApplyRefundSmallTicket(orderBean, orderRefundVo);
} }
...@@ -2110,7 +2134,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2110,7 +2134,7 @@ public class OrderServiceImpl implements Orderservice {
* 通知小助手发送申请退款公众号订阅消息 * 通知小助手发送申请退款公众号订阅消息
* @param orderBean * @param orderBean
*/ */
public void sendApplyRefundSubscriptionNotice(OrderBean orderBean,OrderRefundRequest request) { public void sendApplyRefundSubscriptionNotice(OrderBean orderBean,OrderRefundVo request) {
LogUtil.debug("sendApplyRefundSubscriptionNotice", JSONObject.toJSONString(request), null); LogUtil.debug("sendApplyRefundSubscriptionNotice", JSONObject.toJSONString(request), null);
String partnerId = orderBean.getCompanyId(); String partnerId = orderBean.getCompanyId();
String shopId = orderBean.getShopId(); String shopId = orderBean.getShopId();
...@@ -2143,7 +2167,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2143,7 +2167,7 @@ public class OrderServiceImpl implements Orderservice {
MpTemplateMsgDataValue keyword5 = new MpTemplateMsgDataValue(); MpTemplateMsgDataValue keyword5 = new MpTemplateMsgDataValue();
keyword5.setValue(orderBean.getPhone()); keyword5.setValue(orderBean.getPhone());
MpTemplateMsgDataValue remark = new MpTemplateMsgDataValue(); MpTemplateMsgDataValue remark = new MpTemplateMsgDataValue();
remark.setValue(request.getReason()+","+request.getRemark()); remark.setValue(request.getReason()+","+request.getRemarks());
data.setFirst(first); data.setFirst(first);
data.setKeyword1(keyword1); data.setKeyword1(keyword1);
data.setKeyword2(keyword2); data.setKeyword2(keyword2);
......
order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java
...@@ -22,6 +22,7 @@ import cn.freemud.entities.dto.activity.ShareDiscountActivityDto; ...@@ -22,6 +22,7 @@ import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto; import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.CheckBeforeCreateOrderRequestVo; import cn.freemud.entities.vo.CheckBeforeCreateOrderRequestVo;
import cn.freemud.entities.vo.CreateOrderVo; import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.OrderRefundVo;
import cn.freemud.enums.ActivityTypeEnum; import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.enums.ApportionType; import cn.freemud.enums.ApportionType;
import cn.freemud.service.impl.OrderServiceImpl; import cn.freemud.service.impl.OrderServiceImpl;
...@@ -78,9 +79,9 @@ public class OrderServiceTest { ...@@ -78,9 +79,9 @@ public class OrderServiceTest {
@Test @Test
public void sendApplyRefundSubscriptionNoticeTest() { public void sendApplyRefundSubscriptionNoticeTest() {
OrderRefundRequest request = new OrderRefundRequest(); OrderRefundVo request = new OrderRefundVo();
request.setReason("下错单"); request.setReason("下错单");
request.setRemark("不要了"); request.setRemarks("不要了");
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest(); BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId("16420126386356464000002"); baseQueryOrderRequest.setOrderId("16420126386356464000002");
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest); QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
......
ordercenter-sdk/readme.md
...@@ -17,3 +17,5 @@ ...@@ -17,3 +17,5 @@
| 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 | | 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
| 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 | | 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
| 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 | | 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 |
| 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
| 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
\ No newline at end of file
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/CreateAfterSalesOrder.java
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
package com.freemud.application.sdk.api.ordercenter.request; package com.freemud.application.sdk.api.ordercenter.request;
import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -88,6 +89,9 @@ public class CreateAfterSalesOrder { ...@@ -88,6 +89,9 @@ public class CreateAfterSalesOrder {
private Integer timeOut; private Integer timeOut;
//任务
private OrderTaskReq orderTask;
// @ApiModelProperty(value = "售后图片信息") // @ApiModelProperty(value = "售后图片信息")
// private List<AfterSalesImageReq> afterSalesImages = new ArrayList<>(); // private List<AfterSalesImageReq> afterSalesImages = new ArrayList<>();
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
package com.freemud.application.sdk.api.ordercenter.request; package com.freemud.application.sdk.api.ordercenter.request;
import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
import lombok.Data; import lombok.Data;
@Data @Data
...@@ -59,4 +60,9 @@ public class OrderCancelReq { ...@@ -59,4 +60,9 @@ public class OrderCancelReq {
//操作人 //操作人
private String operator; private String operator;
private Integer timeOut;
//任务
private OrderTaskReq orderTask;
} }
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderTaskReq.java
...@@ -26,6 +26,7 @@ public class OrderTaskReq { ...@@ -26,6 +26,7 @@ public class OrderTaskReq {
//任务类型：1预约单 (OrderType设置为2预约堂食，4预约外送，6预约自取 默认为预约单) //任务类型：1预约单 (OrderType设置为2预约堂食，4预约外送，6预约自取 默认为预约单)
//2 超时回调 //2 超时回调
//3 拉单队列 //3 拉单队列
//4 申请退款48小时未处理自动回调
private Integer taskType; private Integer taskType;
private Integer timeout; private Integer timeout;
......
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