bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java

@@ -1041,6 +1041,11 @@ public class CuMemberController extends BaseController {
 
     /**
      * 免密登录
+     *
+     * @author: zhang jing
+     * @date: 2023/6/6 10:05
+     * @param: [memberTeamInfoParam]
+     * @return: com.hzs.common.core.web.domain.AjaxResult
      **/
     @GetMapping("/password-free")
     public AjaxResult retailPasswordFree(RetailMemberVO retailMemberVO) {

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java

@@ -33,6 +33,14 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      */
     CuMemberExt queryLoginMember(@Param("memberCode") String memberCode, @Param("pkMember") Long pkMember);
 
+    /**
+     * 根据服务编号登录用户（2024.07.09 兼容海外临时需求）
+     *
+     * @param serviceCode 服务编号
+     * @return
+     */
+    CuMemberExt queryTmpLoginMember(@Param("serviceCode") String serviceCode);
+
     /**
      * 前台查询会员的方法，通过传输不同的参数，查询不同的会员
      *

bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java

@@ -54,7 +54,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
         loginMember.setPkId(cuMember.getPkId());
         loginMember.setLoginType(ELoginType.MEMBER.getValue());
         loginMember.setCuMember(cuMember);
-        loginMember.setSystemType(cuMember.getSystemType());
         return R.ok(loginMember);
     }
 

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java

@@ -162,7 +162,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
 
     @Override
     public CuMemberExt getMemberByCode(String memberCode) {
-        return baseMapper.queryLoginMember(memberCode, null);
+        CuMemberExt cuMemberExt = baseMapper.queryLoginMember(memberCode, null);
+        if (null == cuMemberExt && memberCode.length() == 7) {
+            return baseMapper.queryTmpLoginMember(memberCode);
+        }
+        return cuMemberExt;
     }
 
     @Override
@@ -187,7 +191,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
 
     @Override
     public CuMember queryMember(String memberCode) {
-        return baseMapper.queryLoginMember(memberCode, null);
+        CuMember cuMember = baseMapper.queryLoginMember(memberCode, null);
+        if (null == cuMember && memberCode.length() == 7) {
+            return baseMapper.queryTmpLoginMember(memberCode);
+        }
+        return cuMember;
     }
 
     @Override

bd-business/bd-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java

@@ -138,6 +138,12 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
 
         LoginMember loginMember = memberResult.getData();
         CuMemberExt member = loginMember.getCuMember();
+        // 用户未支付状态
+        if (ECustomerType.FANS.getValue() != member.getCustomerType() && EPayStatus.UNPAID.getValue() == member.getPayStatus()) {
+            recordLoginLog(null, EStatus.NO, username + " 登录用户不存在");
+            // 登录用户: %s 不存在
+            throw new ServiceException(TransactionUtils.getContent(SystemMsgConstants.USER_NOT_EXIST, username));
+        }
         // 非正常点位（死点、已注销），不能登录
         if (ECategory.NORMAL.getValue() != member.getCategory()) {
             recordLoginLog(loginMember.getPkId(), EStatus.NO, "非正常用户不能进行登录");

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -265,6 +265,16 @@
         </if>
     </select>
 
+    <!-- 根据服务编号登录用户（2024.07.09 兼容海外临时需求） -->
+    <select id="queryTmpLoginMember" resultMap="MemberResultMap">
+        select cm.*
+        from cu_member cm
+        where cm.del_flag = 0
+        <if test="serviceCode != null and serviceCode != ''">
+            and cm.SERVICE_CODE = #{serviceCode}
+        </if>
+    </select>
+
     <!--and cm.PAY_STATUS=1-->
     <select id="queryMemberInfoByCondition" resultMap="MemberResultMap">
         <include refid="CuMember_Column"/>

bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysDeptServiceImpl.java

@@ -3,7 +3,6 @@ package com.hzs.system.sys.service.impl;
 import java.text.DecimalFormat;
 import java.util.List;
 
-import com.hzs.common.core.constant.SysConstants;
 import com.hzs.common.domain.system.sys.SysDept;
 import com.hzs.system.sys.param.SysDeptQueryParam;
 import com.hzs.system.sys.vo.SysDeptQueryVO;
@@ -118,9 +117,9 @@ public class SysDeptServiceImpl implements ISysDeptService {
         DecimalFormat decimalFormat = new DecimalFormat("0000");
         String deptCode = sysDeptMapper.getMaxDeptCode();
         if (StringUtils.isEmpty(deptCode)) {
-            return SysConstants.RETAIL_PREFIX + decimalFormat.format(1);
+            return "HZS" + decimalFormat.format(1);
         } else {
-            return SysConstants.RETAIL_PREFIX + decimalFormat.format(Integer.parseInt(deptCode.replace(SysConstants.RETAIL_PREFIX, "")) + 1);
+            return "HZS" + decimalFormat.format(Integer.parseInt(deptCode.replace("HZS", "")) + 1);
         }
     }
 

bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java

@@ -275,6 +275,15 @@ public class PayController {
 
         OnlinePayConfigVO payConfigVO = new OnlinePayConfigVO();
 
+        if (SecurityUtils.getUserId().equals(443418L)) {
+            // 指定线上测试用户： HZS38355685
+            payConfigVO.setPay81(Boolean.TRUE);
+            payConfigVO.setPay82(Boolean.TRUE);
+            payConfigVO.setPay83(Boolean.TRUE);
+            payConfigVO.setPay84(Boolean.TRUE);
+            return AjaxResult.success(payConfigVO);
+        }
+
         // 各支付方式： true=显示，false=隐藏
 
         // 新汇付PC微信扫码支付