Merge branch 'feature/1.9.8-围餐-20191216-dingkai' into develop

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

@@ -483,7 +483,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                     return ResponseUtil.error(ResponseResult.ENCIRCLEORDER_PRE_PAYMENT_SUCCESS);
                 }
                 // 3.取消前一个预支付订单  调用支付取消预支付订单,如果预支付订单已经取消了再调用取消预支付订单接口会报错的
-                if(!ObjectUtils.equals(TradeState.CLOSED.getCode(), queryResponseBaseResponse.getData().getTradeState())) {
+                if(ObjectUtils.equals(TradeState.NOTPAY.getCode(), queryResponseBaseResponse.getData().getTradeState())) {
                     PaymentCloseUnifiedOrderRequest closeUnifiedOrderRequest = new PaymentCloseUnifiedOrderRequest();
                     closeUnifiedOrderRequest.setFmId(extInfo.getFmId());
                     closeUnifiedOrderRequest.setVer("2");