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

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

# Conflicts:
#	assortment-ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -46,3 +46,4 @@
 | 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
 | 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
 | 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
+| 1.5.6-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -761,6 +761,7 @@ public class OrderSdkAdapter {
             refundBean.setRid(afterSalesOrderResp.getAfterSalesCode());
             //售后单状态 1:待处理 2:退货中 3:拒绝退款 4:已退货 5:完成 6:取消
             refundBean.setStatus(getOldOrderRefundStatus(afterSalesOrderResp.getAfterSalesStatus()));
+            refundBean.setCreateTime(afterSalesOrderResp.getCreateTime());
             refundBeans.add(refundBean);
         }
         return refundBeans;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -537,6 +537,9 @@ public class QueryOrdersResponse {
                 //商家退单审核 备注
                 private String decisionReason;
 
+                //创建时间
+                private String createTime;
+
             }
 
             @NoArgsConstructor

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -362,11 +362,30 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 && !ObjectUtils.equals("0", configuration.getAutoChargebackOrderTime())) {
             request.setTimeOut(AutoOrderConfigTime.getTime(configuration.getAutoChargebackOrderTime()));
         }
+        setAfterSalesOrderTimeOutTask(request);
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.createAfterSalesOrder(request, orderRefundRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
 
     /**
+     * 设置申请退款48小时后回调任务
+     */
+    private void setAfterSalesOrderTimeOutTask(CreateAfterSalesOrder request) {
+        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));
+        request.setOrderTask(orderTask);
+    }
+
+    /**
      * 获取门店自动配置信息
      *
      * @param partnerId

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1071,8 +1071,6 @@ public class OrderServiceImpl implements Orderservice {
         }
         String memberId = userInfo.getMemberId();
         String partnerId = userInfo.getPartnerId();
-//        String openid = map.get("openid").toString();
-//        String wxappId = map.get("wxAppid").toString();
 
         if (StringUtils.isBlank(orderRefundVo.getOid())) {
             return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "oid不能为空");
@@ -1094,14 +1092,10 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "不能操作非本人的订单");
         }
         OrderBean orderBean = orderByIdResponseDto.getData();
-        //orderBean.setOid(orderId);
         if (PayStatus.NOT_PAY.getCode().equals(orderByIdResponseDto.getData().getPayStatus())
                 || OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
             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())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已取消，无法退款");
         }
@@ -1141,7 +1135,6 @@ public class OrderServiceImpl implements Orderservice {
                     return baseResponse;
                 }
                 // 删除订单 通知活动添加商品库存
-                //backOrdersNotifyActivity(orderBean, Arrays.asList(TransTypeEnum.ACTIVITY.getCode(), TransTypeEnum.COUPON.getCode(), TransTypeEnum.PRODUCT.getCode()));
                 backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             } else {
                 com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest var1 = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/CreateAfterSalesOrder.java

@@ -12,6 +12,7 @@
  */
 package com.freemud.application.sdk.api.ordercenter.request;
 
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import lombok.Data;
 
 @Data
@@ -88,6 +89,9 @@ public class CreateAfterSalesOrder {
 
     private Integer timeOut;
 
+    //任务
+    private OrderTaskReq orderTask;
+
 //    @ApiModelProperty(value = "售后图片信息")
 //    private List<AfterSalesImageReq> afterSalesImages = new ArrayList<>();
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderTaskReq.java

@@ -26,6 +26,7 @@ public class OrderTaskReq {
     //任务类型：1预约单 (OrderType设置为2预约堂食，4预约外送，6预约自取 默认为预约单)
     //2 超时回调
     //3 拉单队列
+    //4 申请退款48小时未处理自动回调
     private Integer taskType;
 
     private Integer timeout;