Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -938,6 +938,11 @@ public class OrderAdapter {
             if (QueryOrderStatus.ORDER_CANCEL.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
                 queryOrdersDto.setStatus(new Integer[]{OrderStatus.CALCEL.getCode()});
             }
+            if (QueryOrderStatus.ORDER_CANCEL_MIXUE.getCode().equals(queryOrderDto.getQueryOrderStatus())) {
+                queryOrdersDto.setStatus(new Integer[]{OrderStatus.CALCEL.getCode()});
+                queryOrdersDto.setPayStatus(new Integer[]{PayStatus.NOT_PAY.getCode()});
+            }
+
         }
 
         // 兼容历史版本，如果传参是4 查询拆程4和5

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -208,6 +208,15 @@ public class OrderController {
     }
 
     /**
+     * 取消支付订单
+     */
+    @ApiAnnotation(logMessage = "cancelPayOrder")
+    @PostMapping("/cancelPayOrder")
+    public BaseResponse cancelPayOrder(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
+        return orderservice.cancelPayOrder(deleteOrderVo);
+    }
+
+    /**
      * 取消支付删除订单
      */
     @ApiAnnotation(logMessage = "deleteOrder")

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderVo.java

@@ -34,7 +34,7 @@ public class QueryOrderVo {
      */
     private String oid;
     /**
-     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消
+     * 订单状态 enum queryOrderStatus   全部订单 1 待取餐 2 已完成 3 全部   4.退款,5 待支付 ,6 已取消  7未支付取消
      */
     private Integer queryOrderStatus;
     /**

order-application-service/src/main/java/cn/freemud/enums/QueryOrderStatus.java

@@ -20,7 +20,10 @@ public enum QueryOrderStatus {
     ALL_BILL(3, "全部"),
     REFUND_BILL(4, "退款"),
     NO_PAY(5, "待支付"),
-    ORDER_CANCEL(6, "已取消");
+    ORDER_CANCEL(6, "已取消"),
+    //密雪
+    ORDER_CANCEL_MIXUE(7, "未支付已取消");
+
 
     private Integer code;
 

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -62,6 +62,8 @@ public interface Orderservice {
      */
     BaseResponse deleteOrder(DeleteOrderVo deleteOrderVo);
 
+    BaseResponse cancelPayOrder(DeleteOrderVo deleteOrderVo);
+
     /**
      * 支付取消删除订单
      */

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

@@ -1510,6 +1510,49 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     @Override
+    public BaseResponse cancelPayOrder(DeleteOrderVo deleteOrderVo) {
+        if (StringUtils.isBlank(deleteOrderVo.getOid())) {
+            return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "oid不能为空");
+        }
+        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+        baseQueryOrderRequest.setOrderId(deleteOrderVo.getOid());
+        baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+        QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+        String string = JSONObject.toJSONString(queryOrderByIdResponse);
+        JSONObject jsonObject = JSONObject.parseObject(string);
+        QueryOrderByIdResponseDto responseDto = jsonObject.toJavaObject(QueryOrderByIdResponseDto.class);
+        if (!RESPONSE_SUCCESS_CODE.equals(responseDto.getErrcode()) || responseDto.getData() == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
+        }
+        OrderBean orderBean = responseDto.getData();
+        if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许取消");
+        }
+        if (!OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许取消");
+        }
+        //
+        CancelOrderRequest var1 = new CancelOrderRequest();
+        var1.setOrderId(deleteOrderVo.getOid());
+        var1.setPartnerId(deleteOrderVo.getPartnerId());
+        var1.setAfterSalesType(AfterSalesType.SYSTEM_CANCEL);
+        var1.setReason(null);
+        var1.setTrackingNo(LogTreadLocal.getTrackingNo());
+        var1.setRefundSerialNo(null);
+        var1.setReqRemark("未支付取消");
+            var1.setOperator("admin");
+        //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
+        var1.setCreateEvent(4);
+        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(var1);
+        if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {
+            return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR.getCode(),baseOrderResponse.getErrmsg());
+        }
+        // TODO: 2019/9/10 删除订单通知
+        backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
+        return ResponseUtil.success();
+    }
+
+    @Override
     public BaseResponse deleteOrderById(DeleteOrderVo deleteOrderVo) {
         if (StringUtils.isBlank(deleteOrderVo.getOid())) {
             return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "oid不能为空");
@@ -1536,7 +1579,7 @@ public class OrderServiceImpl implements Orderservice {
         DeleteOrderRequest var1 = new DeleteOrderRequest();
         var1.setOrderId(deleteOrderDto.getOrderId());
         var1.setTrackingNo(LogTreadLocal.getTrackingNo());
-        var1.setOperator("未支付删除");
+        var1.setOperator("未支付取消");
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.deleteOrder(var1);
 
         if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {