Merge branch 'feature/2020-1104-混合支付' into qa

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

@@ -3355,7 +3355,7 @@ public class OrderServiceImpl implements Orderservice {
                     .stream()
                     .filter(f -> PayChannelType.SVC.getEbcode().equals(f.getEbCode())).findFirst()
                     .orElse(null);
-            orderPayResponse.setFmId(orderPayResponse.getFmId());
+            orderPayResponse.setFmId(svcPay.getTransId());
             orderPayResponse.setPayTransId(svcPay.getTransId());
             orderPayResponse.setWxAppid(paymentRequest.getWxAppId());
             orderPayResponse.setOpenId(paymentRequest.getOpenId());