Przeglądaj źródła

特殊小程序

xw 1 tydzień temu
rodzic
commit
c723538f44

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

@@ -666,7 +666,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
             return result;
         }catch (Exception e){
             logger.error("领取红包失败原因:{}", ExceptionUtils.getMessage(e),e);
-            if (e instanceof WxPayException && "济南联志健康".equals(signProjectName)) {
+            if (e instanceof WxPayException && "北京存在文化".equals(signProjectName)) {
                 WxPayException wxPayException = (WxPayException) e;
                 String customErrorMsg = wxPayException.getCustomErrorMsg();
                 if (null != customErrorMsg && customErrorMsg.startsWith("商户运营账户资金不足")) {

+ 1 - 1
fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          left join company c on c.company_id = l.company_id
          LEFT JOIN qw_user qu on qu.id= l.qw_user_id
          LEFT JOIN qw_external_contact qec on l.qw_external_contact_id = qec.id
-         LEFT JOIN fs_course_play_source_config fcpsc on l.app_id = fcpsc.appid
+         LEFT JOIN fs_course_play_source_config fcpsc ON fcpsc.appid = l.app_id
         <where>
             <if test ='maps.appid != null'>
                 and l.app_id = #{maps.appid}

+ 3 - 7
fs-user-app/src/main/java/com/fs/app/controller/store/UserScrmController.java

@@ -100,13 +100,9 @@ public class UserScrmController extends AppBaseController {
         try {
             FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
 
-            if (StringUtils.isNotEmpty(appId) && StringUtils.isNotEmpty(user.getAppId())) {
-                if (user.getAppId().contains(appId)) {
-                    user.setIsShow(1);
-                } else {
-                    user.setIsShow(0);
-                }
-            } else if (user.getIsShow() !=null && user.getIsShow() == 0){
+            if ("wx1c32ab023bfd109e".equals(appId) || "wxd678793558f49b51".equals(appId) || "wxcebb0a6606f3fbcf".equals(appId)) {
+                user.setIsShow(1);
+            }  else if (user.getIsShow() !=null && user.getIsShow() == 0){
                 FsStorePaymentScrm payment = paymentService.selectPaymentByUserId(user.getUserId());
                 if (payment != null){
                     user.setIsShow(1);