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

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -1216,6 +1216,9 @@ public class WechatLogic {
 
         WxPayService payService = this.getPayWebstiService(configId,source);
 
+        if (payService == null)
+            throw new RemoteServiceException("未查到支付配置");
+
         WxPayMicropayRequest request = new WxPayMicropayRequest();
         //request.setDeviceInfo(worker.getWorkerId());
         request.setBody("售修宝费用");