Merge branches 'feature/20210830_礼品卡支付_wuping' and 'qa' of…

Merge branches 'feature/20210830_礼品卡支付_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -3650,7 +3650,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setFmId(pt.getTransId());
             orderPayResponse.setPayTransId(pt.getTransId());
             PayChannelType payChannelType = PayChannelType.getByEbcode(pt.getEbCode());
-            if(pt.getCardType() != null && pt.getCardType() == 3){
+            if(pt.getCardType() != null && pt.getCardType() == 0){
                 payChannelType = PayChannelType.GIFTCARD;
             }
             orderPayResponse.setPayChannelType(payChannelType);