Merge remote-tracking branch 'origin/master'

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

@@ -737,7 +737,7 @@ public class PayServiceImpl implements PayService {
         try {
             return shopMerchantService.getById(shopId);
         } catch (Exception e) {
-            throw new CzgException(e.getMessage());
+            throw new CzgException("暂未开通支付");
         }
     }