Merge branch '20210928-美团POS支持-zhiwei.zha' into qa

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

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

@@ -395,40 +395,6 @@ public class OrderServiceImpl implements Orderservice {
         }
         //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
 //        couponActivityService.callbackNotify(orderBean);
-
-        try {
-            //美团POS需求，混合支付（现金+储值卡）时，储值卡的交易流水号在预支付时是没有的，导致订单里没有储值卡的流水号，这里查一下支付信息，将储值卡的流水号信息更新到订单信息里
-            List<OrderPayItemResp> payItem = orderBean.getOrderPayItem();
-            if (CollectionUtils.isNotEmpty(payItem) && payItem.size() > 1) {
-                MultiQueryRequest queryPay = new MultiQueryRequest();
-                queryPay.setPartnerId(Integer.valueOf(partnerId));
-                queryPay.setStoreId(storeId);
-                queryPay.setOutOrderNo(orderBean.getOid());
-                MultiQueryRespDto payResponse = comPayClient.paymentApplicationQuery(queryPay, Integer.valueOf(partnerId));
-                if (null != payResponse && null != payResponse.getData() && CollectionUtils.isNotEmpty(payResponse.getData().getQueryList())) {
-                    ApiLog.infoMessage("开始准备更新订单支付信息,payList:<{}>", JSON.toJSONString(payResponse.getData().getQueryList()));
-                    List<MultiPaymentRespDto> payList = payResponse.getData().getQueryList();
-                    // 和订单里的匹配
-                    payList.forEach(pay -> {
-                        payItem.forEach(item -> {
-                            if (item.getTransId().equals(pay.getTransId())) {
-                                item.setFmTradeNo(pay.getFmTradeNo());
-                                item.setOutOrderNo(pay.getOutOrderNo());
-                            }
-                        });
-                    });
-                    // 更新订单信息
-                    OrderEditRequest editReq = new OrderEditRequest(orderBean.getOid(), orderBean.getExtInfo());
-                    editReq.setPayChannel(PayChannelType.COMB.getEbcode());
-                    editReq.setPayChannelName(PayChannelType.COMB.getName());
-                    editReq.setPayChannelType(PayChannelType.COMB.getIndex());
-                    editReq.setOrderPayItem(payItem);
-                    ApiLog.infoMessage("更新订单支付信息,editReq:<{}>", JSON.toJSONString(editReq));
-                    orderCenterSdkService.orderEdit(editReq);
-                }
-            }
-        } catch (Exception ignored) {ErrorLog.errorConvertJson(this.getClass(), "更新订单支付信息异常", ignored);} //这个异常catch住，不影响业务流程
-
         String takeCode;
         String daySeq;
         PayAccessResponse payAccessResponse;