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

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -78,7 +78,7 @@ public class PayController {
         //为什么在js和applet中才需要判断open_id?
         if(payType.equalsIgnoreCase(DragonConstant.PayChannelEnum.WEPAY.getCode())){
             if(deviceFrom.equalsIgnoreCase(DragonConstant.DeviceFromEnum.JS.getCode())||deviceFrom.equalsIgnoreCase(DragonConstant.DeviceFromEnum.APPLET.getCode())) {
-                if (StringUtil.isEmpty(openId)||"error".equalsIgnoreCase(openId)) {
+                if (StringUtil.isEmpty(openId)) {
                     return ResponseDto.failure("微信支付openId不能为空!");
                 }
             }