Merge remote-tracking branch 'origin/master'

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardDoorFlowServiceImpl.java

@@ -340,7 +340,7 @@ public class HardDoorFlowServiceImpl extends ServiceImpl<HardDoorFlowMapper, Har
         String ksFlowCode = dto.getState().getCode();
         String ksRecognitionCode = dto.getResult().getStatus().getCode();
         if (ObjectUtil.notEqual(ksFlowCode, "2") || ObjectUtil.notEqual(ksRecognitionCode, "2")) {
-            if (ObjectUtil.equals(ksFlowCode, "2") && ObjectUtil.notEqual(ksRecognitionCode, "2")) {
+            if (ObjectUtil.equals(ksFlowCode, "2") && ObjectUtil.notEqual(ksRecognitionCode, "3")) {
                 // 未拿商品取消订单
                 hardOrderService.cancelHardDoorOrder(flowDetail.getOrderId());
                 getSelf().flowStatusControl(flowDetail, null, dto, "");