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

fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -295,7 +295,7 @@ public class IpadSendServer {
             return false;
         }
 
-        if (qwSopLogs.getSendType() != 12 && noSop) {
+        if (qwSopLogs.getSendType() != 12 && qwSopLogs.getSendType() != 6 && noSop) {
             // 客户的信息
 //            QwExternalContactHParam contactHParam = new QwExternalContactHParam();
 //            contactHParam.setUserId(qwUser.getQwUserId().trim());

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1173,7 +1173,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
                 return R.error("会员被停用，无权限，请联系客服！");
             }
 
-            if (StringUtil.strIsNullOrEmpty(user.getMpOpenId())){
+            if (StringUtil.strIsNullOrEmpty(user.getMpOpenId()) && !"北京存在文化".equals(signProjectName)){
                 return R.error(401,"授权后可继续！");
             }
 

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -641,11 +641,6 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                 String appId = StringUtils.isBlank(param.getAppId()) ? config.getMiniappId() : param.getAppId();
                 config.setAppId(appId);
             }
-            if("wx503cf8ab31f83dd4".equals(config.getAppId())){
-                config.setIsNew(0);
-            }else{
-                config.setIsNew(1);
-            }
             logger.info("最终传参 {}",config);
             //组合返回参数
             R result = new R();