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

bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java

@@ -138,16 +138,6 @@ public class ApiCuMemberBankController extends BaseController {
         String configWhite = getConfigWhite(pkCountry, pkMember);
         //海外不校验验证码、四要素 国内配置了提现白名单不校验
         if (pkCountry.equals(CountryConstants.CHINA_COUNTRY) && configWhite.equals(EYesNo.NO.getValue())) {
-            //身份证的有效期是否长期
-            Integer isLongTerm = cuMemberBankParam.getIsLongTerm();
-            //身份证有效期不是长期,校验有效期时间
-            if (isLongTerm.equals(EYesNo.NO.getIntValue())) {
-                Date validStartDate = cuMemberBankParam.getValidStartDate();
-                Date validEndDate = cuMemberBankParam.getValidEndDate();
-                if (DateUtils.compareDateAfter(validStartDate, validEndDate)) {
-                    return AjaxResult.error(FinanceMsgConstants.ID_CARD_EXPIRATION_DATE);
-                }
-            }
             String verificationCode = cuMemberBankParam.getVerificationCode();
             if (StringUtils.isEmpty(verificationCode)) {
                 return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.VERIFICATION_CODE_CANNOT_EMPTY));

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

@@ -3185,7 +3185,10 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             if (null == parentMember) {
                 return "推荐人不存在";
             }
-            return this.checkRegisterRelation(phone, parentMember.getSystemType());
+            // 2025年6月9日 - 手机号不唯一,在此不做唯一校验 - start
+//            return this.checkRegisterRelation(phone, parentMember.getSystemType());
+            return null;
+            // 2025年6月9日 - 手机号不唯一,在此不做唯一校验 - end
         } else {
             return "推荐人不存在";
         }

bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java

@@ -145,10 +145,12 @@ public class ApiShareController extends BaseController {
         }
 
         // 校验注册关系（是否跨团队） -- 2024.12.24 修改为校验手机号必须唯一（9035）
-        String relationStr = iCuMemberService.checkRegisterRelation(registerParam.getPhone(), parentMember);
-        if (relationStr != null) {
-            return AjaxResult.error(relationStr);
-        }
+        // 2025年6月9日 - 手机号不唯一,在此不做唯一校验 - start
+//        String relationStr = iCuMemberService.checkRegisterRelation(registerParam.getPhone(), parentMember);
+//        if (relationStr != null) {
+//            return AjaxResult.error(relationStr);
+//        }
+        // 2025年6月9日 - 手机号不唯一,在此不做唯一校验 - start
 
         CuMember newCuMember = iCuMemberService.shareRegisterMember(registerParam);
         if (null != newCuMember) {

bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml

@@ -71,7 +71,6 @@
         <result column="PURCHASE_STATUS" property="purchaseStatus"/>
         <result column="SHARE_STATUS" property="shareStatus"/>
         <result column="REGISTER_AUTHORITY" property="registerAuthority"/>
-        <result column="IS_MAKER_SPACE" property="isMakerSpace"/>
         <result column="IS_TRANSFER" property="isTransfer"/>
         <result column="IS_WITHDRAW" property="isWithdraw"/>
         <result column="IS_CONSUME" property="isConsume"/>

bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ServiceChargeServiceProvider.java

@@ -7,6 +7,7 @@ import com.hzs.system.config.service.IBdServiceChargeService;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,7 +33,15 @@ public class ServiceChargeServiceProvider implements IServiceChargeServiceApi {
      **/
     @Override
     public R<ServiceChargeDTO> getServiceChargeByType(ServiceChargeDTO serviceChargeDTO) {
-        return R.ok(serviceChargeService.getServiceChargeByType(serviceChargeDTO));
+        ServiceChargeDTO dto = serviceChargeService.getServiceChargeByType(serviceChargeDTO);
+        if (null == dto) {
+            // 如果没有配置业务办理手续费，给一个从现金币扣款为0的
+            dto = ServiceChargeDTO.builder()
+                    .cost(BigDecimal.ZERO)
+                    .pkAccount(1)
+                    .build();
+        }
+        return R.ok(dto);
     }
 
     @Override