订单异常状态取消

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/channel/yiwang/YWBasicService.java

@@ -221,8 +221,19 @@ public class YWBasicService extends YiWangService implements BasicService {
 
         switch (outStatus){
             case "4","2":
-                //4-配送中，不可取消订单 2-订单成功结束
-                orderService.sendToOrder(order, "2".equals(outStatus) ? NotifyStatusEnum.ACT : NotifyStatusEnum.DISTRIBUTION);
+                //拒签
+                if("rejected".equals(entries.getStr("orderActId"))){
+                    orderService.sendToOrder(order, NotifyStatusEnum.CANCEL);
+                    //如果是0服务费直接订单也变成已取消
+                    if(order.getServerFee().compareTo(BigDecimal.ZERO) == 0){
+                        updateWrapper.set(LhbOrder::getStatus, OrderStatusEnum.CANCEL.getCode());
+                    }
+                    updateWrapper.set(LhbOrder::getOutStatus, "3");
+                    updateWrapper.set(LhbOrder::getRemark, entries.getStr("orderActName"));
+                }else{
+                    //4-配送中，不可取消订单 2-订单成功结束
+                    orderService.sendToOrder(order, "2".equals(outStatus) ? NotifyStatusEnum.ACT : NotifyStatusEnum.DISTRIBUTION);
+                }
                 break;
             case "3":
                 //3-订单异常取消