Merge remote-tracking branch 'origin/test' into test

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java

@@ -229,9 +229,11 @@ public class PayServiceImpl implements PayService {
         if (firstTwoDigits >= 10 && firstTwoDigits <= 15) {
             //微信支付
             bizData.setSubAppid(shopMerchant.getWechatAppId());
+            bizData.setPayType(SystemConstants.PayType.WECHAT);
         } else if (firstTwoDigits >= 25 && firstTwoDigits <= 30) {
             //支付宝支付
             bizData.setSubAppid(shopMerchant.getAlipayAppId());
+            bizData.setPayType(SystemConstants.PayType.ALIPAY);
         } else {
             throw new CzgException("扫描码非法或暂不支持");
         }