From 7fe6c4998e594762b6ebc1c715bffe646656360c Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 12 Aug 2025 18:37:58 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E6=97=A7=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1=EF=BC=9B=E9=83=A8=E5=88=86=E6=9E=9A=E4=B8=BE=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/self/ICuSelfServiceServiceApi.java | 6 - .../hzs/sale/order/ISaOrderServiceApi.java | 23 - .../config/IServiceChargeServiceApi.java | 12 +- .../system/config/ITradeConfigServiceApi.java | 10 - .../hzs/system/config/dto/TradeConfigDTO.java | 6 - .../com/hzs/third/sms/ISmsServiceApi.java | 2 - .../bonus/base/param/MemberRealInfoParam.java | 144 ------- .../bonus/base/param/MemberTeamInfoParam.java | 81 ---- .../ApiCuMemberAuthenticationController.java | 152 +++---- .../api/ApiCuMemberBankController.java | 16 +- .../ICuMemberAuthenticationService.java | 8 - .../account/service/ICuMemberBankService.java | 9 +- .../service/ICuMemberTransferService.java | 2 +- .../service/ICuMemberWithdrawService.java | 1 + .../CuMemberAuthenticationServiceImpl.java | 22 +- .../service/impl/CuMemberBankServiceImpl.java | 5 - .../impl/CuMemberTransferServiceImpl.java | 58 ++- .../account/vo/CuMemberAuthenticationVO.java | 13 +- .../api/ApiCuMemberAchieveDisController.java | 24 -- .../controller/vo/ParentAchieveVO.java | 5 - .../service/ICuMemberMonthAchieveService.java | 9 - .../impl/CuMemberMonthAchieveServiceImpl.java | 54 +-- .../controller/api/ApiMemberController.java | 57 +-- .../controller/manage/CuMemberController.java | 395 +++--------------- .../base/mapper/CuMemberTeamMapper.java | 19 - .../base/param/MemberRealInfoParam.java | 19 +- .../base/param/MemberTeamInfoParam.java | 18 +- .../base/service/ICuMemberTeamService.java | 18 - .../service/impl/CuMemberServiceImpl.java | 15 +- .../service/impl/CuMemberTeamServiceImpl.java | 12 - .../hzs/member/base/vo/AccountPointOutVO.java | 32 -- .../hzs/member/base/vo/AgreementExpireVO.java | 36 -- .../com/hzs/member/base/vo/CuHonorWallVo.java | 63 --- .../base/vo/CuMemberAchieveLogParentVO.java | 103 ----- .../hzs/member/base/vo/DirectPushNewVo.java | 77 ---- .../hzs/member/base/vo/MemberChargingVo.java | 65 --- .../member/base/vo/MemberDirectPushVO.java | 83 ---- .../hzs/member/base/vo/MemberRealInfoVO.java | 44 -- .../hzs/member/base/vo/MemberTeamInfoVo.java | 8 - .../com/hzs/member/base/vo/MemberTeamVo.java | 32 +- .../com/hzs/member/base/vo/TheLableVO.java | 40 -- .../base/vo/WaresAuthorityParentVo.java | 31 -- .../api/ApiDomicileChangeController.java | 137 ++---- .../controller/api/ApiSelfController.java | 32 +- .../manage/DomicileChangeController.java | 49 --- .../self/mapper/CuSelfServiceLogMapper.java | 51 +-- .../ICuSelfServiceServiceProvider.java | 57 +-- .../service/ICuSelfServiceLogService.java | 50 --- .../impl/CuSelfServiceLogServiceImpl.java | 272 +++--------- .../java/com/hzs/member/self/vo/SelfVO.java | 9 - .../controller/api/ApiShareController.java | 14 +- .../sms/controller/api/ApiSmsController.java | 20 +- .../member/sms/service/IApiAliSmsService.java | 12 +- .../member/sms/service/IApiCodeService.java | 79 ---- .../service/impl/ApiAliSmsServiceImpl.java | 37 +- .../sms/service/impl/ApiCodeServiceImpl.java | 59 --- .../mapper/member/base/CuMemberMapper.xml | 53 +-- .../mapper/member/base/CuMemberTeamMapper.xml | 80 ---- .../member/self/CuSelfServiceLogMapper.xml | 86 +--- .../hzs/report/member/vo/DirectPushNewVo.java | 47 +-- .../hzs/sale/order/mapper/SaOrderMapper.java | 11 - .../provider/SaOrderServiceProvider.java | 30 -- .../sale/order/service/ISaOrderService.java | 15 - .../service/impl/SaOrderServiceImpl.java | 20 - .../hzs/sale/order/vo/DirectPushNewVo.java | 72 ---- .../mapper/sale/order/SaOrderMapper.xml | 53 --- .../config/mapper/BdTradeConfigMapper.java | 9 - .../mapper/BdTradeWhiteConfigMapper.java | 6 - .../provider/ITradeConfigServiceProvider.java | 28 +- .../ServiceChargeServiceProvider.java | 13 +- .../config/service/IBdTradeConfigService.java | 8 +- .../service/IBdTradeWhiteConfigService.java | 11 - .../impl/BdTradeConfigServiceImpl.java | 73 +--- .../impl/BdTradeWhiteConfigServiceImpl.java | 49 +-- .../enums/controller/EnumsController.java | 25 -- .../enums/controller/EnumsInitController.java | 20 - .../system/config/BdTradeConfigMapper.xml | 47 +-- .../config/BdTradeWhiteConfigMapper.xml | 16 - .../com/hzs/common/core/config/BdConfig.java | 8 + .../core/constant/EnumsPrefixConstants.java | 5 - .../core/constant/MagicNumberConstants.java | 22 +- .../common/core/constant/RetailConstants.java | 40 +- .../core/constant/SystemFieldConstants.java | 5 - .../constant/msg/FinanceMsgConstants.java | 27 -- .../core/enums/EAgreementWhiteType.java | 18 +- .../core/enums/EApproveRechargeStatus.java | 12 +- .../com/hzs/common/core/enums/ECardType.java | 39 +- .../hzs/common/core/enums/EExemptType.java | 6 +- .../hzs/common/core/enums/EFrameworkType.java | 18 +- .../com/hzs/common/core/enums/EGrantWay.java | 49 --- .../com/hzs/common/core/enums/EIdType.java | 25 +- .../common/core/enums/EInfusingWaterType.java | 6 +- .../core/enums/EInternalMessageType.java | 6 - .../common/core/enums/EPayBusinessType.java | 2 - .../hzs/common/core/enums/EPayChannel.java | 2 - .../com/hzs/common/core/enums/EPopupType.java | 6 - .../com/hzs/common/core/enums/EResetBank.java | 7 +- .../java/com/hzs/common/core/enums/ESex.java | 21 +- .../com/hzs/common/core/enums/EShareType.java | 6 +- .../com/hzs/common/core/enums/ESheetType.java | 16 +- .../hzs/common/core/enums/EShowStatus.java | 6 +- .../hzs/common/core/enums/ESignInState.java | 8 +- .../com/hzs/common/core/enums/ESignType.java | 6 +- .../java/com/hzs/common/core/enums/ESkin.java | 6 +- .../hzs/common/core/enums/ESmsSendResult.java | 6 +- .../hzs/common/core/enums/ESmsSendScope.java | 6 +- .../hzs/common/core/enums/ESmsSendStatus.java | 6 +- .../hzs/common/core/enums/ESmsSendType.java | 6 +- .../hzs/common/core/enums/ESmsTemplate.java | 44 -- .../hzs/common/core/enums/ESortStatus.java | 11 +- .../common/core/enums/ESpecialAreaTime.java | 18 +- .../common/core/enums/EStatisticalValue.java | 6 +- .../common/core/enums/EStatisticsScope.java | 6 +- .../com/hzs/common/core/enums/EStatus.java | 2 - .../hzs/common/core/enums/EStructureType.java | 45 -- .../hzs/common/core/enums/ESupplierType.java | 10 +- .../hzs/common/core/enums/ETakeValueType.java | 12 +- .../hzs/common/core/enums/EThirdBindType.java | 22 - .../com/hzs/common/core/enums/ETransType.java | 40 -- .../common/core/enums/ETransferSpecial.java | 6 - .../common/core/enums/EUpgradeIncomeType.java | 41 -- .../hzs/common/core/enums/EUpgradeWay.java | 6 +- .../hzs/common/core/enums/EUserStatus.java | 2 - .../core/enums/EVerificationModule.java | 8 - .../common/core/enums/EWalletFreezeState.java | 2 - .../hzs/common/core/enums/EWalletStatus.java | 2 - .../common/core/enums/EWithdrawStatus.java | 4 +- .../hzs/common/core/enums/HonorWallType.java | 82 ---- .../domain/member/account/CuMemberBank.java | 5 - .../common/domain/member/ext/CuMemberExt.java | 6 +- .../domain/sale/ext/SaDeliverItemsExt.java | 6 +- .../domain/system/config/BdTradeConfig.java | 5 - .../system/config/BdTradeWhiteConfig.java | 5 - .../common/domain/third/sms/TSmsTemplate.java | 3 - .../service/impl/IdCardServiceImpl.java | 6 +- .../manage/SmsRecordController.java | 28 -- .../third/sms/mapper/TSmsTemplateMapper.java | 3 - .../hzs/third/sms/param/SmsCreateParam.java | 59 --- .../sms/provider/SmsServiceProvider.java | 2 - .../hzs/third/sms/service/ISmsService.java | 22 - .../third/sms/service/ITSmsRecordService.java | 11 - .../sms/service/ITSmsTemplateService.java | 3 - .../sms/service/impl/SmsServiceImpl.java | 99 ----- .../service/impl/TSmsRecordServiceImpl.java | 222 ---------- .../service/impl/TSmsTemplateServiceImpl.java | 3 - .../java/com/hzs/third/sms/util/SmsUtil.java | 87 +--- 146 files changed, 537 insertions(+), 4282 deletions(-) delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java delete mode 100644 bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiCodeService.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiCodeServiceImpl.java delete mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/DirectPushNewVo.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStructureType.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EThirdBindType.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransType.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeIncomeType.java delete mode 100644 bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/HonorWallType.java delete mode 100644 bd-third/src/main/java/com/hzs/third/sms/param/SmsCreateParam.java delete mode 100644 bd-third/src/main/java/com/hzs/third/sms/service/ISmsService.java delete mode 100644 bd-third/src/main/java/com/hzs/third/sms/service/impl/SmsServiceImpl.java diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java index c6927720..a365c3b8 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java @@ -6,12 +6,6 @@ import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; /** * 自助服务 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/19 16:09 - * @Classname: ICuSelfServiceServiceApi - * @Package_name: com.hzs.member.self */ public interface ICuSelfServiceServiceApi { diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java index 3116e5aa..d97fde30 100644 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java +++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java @@ -27,25 +27,6 @@ public interface ISaOrderServiceApi { */ R> queryRetailSaOrderByDay(Date startDate, Date endDate, String orderCode); - /* - * 根据主键查询订单,需要查询del_flag=1的，存在先撤单在退货 - **/ - R querySaOrderExtByPkId(Long pkId); - - /* - * 根据发货单查询销售订单 - **/ - R> querySaOrderByDeliverList(List deliverItemExtList); - - /** - * 根据订单ID查询订单详细列表 - * - * @param pkOrderList 订单ID列表 -- 必传 - * @param pkCountry 国家ID -- 非必传 - * @return - */ - R> queryOrderItemsListByOrderId(List pkOrderList, Integer pkCountry); - /** * 空单注册审核通过 * @@ -103,10 +84,6 @@ public interface ISaOrderServiceApi { */ R saveOrderBatch(List orderList, List orderItemsList); - /* 保存销售订单 - **/ - R saveOrder(SaOrderExt saOrderExt); - /** * 查询注册订单数量 * diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java index 805319c0..dc08e82a 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java @@ -6,20 +6,12 @@ import com.hzs.system.config.dto.ServiceChargeDTO; import java.util.List; /** - * @Description: 办理业务手续费api - * @Author: zhangjing - * @Time: 2022/9/9 14:07 - * @Classname: IGradeServiceApi - * @PackageName: com.hzs.system.config + * 办理业务手续费api */ public interface IServiceChargeServiceApi { /** - * @description: 根据业务类型查询扣款 - * @author: zhang jing - * @date: 2023/1/7 15:01 - * @param: [type, quantity] - * @return: com.hzs.common.core.domain.R + * 根据业务类型查询扣款 **/ R getServiceChargeByType(ServiceChargeDTO serviceChargeDTO); diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java index c173adc1..9f694946 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/ITradeConfigServiceApi.java @@ -7,13 +7,6 @@ import com.hzs.system.config.dto.TradeConfigDTO; import java.util.List; -/** - * @Description: - * @Author: ljc - * @Time: 2023/8/21 15:05 - * @Classname: ITradeConfigApi - * @Package_name: com.hzs.system.config - */ public interface ITradeConfigServiceApi { /** @@ -32,7 +25,6 @@ public interface ITradeConfigServiceApi { */ R selectTradeWhiteConfigByCondition(TradeConfigDTO tradeConfigDTO); - /** * 根据会员ID查询账户白名单 * @@ -42,7 +34,6 @@ public interface ITradeConfigServiceApi { */ R> selectTransferWhiteByPkMember(Long pkMember, Integer pkCountry); - /** * 查询配置伞下白名单的会员 * @@ -51,5 +42,4 @@ public interface ITradeConfigServiceApi { */ R> selectTradeWhiteConfigByUnderBlood(TradeConfigDTO tradeConfigDTO); - } diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java index 63d94cb5..bfcaa5c9 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/TradeConfigDTO.java @@ -9,12 +9,6 @@ import java.io.Serializable; /** * 交易配置DTO - * - * @Description: - * @Author: ljc - * @Time: 2023/8/21 15:30 - * @Classname: TradeConfigDTO - * @Package_name: com.hzs.system.config.dto */ @Data @Builder diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java index b3c388d5..b407c772 100644 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java +++ b/bd-api/bd-api-third/src/main/java/com/hzs/third/sms/ISmsServiceApi.java @@ -6,8 +6,6 @@ import com.hzs.third.sms.dto.SmsServiceDTO; /** * 短信服务接口 - * - * @author hzs */ public interface ISmsServiceApi { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java deleted file mode 100644 index 697aeb07..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberRealInfoParam.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/26 10:08 - * @Classname: MemberRealInfo - * @PackageName: com.hzs.member.base.param - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-04-26 10:08 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberRealInfoParam { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 注册等级 - */ - private Integer pkRegisterGrade; - - /** - * 结算等级 - */ - private Integer pkSettleGrade; - - /** - * 证件类型 - */ - - private Integer idType; - - /** - * 证件号码 - */ - private String idCard; - /** - * 出生日期（年月日） - */ - private Date birthDate; - - /** - * 省id - */ - private Integer pkProvince; - /** - * 市id - */ - private Integer pkCity; - /** - * 区县id - */ - private Integer pkCounty; - /** - * 详细地址 - */ - private String address; - - /** - * 性别（0=未知,1=男,2=女） - */ - - private Integer sex; - /** - * 银行名称 - */ - private String bankName; - - /** - * 支行名称 - */ - private String subBankName; - - /** - * 银行卡号 - */ - private String cardNumber; - - /** - * 邮箱 - */ - private String email; - - /** - * 开始认证时间 - */ - private Date startCertificationTime; - - /** - * 结束认证时间 - */ - private Date endCertificationTime; - - /** - * 开始创建时间 - */ - private Date startCreationTime; - /** - * 结束创建时间 - */ - private Date endCreationTime; - - /** - * 开始支付时间 - */ - private Date startPayTime; - /** - * 结束支付时间 - */ - private Date endPayTime; - /** - * 国家 - */ - private Integer PkCountry; -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java deleted file mode 100644 index e22ea0ad..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/param/MemberTeamInfoParam.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.hzs.bonus.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/29 14:53 - * @Classname: MemberTeamInfoParam - * @PackageName: com.hzs.member.base.param - */ - -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-05-29 14:53 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberTeamInfoParam { - - /** - * 查询date 时间 - */ - private Date queryDate; - - /** - * 查询业绩表名 - */ - private String settleTableName; - - /** - * 期间值 - */ - private Integer period; - - /** - * 会员编号 - */ - private String memberCode ; - - /** - * 真实奖衔 - */ - private Integer pkAwards; - - /** - * 关系类型 1 血缘 2 安置 - */ - private Integer relaType; - - /** - * 安置部门 - */ - private Integer placeDept; - - /** - * 血缘代数 - */ - private Integer consanguinityAlgebra; - - - /** - * 安置层级 - * 查询当前会员在团队的第几层 （查询伞下的所有人） - */ - private Integer resettleLevel; - - /** - * 安置位置 - */ - private String resettleLocation; - - /** - * 奖金收益 - */ - private BigDecimal realIncomeTotal; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java index 3ebfa53f..518414c6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberAuthenticationController.java @@ -1,15 +1,17 @@ package com.hzs.member.account.controller.api; +import cn.hutool.core.util.IdcardUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; import com.hzs.common.core.constant.msg.FinanceMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; +import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.OssUtil; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.utils.ThreadUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.ext.CuMemberExt; +import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.system.config.BdTradeConfig; import com.hzs.common.domain.system.config.BdTradeWhiteConfig; import com.hzs.common.security.utils.SecurityUtils; @@ -18,7 +20,7 @@ import com.hzs.member.account.service.ICuMemberAuthenticationService; import com.hzs.member.account.service.ICuMemberBaseService; import com.hzs.member.account.vo.CuMemberAuthenticationVO; import com.hzs.member.base.service.ICuMemberService; -import com.hzs.member.sms.service.IApiCodeService; +import com.hzs.member.sms.service.IApiAliSmsService; import com.hzs.third.idcard.IdCardServiceApi; import com.hzs.third.idcard.dto.IdCardOcrDTO; import org.apache.dubbo.config.annotation.DubboReference; @@ -26,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; /** @@ -37,7 +38,7 @@ import java.time.format.DateTimeFormatter; public class ApiCuMemberAuthenticationController extends BaseController { @Autowired - private IApiCodeService iApiCodeService; + private IApiAliSmsService iApiAliSmsService; @Autowired private ICuMemberAuthenticationService iCuMemberAuthenticationService; @Autowired @@ -48,6 +49,31 @@ public class ApiCuMemberAuthenticationController extends BaseController { @DubboReference IdCardServiceApi idCardServiceApi; + /** + * 是否需要实名认证 + * + * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule) + * @return AjaxResult + */ + @GetMapping("/is-auth") + public AjaxResult isAuth(Integer businessModule) { + String flag = EYesNo.YES.getValue(); + Long pkMember = SecurityUtils.getUserId(); + Integer pkCountry = SecurityUtils.getPkCountry(); + //查询是否配置了实名认证白名单 + BdTradeWhiteConfig bdTradeWhiteConfig = iCuMemberBaseService.selectConfigWhite(pkMember, pkCountry, businessModule); + if (isStopStatus(businessModule, bdTradeWhiteConfig)) { + //查询配置实名认证 + BdTradeConfig bdTradeConfig = iCuMemberBaseService.selectConfigTrade(pkMember, pkCountry, businessModule, EVerificationModule.REAL_NAME); + //配置后才进行验证 + if (null != bdTradeConfig) { + //查询是否已实名认证 + CuMemberAuthenticationVO authenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); + flag = null == authenticationVO ? EYesNo.NO.getValue() : EYesNo.YES.getValue(); + } + } + return AjaxResult.success().put("flag", flag); + } /** * 调用身份证OCR接口 @@ -72,7 +98,6 @@ public class ApiCuMemberAuthenticationController extends BaseController { return AjaxResult.error(result.getMsg()); } - /** * 调用身份证OCR反面接口 * @@ -115,11 +140,7 @@ public class ApiCuMemberAuthenticationController extends BaseController { Long pkMember = SecurityUtils.getUserId(); Integer pkCountry = SecurityUtils.getPkCountry(); - //查询是否已实名 - CuMemberAuthenticationVO queryAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); - if (null != queryAuthenticationVO) { - return AjaxResult.error(FinanceMsgConstants.MEMBER_REAL_NAME); - } + // 验证码是否为空 String verificationCode = authenticationVO.getVerificationCode(); if (StringUtils.isEmpty(verificationCode)) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.VERIFICATION_CODE_CANNOT_EMPTY)); @@ -129,51 +150,38 @@ public class ApiCuMemberAuthenticationController extends BaseController { if (StringUtils.isEmpty(accountName)) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.REAL_NAME_CANNOT_EMPTY)); } - if (StringUtils.isEmpty(authenticationVO.getIdFront())) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.ID_FRONT_CANNOT_EMPTY)); } if (StringUtils.isEmpty(authenticationVO.getIdBack())) { return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.ID_BACK_CANNOT_EMPTY)); } + if (StringUtils.isEmpty(authenticationVO.getAddress())) { + return AjaxResult.error("详细地址不能为空！"); + } + // 查询是否已实名 + CuMemberAuthenticationVO queryAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); + if (null != queryAuthenticationVO) { + return AjaxResult.error(FinanceMsgConstants.MEMBER_REAL_NAME); + } + // 真实姓名与注册的会员姓名不一致 + CuMember member = iCuMemberService.getMember(pkMember); + if (!member.getMemberName().equals(accountName)) { + return AjaxResult.error("真实姓名与会员姓名不一致"); + } - String message = iApiCodeService.checkCode(authenticationVO.getPhone(), verificationCode, null); + String message = iApiAliSmsService.checkCode(authenticationVO.getPhone(), verificationCode, null, member.getPkId()); if (null != message) { return AjaxResult.error(message); } + // 从身份证获取出生日期 + authenticationVO.setBirthDate(DateUtils.parseDateOne(IdcardUtil.getBirthByIdCard(authenticationVO.getIdCard()), DateUtils.YAMMER)); authenticationVO.setPkCountry(pkCountry); authenticationVO.setPkMember(pkMember); return toAjax(iCuMemberAuthenticationService.saveAuthentication(authenticationVO)); } - - /** - * 是否需要实名认证 - * - * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule) - * @return AjaxResult - */ - @GetMapping("/is-auth") - public AjaxResult isAuth(Integer businessModule) { - String flag = EYesNo.YES.getValue(); - Long pkMember = SecurityUtils.getUserId(); - Integer pkCountry = SecurityUtils.getPkCountry(); - //查询是否配置了实名认证白名单 - BdTradeWhiteConfig bdTradeWhiteConfig = iCuMemberBaseService.selectConfigWhite(pkMember, pkCountry, businessModule); - if (isStopStatus(businessModule, bdTradeWhiteConfig)) { - //查询配置实名认证 - BdTradeConfig bdTradeConfig = iCuMemberBaseService.selectConfigTrade(pkMember, pkCountry, businessModule, EVerificationModule.REAL_NAME); - //配置后才进行验证 - if (null != bdTradeConfig) { - //查询是否已实名认证 - CuMemberAuthenticationVO authenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); - flag = null == authenticationVO ? EYesNo.NO.getValue() : EYesNo.YES.getValue(); - } - } - return AjaxResult.success().put("flag", flag); - } - /** * 查询白名单的配置状态 * @@ -191,7 +199,6 @@ public class ApiCuMemberAuthenticationController extends BaseController { return businessModule.equals(EBusinessModule.TRANSFER_ACCOUNTS.getValue()) && bdTradeWhiteConfig.getTransferState().equals(EYesNo.NO.getIntValue()); } - /** * 查看详情 * @@ -205,69 +212,4 @@ public class ApiCuMemberAuthenticationController extends BaseController { return AjaxResult.success(authenticationVO); } - /** - * 协议处理校验实名 - * - * @return - */ - @GetMapping("/agreement-real-name") - public AjaxResult agreementRealName() { - Long pkMember = SecurityUtils.getUserId(); - Integer pkCountry = SecurityUtils.getPkCountry(); - // 查询实名认证信息 - CuMemberAuthenticationVO authenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); - if (null != authenticationVO) { - // 存在实名认证信息，则返回成功 - return AjaxResult.success("", EYesNo.YES.getIntValue()); - } - return AjaxResult.success("", EYesNo.YES.getIntValue()); - } - - - /** - * 是否显示续约 - * - * @return AjaxResult - */ - @GetMapping("/is-expire") - public AjaxResult isExpire() { - int flag = EYesNo.NO.getIntValue(); - Long pkMember = SecurityUtils.getUserId(); - - CuMemberExt member = iCuMemberService.getMemberById(pkMember); - Integer isRealName = member.getIsRealName(); - - //未实名 - if (isRealName.equals(flag)) { - return AjaxResult.success().put("flag", flag); - } - //到期日期 - LocalDate expireDate = member.getExpireDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - //到期三个月 - LocalDate beforeMonthDate = expireDate.minusMonths(3); - LocalDate localDate = LocalDate.now(); - if (localDate.equals(beforeMonthDate) || localDate.isAfter(beforeMonthDate)) { - flag = EYesNo.YES.getIntValue(); - } - return AjaxResult.success().put("flag", flag); - } - - /** - * 续约 - * - * @return AjaxResult - */ - @GetMapping("/renewal_contract") - public AjaxResult renewalContract() { - Long pkMember = SecurityUtils.getUserId(); - Integer pkCountry = SecurityUtils.getPkCountry(); - //查询是否已实名 - CuMemberAuthenticationVO queryAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build()); - if (null == queryAuthenticationVO) { - return AjaxResult.error(FinanceMsgConstants.MEMBER_NOT_REAL_NAME); - } - return toAjax(iCuMemberAuthenticationService.memberRenewalContract(pkMember)); - } - - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java index ff6509dd..059da3ae 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java @@ -7,7 +7,6 @@ import com.hzs.common.core.constant.msg.FinanceMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EBusinessModule; import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; @@ -20,7 +19,7 @@ import com.hzs.member.account.service.ICuMemberBankService; import com.hzs.member.account.service.ICuMemberBaseService; import com.hzs.member.account.service.ICuMemberWithdrawService; import com.hzs.member.account.vo.CuMemberBankVO; -import com.hzs.member.sms.service.IApiCodeService; +import com.hzs.member.sms.service.IApiAliSmsService; import com.hzs.third.bankcard.IBankCardServiceApi; import com.hzs.third.bankcard.dto.BankCardParam; import org.apache.dubbo.config.annotation.DubboReference; @@ -28,14 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; -import java.util.Date; import java.util.List; /** * 会员银行卡 前端控制器 - * - * @author hzs - * @since 2022-09-06 */ @RestController @RequestMapping("/api/bank") @@ -44,11 +39,11 @@ public class ApiCuMemberBankController extends BaseController { @Autowired private ICuMemberBankService cuMemberBankService; @Autowired - private IApiCodeService iApiCodeService; - @Autowired private ICuMemberBaseService iCuMemberBaseService; @Autowired private ICuMemberWithdrawService cuMemberWithdrawService; + @Autowired + private IApiAliSmsService iApiAliSmsService; @DubboReference IBankCardServiceApi bankCardServiceApi; @@ -91,7 +86,6 @@ public class ApiCuMemberBankController extends BaseController { return AjaxResult.success(cuMemberBankService.unbindBank(pkId, pkMember)); } - /** * 校验开户名 * @@ -119,7 +113,6 @@ public class ApiCuMemberBankController extends BaseController { .bankCard(StringUtils.deleteWhitespace(memberBankParam.getCardNumber())).build(); R result = bankCardServiceApi.verifyBankCard(bankCard); return result.isSuccess() ? AjaxResult.success() : AjaxResult.error(result.getMsg()); - } @@ -151,7 +144,7 @@ public class ApiCuMemberBankController extends BaseController { String cardNumber = cuMemberBankParam.getCardNumber(); cuMemberBankParam.setCardNumber(StringUtils.deleteWhitespace(cardNumber)); - String message = iApiCodeService.checkCode(cuMemberBankParam.getPhone(), verificationCode, null); + String message = iApiAliSmsService.checkCode(cuMemberBankParam.getPhone(), verificationCode, null, pkMember); if (null != message) { return AjaxResult.error(message); } @@ -161,7 +154,6 @@ public class ApiCuMemberBankController extends BaseController { return toAjax(cuMemberBankService.saveMemberBank(cuMemberBankParam)); } - @GetMapping("/list") public AjaxResult getBankCardList() { Long pkMember = SecurityUtils.getUserId(); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java index 8858c0ac..d955bd40 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAuthenticationService.java @@ -19,14 +19,6 @@ public interface ICuMemberAuthenticationService extends IService * 会员信息-银行卡信息 服务类 - *

- * - * @author hzs - * @since 2022-08-31 */ public interface ICuMemberBankService extends IService { /** @@ -36,8 +31,8 @@ public interface ICuMemberBankService extends IService { /** * 解绑银行卡 * - * @param pkId 银行卡ID - * @param pkMember 会员ID + * @param pkId 银行卡ID + * @param pkMember 会员ID * @return Boolean */ Boolean unbindBank(Long pkId, Long pkMember); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java index 971fa52a..844c3565 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberTransferService.java @@ -10,6 +10,7 @@ import com.hzs.member.account.vo.CuMemberTransferVO; * 会员转账表 服务类 */ public interface ICuMemberTransferService extends IService { + /** * 是否在血缘线上 * @@ -45,7 +46,6 @@ public interface ICuMemberTransferService extends IService { */ BdTransfer getBdTransfer(Integer pkCountry); - /** * 保存转账 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java index 0d6c1c47..4a11f5e4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java @@ -195,6 +195,7 @@ public interface ICuMemberWithdrawService extends IService { /** * 提现驳回 + * * @param param */ void withdrawReject(CuMemberWithdrawRejectParam param); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java index f92d2760..b7276c36 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAuthenticationServiceImpl.java @@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.enums.EServiceStatus; import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.account.CuMemberAuthentication; import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.account.mapper.CuMemberAuthenticationMapper; import com.hzs.member.account.service.ICuMemberAuthenticationService; import com.hzs.member.account.vo.CuMemberAuthenticationVO; @@ -18,8 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; -import java.time.ZoneId; import java.util.Date; import java.util.List; @@ -52,22 +47,7 @@ public class CuMemberAuthenticationServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(CuMember::getIsRealName, EYesNo.YES.getIntValue()); updateWrapper.set(CuMember::getIdCard, authenticationVO.getIdCard()); - updateWrapper.set(CuMember::getMemberName, authenticationVO.getAccountName()); - updateWrapper.set(CuMember::getServiceAgreement, EServiceStatus.SIGNED.getValue()); - updateWrapper.set(CuMember::getModifiedTime, new Date()); - updateWrapper.set(CuMember::getPkModified, pkMember); - updateWrapper.eq(CuMember::getPkId, pkMember); - return iCuMemberService.update(updateWrapper); - } - - @Override - public Boolean memberRenewalContract(Long pkMember) { - CuMemberExt member = iCuMemberService.getMemberById(SecurityUtils.getUserId()); - //到期日期 - LocalDate expireDate = member.getExpireDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(CuMember::getServiceAgreement, EServiceStatus.SIGNED.getValue()); - updateWrapper.set(CuMember::getExpireDate, DateUtils.toDate(expireDate.plusYears(1).atStartOfDay())); + updateWrapper.set(CuMember::getBirthDate, authenticationVO.getBirthDate()); updateWrapper.set(CuMember::getModifiedTime, new Date()); updateWrapper.set(CuMember::getPkModified, pkMember); updateWrapper.eq(CuMember::getPkId, pkMember); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java index b7ffdf00..029e8be0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java @@ -20,12 +20,7 @@ import java.util.Date; import java.util.List; /** - *

* 会员信息-银行卡信息 服务实现类 - *

- * - * @author hzs - * @since 2022-08-31 */ @Service public class CuMemberBankServiceImpl extends ServiceImpl implements ICuMemberBankService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java index b0c92c87..1ebbd5bd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberTransferServiceImpl.java @@ -40,16 +40,16 @@ import java.util.*; public class CuMemberTransferServiceImpl extends ServiceImpl implements ICuMemberTransferService { @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; @Autowired - private ICuMemberAccountService cuMemberAccountService; + private ICuMemberAccountService iCuMemberAccountService; @Autowired - private ICuMemberTradeService cuMemberTradeService; + private ICuMemberTradeService iCuMemberTradeService; @Autowired - private ICuMemberBaseService cuMemberBaseService; + private ICuMemberBaseService iCuMemberBaseService; @DubboReference - ITransferServiceApi transferServiceApi; + ITransferServiceApi iTransferServiceApi; @Override public Boolean isBloodLine(Long pkMember, Long toPkMember) { @@ -61,14 +61,14 @@ public class CuMemberTransferServiceImpl extends ServiceImpl cuMemberUp = cuMemberService.queryBloodKinshipOnUmbrella(pkMember); + List cuMemberUp = iCuMemberService.queryBloodKinshipOnUmbrella(pkMember); Optional upOptional = cuMemberUp.stream().filter(up -> toPkMember.equals(up.getPkId())).findFirst(); return upOptional.isPresent(); } @@ -76,7 +76,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl cuMemberDown = cuMemberService.queryBloodKinshipUnderUmbrella(pkMember); + List cuMemberDown = iCuMemberService.queryBloodKinshipUnderUmbrella(pkMember); Optional downOptional = cuMemberDown.stream().filter(down -> toPkMember.equals(down.getPkId())).findFirst(); return downOptional.isPresent(); } @@ -103,7 +103,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl(); memberAccountList.add(cuMemberAccount); idsMap = new HashMap<>(); @@ -111,7 +111,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl(); memberAccountList.add(toMemberAccount); idsMap = new HashMap<>(); @@ -130,13 +130,12 @@ public class CuMemberTransferServiceImpl extends ServiceImpl memberAccountList, Integer type, String businessCode, Map idsMap) { //转出方 if (type.equals(ETransferType.TRANSFER_OUT.getValue())) { - cuMemberBaseService.handleMemberTradeDetailAndBonus(memberAccountList, businessCode, idsMap, EConsumeType.TRANSFER.getValue()); + iCuMemberBaseService.handleMemberTradeDetailAndBonus(memberAccountList, businessCode, idsMap, EConsumeType.TRANSFER.getValue()); } else { - cuMemberBaseService.saveMemberTradeDetail(businessCode); + iCuMemberBaseService.saveMemberTradeDetail(businessCode); } } - /** * 更新交易流水和余额 * @@ -145,7 +144,7 @@ public class CuMemberTransferServiceImpl extends ServiceImpl cuMemberMonthAchieveExtList = iCuMemberMonthAchieveService.queryCuMemberMonthAchieveRecommend(parentAchieveVO); - cuMemberMonthAchieveExtList.forEach(cuMemberMonthAchieveExt -> { - String memberName = cuMemberMonthAchieveExt.getMemberName(); - if (memberName.length() > 2) { - cuMemberMonthAchieveExt.setMemberName(memberName.replaceFirst(memberName.substring(1, memberName.length() - 1), "*")); - } else { - cuMemberMonthAchieveExt.setMemberName(memberName.replaceFirst(memberName.substring(1), "*")); - } - }); - return getDataTable(cuMemberMonthAchieveExtList); - } - /** * 月度业绩 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java index 0e1cd0fd..94733dbd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/controller/vo/ParentAchieveVO.java @@ -10,12 +10,7 @@ import java.util.List; /** - *

* 直推业绩统计VO - *

- * - * @author zhangjing - * @since 2023-05-17 */ @Data public class ParentAchieveVO { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java index aeb7b8c7..9ddbe3af 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberMonthAchieveService.java @@ -2,22 +2,13 @@ package com.hzs.member.achieve.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve; -import com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt; -import com.hzs.member.achieve.controller.vo.ParentAchieveVO; import com.hzs.member.achieve.controller.vo.RealPerformanceVo; -import java.util.List; - /** * 会员月数据 服务类 */ public interface ICuMemberMonthAchieveService extends IService { - /** - * 根据条件查询会员月业绩 - */ - List queryCuMemberMonthAchieveRecommend(ParentAchieveVO parentAchieveVO); - /** * 查询会员真实业绩 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java index 9e35715d..a4ec7de8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java @@ -1,73 +1,21 @@ package com.hzs.member.achieve.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.HonorWallType; -import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.common.domain.member.ext.CuMemberMonthAchieveExt; -import com.hzs.member.achieve.controller.vo.ParentAchieveVO; import com.hzs.member.achieve.controller.vo.RealPerformanceVo; import com.hzs.member.achieve.mapper.CuMemberMonthAchieveMapper; import com.hzs.member.achieve.service.ICuMemberMonthAchieveService; -import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; - /** * 会员月数据 服务实现类 */ @Service public class CuMemberMonthAchieveServiceImpl extends ServiceImpl implements ICuMemberMonthAchieveService { - @Autowired - private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; - - @Override - public List queryCuMemberMonthAchieveRecommend(ParentAchieveVO parentAchieveVO) { - packageParamPeriod(parentAchieveVO); - return baseMapper.queryCuMemberMonthAchieveRecommend(parentAchieveVO); - } - - private void packageParamPeriod(ParentAchieveVO parentAchieveVO) { - Date settleDate = DateUtils.currentDate(); - if (Objects.equals(HonorWallType.RECOMMEND_MONTH.getValue(), parentAchieveVO.getWallType()) || - Objects.equals(HonorWallType.ANTIFADING_MONTH.getValue(), parentAchieveVO.getWallType())) { - //1号取上月的 - // 月 - Date date = DateUtils.currentMonthFirstDate(settleDate); - if (DateUtils.compareDateEqual(settleDate, date)) { - // 取上月第一天 - date = DateUtils.beforeMonthFirstDate(settleDate); - } - String currentMonthDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); - CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(currentMonthDate); - parentAchieveVO.setStartPeriod(cuMemberSettlePeriod.getPkId()); - parentAchieveVO.setEndPeriod(cuMemberSettlePeriod.getPkId()); - } else { - // 季度 - // 上月期间，作为结束期间 - String beforeFirstMonthDate = DateUtils.beforeMonthFirstDateStr(settleDate); - CuMemberSettlePeriod beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeFirstMonthDate); - parentAchieveVO.setEndPeriod(beforePeriod.getPkId()); - if (Objects.equals(HonorWallType.RECOMMEND_QUARTER.getValue(), parentAchieveVO.getWallType()) || - Objects.equals(HonorWallType.ANTIFADING_QUARTER.getValue(), parentAchieveVO.getWallType())) { - // 3个月期间，作为开始期间 - String quarterFirstMonthDate = DateUtils.beforeMonthFirstDateStr(3, settleDate); - CuMemberSettlePeriod quarterPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(quarterFirstMonthDate); - parentAchieveVO.setStartPeriod(quarterPeriod.getPkId()); - } else { - String yearFirstMonthDate = DateUtils.beforeMonthFirstDateStr(12, settleDate); - CuMemberSettlePeriod yearPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yearFirstMonthDate); - parentAchieveVO.setStartPeriod(yearPeriod.getPkId()); - } - } - } - @Override public RealPerformanceVo queryCuMemberMonthAchieveInfo(Long pkMember, String achieveTable) { return baseMapper.queryCuMemberMonthAchieveInfo(pkMember, achieveTable); } + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index 87055001..1e0a80bc 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -2,8 +2,6 @@ package com.hzs.member.base.controller.api; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; @@ -19,7 +17,6 @@ import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.detail.CuMemberChangeLog; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; import com.hzs.member.base.param.ForgetPasswordParam; import com.hzs.member.base.param.MemberDataParam; @@ -27,9 +24,8 @@ import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.base.service.IMemberInfoService; import com.hzs.common.core.utils.UploadFileUtil; import com.hzs.member.base.vo.*; -import com.hzs.member.sms.service.IApiCodeService; +import com.hzs.member.sms.service.IApiAliSmsService; import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.config.dto.GradeDTO; import lombok.extern.slf4j.Slf4j; @@ -39,7 +35,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; -import java.math.BigDecimal; import java.util.*; /** @@ -50,33 +45,15 @@ import java.util.*; @RestController public class ApiMemberController extends BaseController { - @Autowired - private ITransactionCommonService iTransactionCommonService; @Autowired private IMemberInfoService iMemberInfoService; @Autowired private ICuMemberService iCuMemberService; @Autowired - private IApiCodeService iApiCodeService; + private IApiAliSmsService iApiAliSmsService; @DubboReference - IGradeServiceApi gradeServiceApi; - @DubboReference - ICurrencyServiceApi currencyServiceApi; - -// /** -// * 获取登录会员信息 -// * -// * @return -// */ -// @GetMapping("/get-info") -// public AjaxResult getInfo() { -// MemberInfoVO memberInfo = iMemberInfoService.getMemberInfo(SecurityUtils.getUserId()); -// if (null == memberInfo) { -// return AjaxResult.error(); -// } -// return AjaxResult.success(memberInfo); -// } + IGradeServiceApi iGradeServiceApi; /** * 更新个人资料（昵称） @@ -261,7 +238,7 @@ public class ApiMemberController extends BaseController { Long memberId = cuMemberExt.getPkId(); // 校验短信验证码是否有效 - String checkSmsStr = iApiCodeService.checkRecoverCode(param.getPhone(), param.getCode()); + String checkSmsStr = iApiAliSmsService.checkRecoverCode(param.getPhone(), param.getCode(), cuMemberExt.getPkId()); if (null != checkSmsStr) { return AjaxResult.error(checkSmsStr); } @@ -306,7 +283,7 @@ public class ApiMemberController extends BaseController { Long memberId = cuMemberExt.getPkId(); // 校验短信验证码是否有效 - String checkSmsStr = iApiCodeService.checkPayPasswordCode(cuMemberExt.getPhone(), param.getCode()); + String checkSmsStr = iApiAliSmsService.checkPayPasswordCode(cuMemberExt.getPhone(), param.getCode(), cuMemberExt.getPkId()); if (null != checkSmsStr) { return AjaxResult.error(checkSmsStr); } @@ -363,11 +340,6 @@ public class ApiMemberController extends BaseController { public TableDataInfo parentList(String memberCode, String memberName, Date startCreateTime, Date endCreateTime, String memberInfo) { Long memberId = SecurityUtils.getUserId(); - // 查询等级 - Integer pkCountry = SecurityUtils.getPkCountry(); - R> grderDate = gradeServiceApi.findAll(); - List grderList = grderDate.getData(); - if (endCreateTime != null) { endCreateTime = DateUtils.getEndTime(endCreateTime); } @@ -376,27 +348,20 @@ public class ApiMemberController extends BaseController { List list = iCuMemberService.parentList(memberId, memberCode, memberName, startCreateTime, endCreateTime, memberInfo); if (CollectionUtil.isNotEmpty(list)) { - Map transactionMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - BigDecimal inExchangeRate = currency.getData().getInExchangeRate(); - + R> gradeData = iGradeServiceApi.findAll(); + List gradeList = gradeData.getData(); for (ParentMemberVo cuMember : list) { cuMember.setMemberCode(cuMember.getMemberCode()); cuMember.setMemberName(cuMember.getMemberName()); - for (GradeDTO gradeDTO : grderList) { + for (GradeDTO gradeDTO : gradeList) { if (gradeDTO.getPkId().equals(cuMember.getPkRegisterGrade())) { - cuMember.setPkRegisterGradeStr(transactionMap.get(gradeDTO.getPkTransaction())); + cuMember.setPkRegisterGradeStr(gradeDTO.getGradeName()); } } - for (GradeDTO gradeDTO : grderList) { + for (GradeDTO gradeDTO : gradeList) { if (gradeDTO.getPkId().equals(cuMember.getPkSettleGrade())) { - cuMember.setPkSettleGradeStr(transactionMap.get(gradeDTO.getPkTransaction())); - } - } - if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - if (cuMember.getConsumeAchieve() != null) { - cuMember.setConsumeAchieve(cuMember.getConsumeAchieve().multiply(inExchangeRate)); + cuMember.setPkSettleGradeStr(gradeDTO.getGradeName()); } } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index aebc1300..8afecaf7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -3,16 +3,12 @@ package com.hzs.member.base.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64Encoder; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdcardUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.ColumnAuthority; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.constant.TableNameConstants; import com.hzs.common.core.constant.VertexConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; @@ -23,9 +19,6 @@ import com.hzs.common.core.utils.poi.ExcelUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.member.account.CuMemberTransfer; -import com.hzs.common.domain.member.account.CuMemberWithdraw; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.system.config.BdAwards; @@ -62,7 +55,6 @@ import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.util.*; -import java.util.regex.Pattern; import java.util.stream.Collectors; @RequestMapping("/manager/member") @@ -70,17 +62,7 @@ import java.util.stream.Collectors; public class CuMemberController extends BaseController { @Autowired - private ICuMemberWithdrawService memberWithdrawService; - @Autowired - private ICuMemberSettlePeriodService memberSettlePeriodService; - @Autowired - private ICuMemberTransferService memberTransferService; - @Autowired - private ICuMemberService cuMemberService; - @Autowired - private ICuMemberTeamService memberTeamService; - @Autowired - private ICuMemberTreeService memberTreeService; + private ICuMemberService iCuMemberService; @Autowired private ITransactionCommonService iTransactionCommonService; @Autowired @@ -95,15 +77,13 @@ public class CuMemberController extends BaseController { @DubboReference IGradeServiceApi iGradeServiceApi; @DubboReference - IAreaServiceApi iAreaServiceApi; - @DubboReference ICurrencyServiceApi iCurrencyServiceApi; @DubboReference IMenuColumnServiceApi iMenuColumnServiceApi; @Autowired - public void setCuMemberService(ICuMemberService cuMemberService) { - this.cuMemberService = cuMemberService; + public void setCuMemberService(ICuMemberService iCuMemberService) { + this.iCuMemberService = iCuMemberService; } @@ -167,17 +147,12 @@ public class CuMemberController extends BaseController { /** * 真实信息 - * - * @author: zhang jing - * @date: 2022/11/15 17:59 - * @param: [memberParam] - * @return: com.hzs.common.core.web.page.TableDataInfo **/ @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.MEMBER_INFO_REAL, method = EOperationMethod.SELECT) @PostMapping("/real-member") public TableDataInfo realMember(@RequestBody CuMemberVO memberParam) { memberParam.setPkCountry(SecurityUtils.getPkCountry()); - List cuMemberVOS = cuMemberService.realCuMemberByCondition(memberParam); + List cuMemberVOS = iCuMemberService.realCuMemberByCondition(memberParam); if (CollectionUtil.isNotEmpty(cuMemberVOS)) { for (CuMemberVO cvo : cuMemberVOS) { if (cvo.getSex() == ESex.MAN.getValue()) { @@ -189,18 +164,6 @@ public class CuMemberController extends BaseController { if (cvo.getCardType() == ECardType.CARD.getValue()) { cvo.setCardTypeVal(ECardType.CARD.getLabel()); } - if (cvo.getCardType() == ECardType.OFFICER.getValue()) { - cvo.setCardTypeVal(ECardType.OFFICER.getLabel()); - } - if (cvo.getCardType() == ECardType.STUDENT.getValue()) { - cvo.setCardTypeVal(ECardType.STUDENT.getLabel()); - } - if (cvo.getCardType() == ECardType.DRIVE.getValue()) { - cvo.setCardTypeVal(ECardType.DRIVE.getLabel()); - } - if (cvo.getCardType() == ECardType.PASSPORT.getValue()) { - cvo.setCardTypeVal(ECardType.PASSPORT.getLabel()); - } } } return getDataTable(cuMemberVOS); @@ -208,15 +171,10 @@ public class CuMemberController extends BaseController { /** * 根据会员编号查询会员信息 - * - * @author: zhang jing - * @date: 2022/11/9 18:25 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult **/ @GetMapping("/getOne/{memberCode}") public AjaxResult getOne(@PathVariable String memberCode) { - CuMember cuMember = cuMemberService.getMember(memberCode); + CuMember cuMember = iCuMemberService.getMember(memberCode); return AjaxResult.success(cuMember); } @@ -275,7 +233,7 @@ public class CuMemberController extends BaseController { * @param param */ private void handleMemberSelect(List resultList, MemberSelectParam param) { - List cuMemberExtList = cuMemberService.queryMemberSelect(param, SecurityUtils.getPkCountry()); + List cuMemberExtList = iCuMemberService.queryMemberSelect(param, SecurityUtils.getPkCountry()); if (CollectionUtil.isNotEmpty(cuMemberExtList)) { for (CuMemberExt cuMemberExt : cuMemberExtList) { MemberSelectVO memberSelectVO = BeanUtil.copyProperties(cuMemberExt, MemberSelectVO.class); @@ -305,41 +263,17 @@ public class CuMemberController extends BaseController { UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); memberRealInfoParam.setVertexList(userAuthorityDTO.getUserVertexList()); memberRealInfoParam.setTeamList(userAuthorityDTO.getUserTeamList()); - if (StringUtils.isNotEmpty(memberRealInfoParam.getBirthDate())) { - memberRealInfoParam.setBirthDate(memberRealInfoParam.getBirthDate().replace("-", "")); - } startPage(); - List resultList = cuMemberService.selectByMemberRealInfo(memberRealInfoParam); - + List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); if (CollectionUtil.isNotEmpty(resultList)) { - //数据库内容翻译 - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, - EnumsPrefixConstants.KEY_AWARD); - - R> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); // 奖衔 + R> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); List awardsList = awardsListDate.getData(); - R> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); // 等级 + R> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); List gradeList = gradeListDate.getData(); - Map areaDate = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); for (MemberRealInfoVO cuMemberExt : resultList) { - cuMemberExt.setRegisterGradeVal(transactionMap1.get(cuMemberExt.getPkRegisterGrade())); - cuMemberExt.setSettleGradeVal(transactionMap1.get(cuMemberExt.getPkSettleGrade())); - cuMemberExt.setAwardsVal(transactionMap1.get(cuMemberExt.getPkAwards())); - if (cuMemberExt.getPkProvince() != null) { - // 省 - cuMemberExt.setProvinceName(areaDate.get(cuMemberExt.getPkProvince())); - } - if (cuMemberExt.getPkCity() != null) { - // 市 - cuMemberExt.setCityName(areaDate.get(cuMemberExt.getPkCity())); - } - if (cuMemberExt.getPkCounty() != null) { - // 区县 - cuMemberExt.setCountyName(areaDate.get(cuMemberExt.getPkCounty())); - } // 注册等级 if (cuMemberExt.getPkRegisterGrade() != null) { for (GradeDTO grade : gradeList) { @@ -364,215 +298,15 @@ public class CuMemberController extends BaseController { } } } - // 生日 - if (StringUtils.isNotBlank(cuMemberExt.getIdCard()) && (checkIdCard(cuMemberExt.getIdCard()))) { - cuMemberExt.setBirthDate(IdcardUtil.getBirthDate(cuMemberExt.getIdCard())); - } - if (cuMemberExt.getIdType() != null) { - cuMemberExt.setCardTypeVal(EIdType.getLabel(cuMemberExt.getIdType())); - } + cuMemberExt.setCardTypeVal(EIdType.getLabelByValue(cuMemberExt.getIdType())); + cuMemberExt.setSexVal(ESex.getLabelByValue(cuMemberExt.getSex())); } } - return getDataTable(resultList); } - - /** - * 会员团队信息 - * - * @return - */ - @AccessPermissions("TeamInfo") - @GetMapping("/member-team-info") - public TableDataInfo memberTeamInfo(MemberTeamInfoParam memberTeamInfoParam) { - String time; - String settleTableName; - CuMemberSettlePeriod csPeriod; - List memberTeamList = new ArrayList<>(); - R> awardsDto = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); - if (memberTeamInfoParam.getQueryDate() == null) { - // 昨日 - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtil.offsetDay(new Date(), -1)); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - String queryDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate()); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (queryDate.equals(currentDate)) { - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - // 历史 - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } - } - // 如果表格不存在则返回空数据 - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); - if (tableNumber == null || tableNumber == 0) { - return getDataTable(new ArrayList<>()); - } - memberTeamInfoParam.setSettleTableName(settleTableName); - memberTeamInfoParam.setPeriod(csPeriod.getPkId()); - startPage(); - if (StringUtils.isNotBlank(memberTeamInfoParam.getMemberCode())) { - if (memberTeamInfoParam.getRelaType() != null && memberTeamInfoParam.getRelaType().equals(ERealType.XY.getIntValue())) { - // 血缘 - memberTeamList = memberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); - } else { - // 安置 - memberTeamList = memberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); - } - } - for (MemberTeamVo memberTeamVo : memberTeamList) { - // 查询安置层级 - if (memberTeamVo.getPlaceDept() != null) { - memberTeamVo.setPlaceDept(memberTeamVo.getPlaceDept()); - memberTeamVo.setPlaceDeptStr(EPlaceDept.getEPlaceDept(memberTeamVo.getPlaceDept())); - } - if (memberTeamVo.getPkAwards() != null) { - for (BdAwards date : awardsDto.getData()) { - if (memberTeamVo.getPkAwards().equals(date.getPkId())) { - memberTeamVo.setPkAwardsStr(date.getAwardsName()); - } - } - } - if (memberTeamVo.getPkPlaceParent() != null) { - CuMember member = cuMemberService.getMember(memberTeamVo.getPkPlaceParent()); - if (member != null) { - memberTeamVo.setPlaceParentCode(member.getMemberCode()); - } - } - memberTeamVo.setResettleLevel(memberTeamVo.getLevel()); - //TODO 血缘代数 - memberTeamVo.setConsanguinityAlgebra("第" + memberTeamVo.getLevel() + "代"); - //TODO 奖金大盘占比 - memberTeamVo.setBonusLargeMarketProportion(BigDecimal.ZERO); - // 直推人数 - Long directPushPeopleNumber = memberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); - memberTeamVo.setDirectPushPeopleNumber(directPushPeopleNumber); - // 转账次数 - LambdaQueryWrapper qew = new LambdaQueryWrapper<>(); - qew.eq(CuMemberTransfer::getPkMember, memberTeamVo.getMemberId()); - int memberTransferCount = memberTransferService.count(qew); - memberTeamVo.setMemberTransferCount(memberTransferCount); - - // 提现次数 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberWithdraw::getPkMember, memberTeamVo.getMemberId()); - int memberWithdrawCount = memberWithdrawService.count(queryWrapper); - memberTeamVo.setWithdrawalNumber(memberWithdrawCount); - // 最后一次登录时间 - if (memberTeamVo.getLastLoginTime() != null) { - // 计算当前时间和 最后一次登陆时间间隔 - memberTeamVo.setLastLoginTimeIntervalDays(DateUtil.betweenDay(DateUtils.currentDate(), memberTeamVo.getLastLoginTime(), true)); - } - } - return getDataTable(memberTeamList); - } - - /** - * 会员团队信息导出 - */ - @PostMapping("/member-team-info-export") - public void memberTeamInfoExport(MemberTeamInfoParam memberTeamInfoParam, HttpServletResponse response) { - String time; - String settleTableName; - CuMemberSettlePeriod csPeriod; - List memberTeamList = new ArrayList<>(); - R> awardsDto = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); - if (memberTeamInfoParam.getQueryDate() == null) { - // 昨日 - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtil.offsetDay(new Date(), -1)); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - String queryDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - String currentDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.currentDate()); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, memberTeamInfoParam.getQueryDate()); - csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (queryDate.equals(currentDate)) { - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } else { - // 历史 - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + csPeriod.getPkId(); - } - } - // 如果表格不存在则返回空数据 - Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); - if (tableNumber == null || tableNumber == 0) { - ExcelUtil util = new ExcelUtil<>(MemberTeamVo.class); - util.exportExcel(response, memberTeamList, "会员团队信息"); - } - memberTeamInfoParam.setSettleTableName(settleTableName); - memberTeamInfoParam.setPeriod(csPeriod.getPkId()); - startPage(); - if (StringUtils.isNotBlank(memberTeamInfoParam.getMemberCode())) { - if (memberTeamInfoParam.getRelaType() != null && memberTeamInfoParam.getRelaType().equals(ERealType.XY.getIntValue())) { - // 血缘 - memberTeamList = memberTeamService.queryMemberTeamInfoList(memberTeamInfoParam); - } else { - // 安置 - memberTeamList = memberTeamService.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); - } - } - for (MemberTeamVo memberTeamVo : memberTeamList) { - // 查询安置层级 - if (memberTeamVo.getPlaceDept() != null) { - memberTeamVo.setPlaceDept(memberTeamVo.getPlaceDept()); - memberTeamVo.setPlaceDeptStr(EPlaceDept.getEPlaceDept(memberTeamVo.getPlaceDept())); - } - if (memberTeamVo.getPkAwards() != null) { - for (BdAwards date : awardsDto.getData()) { - if (memberTeamVo.getPkAwards().equals(date.getPkId())) { - memberTeamVo.setPkAwardsStr(date.getAwardsName()); - } - } - } - if (memberTeamVo.getPkPlaceParent() != null) { - CuMember member = cuMemberService.getMember(memberTeamVo.getPkPlaceParent()); - if (member != null) { - memberTeamVo.setPlaceParentCode(member.getMemberCode()); - } - } - memberTeamVo.setResettleLevel(memberTeamVo.getLevel()); - //血缘代数 - memberTeamVo.setConsanguinityAlgebra("第" + memberTeamVo.getLevel() + "代"); - //奖金大盘占比 - memberTeamVo.setBonusLargeMarketProportion(BigDecimal.ZERO); - // 直推人数 - Long directPushPeopleNumber = memberTreeService.queryCuMemberTreeParentTableCount(settleTableName, memberTeamVo.getMemberId()); - memberTeamVo.setDirectPushPeopleNumber(directPushPeopleNumber); - // 转账次数 - LambdaQueryWrapper qew = new LambdaQueryWrapper<>(); - qew.eq(CuMemberTransfer::getPkMember, memberTeamVo.getMemberId()); - int memberTransferCount = memberTransferService.count(qew); - memberTeamVo.setMemberTransferCount(memberTransferCount); - - // 提现次数 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberWithdraw::getPkMember, memberTeamVo.getMemberId()); - int memberWithdrawCount = memberWithdrawService.count(queryWrapper); - memberTeamVo.setWithdrawalNumber(memberWithdrawCount); - // 最后一次登录时间 - if (memberTeamVo.getLastLoginTime() != null) { - // 计算当前时间和 最后一次登陆时间间隔 - memberTeamVo.setLastLoginTimeIntervalDays(DateUtil.betweenDay(DateUtils.currentDate(), memberTeamVo.getLastLoginTime(), true)); - } - } - ExcelUtil util = new ExcelUtil<>(MemberTeamVo.class, iMenuColumnServiceApi.queryMenuColumn("TeamInfo", SecurityUtils.getUserId()).getData()); - util.exportExcel(response, memberTeamList, "会员团队信息"); - } - - /** * 导出真实信息 - * - * @author: zhang jing - * @date: 2023/7/15 17:02 - * @param: [response, memberRealInfoParam] - * @return: void **/ @Log(module = EOperationModule.MEMBER_INFORMATION, business = EOperationBusiness.MEMBER_INFORMATION, method = EOperationMethod.EXPORT) @PostMapping("/real-info-export") @@ -584,50 +318,51 @@ public class CuMemberController extends BaseController { UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); memberRealInfoParam.setVertexList(userAuthorityDTO.getUserVertexList()); memberRealInfoParam.setTeamList(userAuthorityDTO.getUserTeamList()); - List resultList = cuMemberService.selectByMemberRealInfo(memberRealInfoParam); + List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); if (CollectionUtil.isNotEmpty(resultList)) { - // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(ECardType.values(), - ESex.values() - ); - //数据库内容翻译 - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, - EnumsPrefixConstants.KEY_AWARD); + // 奖衔 + R> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); + List awardsList = awardsListDate.getData(); + // 等级 + R> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); + List gradeList = gradeListDate.getData(); - Map areaDate = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); for (MemberRealInfoVO cuMemberExt : resultList) { - cuMemberExt.setRegisterGradeVal(transactionMap1.get(cuMemberExt.getPkRegisterGrade())); - cuMemberExt.setSettleGradeVal(transactionMap1.get(cuMemberExt.getPkSettleGrade())); - cuMemberExt.setAwardsVal(transactionMap1.get(cuMemberExt.getPkAwards())); - cuMemberExt.setPkMaxAwardsVal(transactionMap1.get(cuMemberExt.getPkMaxAwards())); - if (cuMemberExt.getPkProvince() != null) { - // 省 - cuMemberExt.setProvinceName(areaDate.get(cuMemberExt.getPkProvince())); + // 注册等级 + if (cuMemberExt.getPkRegisterGrade() != null) { + for (GradeDTO grade : gradeList) { + if (grade.getPkId().equals(cuMemberExt.getPkRegisterGrade())) { + cuMemberExt.setRegisterGradeVal(grade.getGradeName()); + } + } } - if (cuMemberExt.getPkCity() != null) { - // 市 - cuMemberExt.setCityName(areaDate.get(cuMemberExt.getPkCity())); + // 结算等级 + if (cuMemberExt.getPkSettleGrade() != null) { + for (GradeDTO grade : gradeList) { + if (grade.getPkId().equals(cuMemberExt.getPkSettleGrade())) { + cuMemberExt.setSettleGradeVal(grade.getGradeName()); + } + } } - if (cuMemberExt.getPkCounty() != null) { - // 区县 - cuMemberExt.setCountyName(areaDate.get(cuMemberExt.getPkCounty())); + // 真实奖衔 + if (cuMemberExt.getPkAwards() != null) { + for (BdAwards awards : awardsList) { + if (awards.getPkId().equals(cuMemberExt.getPkAwards())) { + cuMemberExt.setAwardsVal(awards.getAwardsName()); + } + } } - // 证件类型 - if (cuMemberExt.getCardType() != null) { - cuMemberExt.setCardTypeVal(transactionMap.get(EnumsPrefixConstants.CARD_TYPE + cuMemberExt.getCardType())); - } - // 性别 - if (cuMemberExt.getSex() != null) { - cuMemberExt.setSexVal(transactionMap.get(EnumsPrefixConstants.SEX + cuMemberExt.getSex())); - } - // 生日 - if (StringUtils.isNotBlank(cuMemberExt.getIdCard()) && (checkIdCard(cuMemberExt.getIdCard()))) { - cuMemberExt.setBirthDate(IdcardUtil.getBirthDate(cuMemberExt.getIdCard())); - } - if (cuMemberExt.getIdType() != null) { - cuMemberExt.setCardTypeVal(EIdType.getLabel(cuMemberExt.getIdType())); + // 真实奖衔 + if (cuMemberExt.getPkMaxAwards() != null) { + for (BdAwards awards : awardsList) { + if (awards.getPkId().equals(cuMemberExt.getPkMaxAwards())) { + cuMemberExt.setAwardsVal(awards.getAwardsName()); + } + } } + cuMemberExt.setCardTypeVal(EIdType.getLabelByValue(cuMemberExt.getIdType())); + cuMemberExt.setSexVal(ESex.getLabelByValue(cuMemberExt.getSex())); } } ExcelUtil util = new ExcelUtil<>(MemberRealInfoVO.class, iMenuColumnServiceApi.queryMenuColumn("RealInfo", SecurityUtils.getUserId()).getData()); @@ -649,21 +384,6 @@ public class CuMemberController extends BaseController { util.exportExcel(response, list, "会员编号"); } - - /** - * 校验身份证格式 - * - * @author: zhang jing - * @date: 2023/10/17 14:10 - * @param: [idCard] - * @return: boolean - **/ - public boolean checkIdCard(String idCard) { - // 正则表达式校验身份证号码格式 - String reg = "\\d{17}[\\d|x|X]"; - return Pattern.matches(reg, idCard); - } - /** * 查询顶点会员 * @@ -672,7 +392,7 @@ public class CuMemberController extends BaseController { @GetMapping("/query-top-member") public AjaxResult queryTopMember() { List resultList = new ArrayList<>(); - List list = cuMemberService.queryPlaceMemberList(VertexConstants.GJ30720200CODE, SecurityUtils.getPkCountry()); + List list = iCuMemberService.queryPlaceMemberList(VertexConstants.GJ30720200CODE, SecurityUtils.getPkCountry()); if (CollectionUtil.isNotEmpty(list)) { resultList = BeanUtil.copyToList(list, TopMemberVO.class); } @@ -700,7 +420,7 @@ public class CuMemberController extends BaseController { BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); startPage(); memberConsumptionStatParam.setPkCountry(SecurityUtils.getPkCountry()); - List memberConsumptionStatVoList = cuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); + List memberConsumptionStatVoList = iCuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); for (MemberConsumptionStatVo memberConsumptionStatVo : memberConsumptionStatVoList) { memberConsumptionStatVo.setOrderAchieve(memberConsumptionStatVo.getOrderAchieve().multiply(chinaInExchangeRate).setScale(2, BigDecimal.ROUND_HALF_UP)); } @@ -728,7 +448,7 @@ public class CuMemberController extends BaseController { R chinaCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY); BigDecimal chinaInExchangeRate = chinaCurrency.getData().getInExchangeRate(); memberConsumptionStatParam.setPkCountry(SecurityUtils.getPkCountry()); - List memberConsumptionStatVoList = cuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); + List memberConsumptionStatVoList = iCuMemberService.getMemberConsumptionStat(memberConsumptionStatParam); for (MemberConsumptionStatVo memberConsumptionStatVo : memberConsumptionStatVoList) { memberConsumptionStatVo.setOrderAchieve(memberConsumptionStatVo.getOrderAchieve().multiply(chinaInExchangeRate).setScale(2, BigDecimal.ROUND_HALF_UP)); } @@ -743,7 +463,7 @@ public class CuMemberController extends BaseController { @GetMapping("/member_awards_query") public TableDataInfo memberAwardsQuery(MemberAwardsQueryParam param) { startPage(); - List memberAwardsList = cuMemberService.listMemberAwards(param, SecurityUtils.getPkCountry()); + List memberAwardsList = iCuMemberService.listMemberAwards(param, SecurityUtils.getPkCountry()); if (CollectionUtil.isNotEmpty(memberAwardsList)) { // 中国汇率 CurrencyDTO currency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY).getData(); @@ -767,7 +487,7 @@ public class CuMemberController extends BaseController { */ @PostMapping("/member_awards_query_export") public void memberAwardsQueryExport(MemberAwardsQueryParam param, HttpServletResponse response) { - List memberAwardsList = cuMemberService.listMemberAwards(param, SecurityUtils.getPkCountry()); + List memberAwardsList = iCuMemberService.listMemberAwards(param, SecurityUtils.getPkCountry()); if (CollectionUtil.isNotEmpty(memberAwardsList)) { // 中国汇率 CurrencyDTO currency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY).getData(); @@ -848,7 +568,7 @@ public class CuMemberController extends BaseController { memberParam.setTeamList(userAuthorityDTO.getUserTeamList()); startPage(); - List cuMemberVOList = cuMemberService.retailMemberList(memberParam); + List cuMemberVOList = iCuMemberService.retailMemberList(memberParam); if (CollectionUtil.isNotEmpty(cuMemberVOList)) { // 获取需要翻译的枚举翻译 @@ -963,7 +683,7 @@ public class CuMemberController extends BaseController { memberParam.setVertexList(userAuthorityDTO.getUserVertexList()); memberParam.setTeamList(userAuthorityDTO.getUserTeamList()); - List cuMemberVOList = cuMemberService.retailMemberList(memberParam); + List cuMemberVOList = iCuMemberService.retailMemberList(memberParam); if (CollectionUtil.isNotEmpty(cuMemberVOList)) { // 获取需要翻译的枚举翻译 @@ -1035,14 +755,13 @@ public class CuMemberController extends BaseController { */ @GetMapping("/copy-pwd") public AjaxResult copyPwd(@RequestParam Long pkId) { - CuMember cuMember = cuMemberService.getOne(Wrappers.lambdaQuery() + CuMember cuMember = iCuMemberService.getOne(Wrappers.lambdaQuery() .eq(CuMember::getPkId, pkId) ); String tmpPwd = DateUtils.parseDateToFormat(DateUtils.MM_DD, new Date()) + cuMember.getLoginPassword(); return AjaxResult.success("", Base64Encoder.encode(tmpPwd.getBytes(StandardCharsets.UTF_8))); } - /** * 查询会员信息 * @@ -1054,7 +773,7 @@ public class CuMemberController extends BaseController { if (StringUtils.isEmpty(param.getMemberCode())) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); } - CuMember cuMember = cuMemberService.getMember(param.getMemberCode()); + CuMember cuMember = iCuMemberService.getMember(param.getMemberCode()); if (cuMember == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java index f4bf82c7..1cf7266e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberTeamMapper.java @@ -3,9 +3,6 @@ package com.hzs.member.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; -import com.hzs.common.domain.vertex.BdVertex; -import com.hzs.member.base.param.MemberTeamInfoParam; -import com.hzs.member.base.vo.MemberTeamVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,22 +14,6 @@ public interface CuMemberTeamMapper extends BaseMapper { List queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt); - /** - * 查询会员团队信息 - * - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam); - - /** - * 查询会员安置团队信息 - * - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam); - /** * 更新团队为空 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java index 95d0efa0..51f111d2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberRealInfoParam.java @@ -1,26 +1,9 @@ -package com.hzs.member.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/4/26 10:08 - * @Classname: MemberRealInfo - * @PackageName: com.hzs.member.base.param - */ +package com.hzs.member.base.param; -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import java.util.Date; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-04-26 10:08 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberRealInfoParam { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java index 58de2209..d1dac6a9 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberTeamInfoParam.java @@ -1,24 +1,10 @@ -package com.hzs.member.base.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/29 14:53 - * @Classname: MemberTeamInfoParam - * @PackageName: com.hzs.member.base.param - */ +package com.hzs.member.base.param; import lombok.Data; import java.math.BigDecimal; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.param - *@Author: yh - *@CreateTime: 2023-05-29 14:53 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberTeamInfoParam { @@ -40,7 +26,7 @@ public class MemberTeamInfoParam { /** * 会员编号 */ - private String memberCode ; + private String memberCode; /** * 真实奖衔 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java index 5964e3ff..c3e395b7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberTeamService.java @@ -3,8 +3,6 @@ package com.hzs.member.base.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; -import com.hzs.member.base.param.MemberTeamInfoParam; -import com.hzs.member.base.vo.MemberTeamVo; import java.util.List; @@ -41,22 +39,6 @@ public interface ICuMemberTeamService extends IService { **/ void updateCuMemberTeamByVertex(Long pkTeamCode); - /** - * 查询会员团队信息 - * - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam); - - /** - * 查询会员安置信息团队 - * - * @param memberTeamInfoParam - * @return - */ - List queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam); - /** * 查询刷新团队数据 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 4a519ae5..8e5aa9c8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -2361,13 +2361,14 @@ public class CuMemberServiceImpl extends ServiceImpl i @Override public boolean updateMemberNameAndPhone(Long pkMember, String memberName, String phone, Long pkModified) { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(CuMember::getMemberName, memberName); - updateWrapper.set(CuMember::getPhone, phone); - updateWrapper.set(CuMember::getPkModified, pkModified); - updateWrapper.set(CuMember::getModifiedTime, new Date()); - updateWrapper.eq(CuMember::getPkId, pkMember); - return update(updateWrapper); + CuMember cuMember = new CuMember(); + cuMember.setPkId(pkMember); + cuMember.setMemberName(memberName); + cuMember.setPhone(phone); + cuMember.setBirthDate(null); + cuMember.setPkModified(pkModified); + cuMember.setModifiedTime(new Date()); + return updateById(cuMember); } @Override diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java index 332ce383..b45e29ac 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberTeamServiceImpl.java @@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.base.CuMemberTeam; import com.hzs.common.domain.member.ext.CuMemberTeamExt; import com.hzs.member.base.mapper.CuMemberTeamMapper; -import com.hzs.member.base.param.MemberTeamInfoParam; import com.hzs.member.base.service.ICuMemberTeamService; -import com.hzs.member.base.vo.MemberTeamVo; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -61,16 +59,6 @@ public class CuMemberTeamServiceImpl extends ServiceImpl queryMemberTeamInfoList(MemberTeamInfoParam memberTeamInfoParam) { - return baseMapper.queryMemberTeamInfoList(memberTeamInfoParam); - } - - @Override - public List queryMemberTeamInfoPlaceParentList(MemberTeamInfoParam memberTeamInfoParam) { - return baseMapper.queryMemberTeamInfoPlaceParentList(memberTeamInfoParam); - } - @Override public void flushAllTeam(Integer pkCountry) { List list = this.list(Wrappers.lambdaQuery() diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java deleted file mode 100644 index c9adcafc..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AccountPointOutVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.member.base.vo; - -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * - * 账户状态翻译 - * @Description: - * @Author: zhangjing - * @Time: 2023/2/4 14:56 - * @Classname: AccountPointOutVO - * @Package_name: com.hzs.member.base.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class AccountPointOutVO implements Serializable { - /** - * 账户状态 - */ - @Transaction(transactionKey = EnumsPrefixConstants.ACCOUNT_STATUS) - private Integer accountState; - - private String accountStateVal; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java deleted file mode 100644 index c572d65f..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/AgreementExpireVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.hzs.member.base.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Description: 服务有效期返回VO - * @Author: jiang chao - * @Time: 2024/1/15 14:08 - * @Classname: AgreementExpireVO - * @PackageName: com.hzs.member.base.vo - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class AgreementExpireVO { - - /** - * 提示标记（0=弹窗提示，1=不弹窗提示） - */ - private Integer promptFlag; - - /** - * 提示信息 - */ - private String promptMsg; - - /** - * 跳转页面（1=实名认证，2=续约专区） - */ - private Integer jumpPage; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java deleted file mode 100644 index d5cde18f..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuHonorWallVo.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.hzs.member.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/6/8 11:47 - * @Classname: CuHonorWallVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-06-08 11:47 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class CuHonorWallVo { - - /** - * 用户ID - */ - - private Long pkId; - - /** - * 类型 1 等级 2 奖衔 3 时长 4 推荐月 5 推荐季度 6 推荐年 7 抗衰月 8 抗衰季度 9 抗衰年 - */ - private Integer type; - - /** - * 类型 1 等级 2 奖衔 3 时长 4 推荐月 5 推荐季度 6 推荐年 7 抗衰月 8 抗衰季度 9 抗衰年 - */ - private String typeStr; - - private String name; - /** - * 类型属性值 - */ - private Integer value; - - /** - * 类型属性值 - */ - private String valueStr; - - /** - * 展示图片 - */ - - private String img; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - private String title; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java deleted file mode 100644 index cb098aba..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogParentVO.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.hzs.member.base.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import com.hzs.member.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - *

- * 注水业绩记录表VO - *

- * - * @author hzs - * @since 2022-08-22 - */ -@Data -public class CuMemberAchieveLogParentVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - /** - * 注水方式 EInfusingWaterType 1 增加 2减少 3 最终 - */ - private Integer infusingWaterType; - private BigDecimal aSumrealModifyPv; - private BigDecimal bSumrealModifyPv; - /** - * 注水备注 - */ - private String remarks; - - /** - * 业务单号 - */ - private String businessNo; - /** - * 审批业务类型 来源于枚举 EApprovalBusiness - */ - private Integer editType; - - /** - * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus - */ - private Integer approveStatus; - - - /** - * 流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） - */ - private Integer processType; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种类型 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种类型 - */ - private String pkAccountKeyVal; - /** - * 会员手续费 - */ - List memberAmountDTOList; - /** - * 错误信息 - */ - private String errorMasg; - /** - * 情况说明 - */ - private String remark; - - /** - * 业务涨及会员ID列表 --提交审核必传 - */ - private Set pkMemberList; - /** - * 期间 - */ - private Integer period; - /** - * 注水业绩记录 - */ - private List cmalvList; - /** - * 国家 - */ - private Integer pkCountry; - - - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java deleted file mode 100644 index f5b8182e..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DirectPushNewVo.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hzs.member.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/25 15:48 - * @Classname: DirectPushNewVo - * @PackageName: com.hzs.member.base.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-08-25 15:48 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class DirectPushNewVo { - - - /** - * 国旗 - */ - private String nationalFlag1; - - /** - * 国家名称 - */ - private String shortName; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员名称 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - /** - * 真实奖衔 - */ - private String awardsVal; - /** - * 隶属体系 - */ - private String vertexVal; - /** - * 隶属团队 - */ - private String teamCode; - /** - * 新增金额 - */ - private String consumeMoney; - - /** - * 新增业绩 - */ - private String consumeAchieve; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java deleted file mode 100644 index ab8036b6..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberChargingVo.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.hzs.member.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/3/29 9:04 - * @Classname: MemberChargingVo - * @PackageName: com.hzs.member.base.vo - */ - -import lombok.Data; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-03-29 09:04 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberChargingVo { - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 变更前推荐编号 - */ - private String editOldParentMemberCode; - /** - * 变更前推荐姓名 - */ - private String editOldParentMemberName; - - /** - * 变更后推荐编号 - */ - private String editNewParentMemberCode; - /** - * 变更后推荐姓名 - */ - private String editNewParentMemberName; - - - /** - * 扣款币种 - */ - private Integer pkAccount; - /** - * 币种名称 - */ - private String accountName; - /** - * 扣费金额 - */ - private BigDecimal accountAmount; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java deleted file mode 100644 index f254c73a..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberDirectPushVO.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.hzs.member.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/1/17 14:10 - * @Classname: MemberDirectPushVO - * @PackageName: com.hzs.member.base.vo - */ - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2024-01-17 14:10 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MemberDirectPushVO { - /** - * 统计时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "统计时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - /** - * 排名 - */ - @Excel(name = "排名") - private Integer ranking; - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员名称 - */ - @Excel(name = "会员名称") - private String memberName; - - /** - * 等级名称 - */ - @Excel(name = "结算等级") - private String gradeName; - /** - * 奖衔名称 - */ - @Excel(name = "真实奖衔") - private String awardsName; - - - - /** - * 会员头像 - */ - - private String headPath; - /** - * 订单达标业绩 - */ - @Excel(name = "直推业绩") - private BigDecimal orderAchieve; - /** - * 脱敏业绩 - */ - private String orderAchieveStr; - - /** - * 是否登录会员 对应 EyesNo 枚举 - */ - private Integer isLoginMember; - - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java index 8fdb1415..b239a937 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberRealInfoVO.java @@ -62,13 +62,11 @@ public class MemberRealInfoVO { /** * 证件类型 ECardType */ - @Transaction(transactionKey = EnumsPrefixConstants.CARD_TYPE) private Integer cardType; /** * 性别（0=未知,1=男,2=女）Esex */ - @Transaction(transactionKey = EnumsPrefixConstants.SEX) private Integer sex; /** @@ -325,53 +323,11 @@ public class MemberRealInfoVO { */ private String idBack; - /** - * 省id - */ - private Integer pkProvince; - /** - * 省名称 - */ - @Excel(name = "省", sort = 11) - private String provinceName; - /** - * 市id - */ - private Integer pkCity; - /** - * 市名称 - */ - @Excel(name = "市", sort = 12) - private String cityName; - /** - * 区县id - */ - private Integer pkCounty; - /** - * 区县名 - */ - @Excel(name = "区/县", sort = 13) - private String countyName; /** * 详细地址 */ @Excel(name = "详细地址", sort = 14) private String address; - /** - * 银行名称 - */ - @Excel(name = "银行名称", sort = 15) - private String bankName; - /** - * 支行名称 - */ - @Excel(name = "支行名称", sort = 16) - private String subBankName; - /** - * 真实姓名（开户姓名） - */ - @Excel(name = "开户姓名", sort = 17) - private String accountName; /** * 证件类型 字符 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java index ad4a6c43..70ce424d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamInfoVo.java @@ -4,14 +4,6 @@ import lombok.Data; import java.math.BigDecimal; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.member.base.vo - * @Author: yh - * @CreateTime: 2023-08-02 15:26 - * @Description: TODO - * @Version: 1.0 - */ @Data public class MemberTeamInfoVo { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java index 4be32f5e..25ab3035 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberTeamVo.java @@ -1,10 +1,4 @@ -package com.hzs.member.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/29 16:02 - * @Classname: MemberTeamVo - * @PackageName: com.hzs.member.base.vo - */ +package com.hzs.member.base.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.core.annotation.Excel; @@ -13,14 +7,6 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2023-05-29 16:02 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberTeamVo { @@ -130,7 +116,7 @@ public class MemberTeamVo { private BigDecimal consanguinityRepBSumPv; /** - *左区真实业绩(PV) + * 左区真实业绩(PV) */ @Excel(name = "左区真实业绩($)") private BigDecimal aSumRealPv; @@ -150,13 +136,13 @@ public class MemberTeamVo { /** * 奖金收益 */ - // @Excel(name = "奖金收益($)") + // @Excel(name = "奖金收益($)") private BigDecimal realIncomeTotal; /** * 奖金团队占比 */ - @Excel(name = "奖金团队占比(%)",suffix = "%") + @Excel(name = "奖金团队占比(%)", suffix = "%") private BigDecimal bonusTeamProportion; /** @@ -244,32 +230,32 @@ public class MemberTeamVo { /** * 登录次数 */ - // @Excel(name = "登录次数") + // @Excel(name = "登录次数") private Integer loginNumber; /** * 最后一次登录时间 */ - @Excel(name = "最近登录",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "最近登录", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date lastLoginTime; /** * 最后一次登录时间间隔天数 */ - // @Excel(name = "最后一次登录时间间隔天数") + // @Excel(name = "最后一次登录时间间隔天数") private Long lastLoginTimeIntervalDays; /** * 创建时间 */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; /** * 支付时间 */ - @Excel(name = "支付时间",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java deleted file mode 100644 index 80119160..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/TheLableVO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hzs.member.base.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; - -/** - * @Description: 列表筛选显现隐藏实体vo - * @Author: zhangjing - * @Time: 2022/10/13 11:21 - * @Classname: CuMemberVO - * @PackageName: com.hzs.member.base.vo - */ -@Data -@AllArgsConstructor -public class TheLableVO { - private static final long serialVersionUID = 1L; - - /** - * 表头名称 - */ - private String titel; - - /** - * 对应字段 - */ - private String prop; - - /** - * key键 - */ - private Integer keyId; - - /** - * 显示隐藏 - */ - private String show; - - -} - diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java deleted file mode 100644 index 5995be39..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/WaresAuthorityParentVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.member.base.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/4/30 15:11 - * @Classname: WaresAuthorityParentVo - * @PackageName: com.hzs.member.base.vo - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.vo - *@Author: yh - *@CreateTime: 2024-04-30 15:11 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class WaresAuthorityParentVo { - - /** - * 会员主键 - */ - private Integer pkMember; - - /** - * 会员编号 - */ - private Long memberCount; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java index 5c14b9f3..3bb9673c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java @@ -41,12 +41,9 @@ public class ApiDomicileChangeController extends BaseController { @Autowired private ICuMemberService iCuMemberService; @Autowired - private IApiAliSmsService iApiAliSmsService; - @Autowired private ICuSelfServiceLogService iCuSelfServiceLogService; - - @DubboReference - IServiceChargeServiceApi iServiceChargeServiceApi; + @Autowired + private IApiAliSmsService iApiAliSmsService; /** * 查询可申请信息 @@ -55,45 +52,44 @@ public class ApiDomicileChangeController extends BaseController { */ @GetMapping("/application-info-list") public AjaxResult applicationInformation() { - Long pkMember = SecurityUtils.getUserId(); - CuMemberExt member = iCuMemberService.getMemberById(pkMember); - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().memberCode(member.getMemberCode()) - .memberName(member.getMemberName()).phone(member.getPhone()) - .changeNum(MagicNumberConstants.CHANGE_NUM).build(); + CuMemberExt member = iCuMemberService.getMemberById(SecurityUtils.getUserId()); + DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder() + .memberCode(member.getMemberCode()) + .memberName(member.getMemberName()) + .phone(member.getPhone()) + .changeNum(MagicNumberConstants.CHANGE_NUM) + .build(); return AjaxResult.success(domicileChangeVO); } - - @GetMapping("/application-info-detail") - public AjaxResult applicationInformationDetail() { - return AjaxResult.success(iCuSelfServiceLogService.selectDomicileChangeByPkMember(SecurityUtils.getUserId(), EApprovalBusiness.DOMICILE_CHANGE.getValue(), SecurityUtils.getPkCountry())); - } - /** - * 查询已申请信息 + * 显示户籍变更信息 * * @return AjaxResult */ - @GetMapping("/applied-info-list") - public AjaxResult appliedInformation() { - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().pkMember(SecurityUtils.getUserId()) - .pkCountry(SecurityUtils.getPkCountry()).editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()).build(); - List domicileChangeVOList = (List) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; - return AjaxResult.success(domicileChangeVOList); + @GetMapping("/show-change-domicile") + public AjaxResult showChangeDomicile() { + String idBack = null; + String idFront = null; + Long pkMember = SecurityUtils.getUserId(); + Integer pkCountry = SecurityUtils.getPkCountry(); + CuMemberExt member = iCuMemberService.getMemberById(pkMember); + //查询实名认证信息原证件图 + CuMemberAuthenticationVO authenticationVO = CuMemberAuthenticationVO.builder().pkCountry(pkCountry).pkMember(pkMember).build(); + CuMemberAuthenticationVO cuMemberAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO); + if (null != cuMemberAuthenticationVO) { + idBack = cuMemberAuthenticationVO.getIdBack(); + idFront = cuMemberAuthenticationVO.getIdFront(); + } + DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder() + .memberCode(member.getMemberCode()) + .memberName(member.getMemberName()) + .phone(member.getPhone()) + .idBack(idBack).idFront(idFront) + .build(); + return AjaxResult.success(domicileChangeVO); } - - /** - * 自助服务是否显示户籍认证 - * - * @return AjaxResult - */ - @GetMapping("/show-index-domicile") - public AjaxResult showIndexDomicile() { - return AjaxResult.success(iCuSelfServiceLogService.showIndexDomicile(SecurityUtils.getPkCountry(), SecurityUtils.getUserId())); - } - - /** * 申请户籍变更 * @@ -125,13 +121,8 @@ public class ApiDomicileChangeController extends BaseController { } domicileChangeVO.setPkCountry(pkCountry); domicileChangeVO.setPkMember(pkMember); - //是否有正在审批业务 - AjaxResult existApprovalData = isExistApprovalData(domicileChangeVO); - if (!existApprovalData.equals(AjaxResult.success())) { - return existApprovalData; - } // 校验短信验证码 - String message = iApiAliSmsService.checkCode(domicileChangeVO.getChangePhone(), domicileChangeVO.getVerificationCode(), null); + String message = iApiAliSmsService.checkCode(domicileChangeVO.getChangePhone(), domicileChangeVO.getVerificationCode(), null, pkMember); if (null != message) { return AjaxResult.error(message); } @@ -139,63 +130,19 @@ public class ApiDomicileChangeController extends BaseController { } /** - * 显示户籍变更信息 + * 查询已申请信息 * * @return AjaxResult */ - @GetMapping("/show-change-domicile") - public AjaxResult showChangeDomicile() { - String idBack = null; - String idFront = null; - Long pkMember = SecurityUtils.getUserId(); - Integer pkCountry = SecurityUtils.getPkCountry(); - CuMemberExt member = iCuMemberService.getMemberById(pkMember); - //查询实名认证信息原证件图 - CuMemberAuthenticationVO authenticationVO = CuMemberAuthenticationVO.builder().pkCountry(pkCountry).pkMember(pkMember).build(); - CuMemberAuthenticationVO cuMemberAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO); - if (null != cuMemberAuthenticationVO) { - idBack = cuMemberAuthenticationVO.getIdBack(); - idFront = cuMemberAuthenticationVO.getIdFront(); - } - ServiceChargeDTO serviceChargeInfo = getServiceChargeInfo(pkCountry); - BigDecimal cost = null != serviceChargeInfo ? serviceChargeInfo.getCost() : BigDecimal.ZERO; - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().memberCode(member.getMemberCode()) - .memberName(member.getMemberName()).phone(member.getPhone()).amount(cost).pkAccount(serviceChargeInfo.getPkAccount()) - .idBack(idBack).idFront(idFront).build(); - return AjaxResult.success(domicileChangeVO); - } - - /** - * 是否存在审核的数据 - * - * @param domicileChangeVO 户籍变更信息 - * @return AjaxResult - */ - private AjaxResult isExistApprovalData(DomicileChangeVO domicileChangeVO) { - CuSelfServiceLog cuSelfServiceLog = new CuSelfServiceLog(); - cuSelfServiceLog.setPkCountry(domicileChangeVO.getPkCountry()); - cuSelfServiceLog.setEditType(EApprovalBusiness.DOMICILE_CHANGE.getValue()); - cuSelfServiceLog.setPkMember(domicileChangeVO.getPkMember()); - Integer check = iCuSelfServiceLogService.checkSelfService(cuSelfServiceLog); - if (check > 0) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)); - } - return AjaxResult.success(); - } - - /** - * 查询手续费 - * - * @param pkCountry 国家pID - * @return ServiceChargeDTO - */ - private ServiceChargeDTO getServiceChargeInfo(Integer pkCountry) { - //查询扣费金额，账户信息 - ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); - serviceChargeDTO.setType(EApprovalBusiness.DOMICILE_CHANGE.getValue()); - serviceChargeDTO.setPkCountry(pkCountry); - serviceChargeDTO.setQuantity(MagicNumberConstants.CHANGE_NUM); - return iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO).getData(); + @GetMapping("/applied-info-list") + public AjaxResult appliedInformation() { + DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder() + .pkMember(SecurityUtils.getUserId()) + .pkCountry(SecurityUtils.getPkCountry()) + .editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) + .build(); + List domicileChangeVOList = (List) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; + return AjaxResult.success(domicileChangeVOList); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java index 554721fe..3cffaeda 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfController.java @@ -1,17 +1,13 @@ package com.hzs.member.self.controller.api; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.self.service.ICuSelfServiceLogService; import com.hzs.member.self.vo.SelfVO; import com.hzs.system.config.IGradeServiceApi; -import com.hzs.system.config.dto.GradeDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -27,44 +23,24 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class ApiSelfController extends BaseController { - @Autowired - private ICuMemberService iCuMemberService; @Autowired private ICuSelfServiceLogService iCuSelfServiceLogService; - @DubboReference - IGradeServiceApi iGradeServiceApi; - /** * 自助权限查询 */ @GetMapping("/authority") public AjaxResult validateSelfAuthority() { - CuMemberExt cuMember = iCuMemberService.getMenuMember(SecurityUtils.getUserId()); - - // 获取等级 - GradeDTO gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); - if (EGrade.START_UP.getValue() == gradeDTO.getGradeValue()) { - // 会员等级，需要【实名认证】 - return AjaxResult.success(SelfVO.builder() - .existRealName(EYesNo.YES.getIntValue()) - .build()); - } - + Long userId = SecurityUtils.getUserId(); Integer pkCountry = SecurityUtils.getPkCountry(); - Integer showAddress = iCuSelfServiceLogService.showHiddenAddress(cuMember.getPkId(), pkCountry); + Integer showAddress = iCuSelfServiceLogService.showHiddenAddress(userId, pkCountry); SelfVO selfVO = SelfVO.builder() .existAddress(showAddress) - .existOrderSelf(showAddress) .selfRevokeOrder(showAddress) - .existDomicile(iCuSelfServiceLogService.showIndexDomicile(pkCountry, cuMember.getPkId())) + .existDomicile(iCuSelfServiceLogService.showIndexDomicile(pkCountry, userId)) .existRealName(EYesNo.YES.getIntValue()) - .existMemberMonth(EYesNo.YES.getIntValue()) .build(); - if (!pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - selfVO.setSelfRevokeOrder(EYesNo.NO.getIntValue()); - } - return AjaxResult.success(selfVO); } + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java index b90b45c7..c3b234e1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java @@ -1,24 +1,18 @@ package com.hzs.member.self.controller.manage; - import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.common.core.enums.EOperationBusiness; import com.hzs.common.core.enums.EOperationMethod; import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.self.CuSelfServiceLogExt; -import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; import com.hzs.member.self.service.ICuSelfServiceLogService; import com.hzs.member.self.vo.DomicileChangeVO; -import com.hzs.system.sys.dto.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -28,12 +22,6 @@ import java.util.List; /** * 变理户籍 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/18 10:07 - * @Classname: ApiDomicileChangeController - * @Package_name: com.hzs.member.self.controller.api */ @Slf4j @RequestMapping("/manage/change-domicile") @@ -43,10 +31,6 @@ public class DomicileChangeController extends BaseController { @Autowired private ICuSelfServiceLogService serviceLogService; - @Autowired - private UserTokenService userTokenService; - - /** * 户籍变更列表 * @@ -64,7 +48,6 @@ public class DomicileChangeController extends BaseController { return tableDataInfo; } - /** * 户籍变更列表 * @@ -76,36 +59,4 @@ public class DomicileChangeController extends BaseController { return AjaxResult.success(serviceLogService.selectDomicileChangeDetail(pkId)); } - - /** - * 驳回 - * - * @return AjaxResult - */ - @PostMapping("/domicile-change-reject") - @Log(module = EOperationModule.DOMICILE_CHANGE, business = EOperationBusiness.DOMICILE_CHANGE, method = EOperationMethod.REJECT) - public AjaxResult domicileChangeReject(@RequestBody DomicileChangeVO domicileChangeVO) { - if (StringUtils.isEmpty(domicileChangeVO.getRejectMsg())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.REJECT_MSG_NOT_NULL)); - } - return AjaxResult.success(serviceLogService.domicileChangeRejectById(domicileChangeVO, SecurityUtils.getUserId())); - } - - - /** - * 同意 - * - * @return AjaxResult - */ - @PostMapping("/domicile-change-agree") - @Log(module = EOperationModule.DOMICILE_CHANGE, business = EOperationBusiness.DOMICILE_CHANGE, method = EOperationMethod.AGREE) - public AjaxResult domicileChangeAgree(@RequestBody DomicileChangeVO domicileChangeVO) { - LoginUser loginUser = userTokenService.getLoginUser(); - domicileChangeVO.setLoginUser(loginUser); - domicileChangeVO.setPkModified(SecurityUtils.getUserId()); - domicileChangeVO.setPkCountry(SecurityUtils.getPkCountry()); - return AjaxResult.success(serviceLogService.domicileChangeAgree(domicileChangeVO)); - } - - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java index 082a2e69..3fa38c36 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java @@ -1,10 +1,8 @@ package com.hzs.member.self.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.self.CuSelfServiceLog; import com.hzs.common.domain.member.self.CuSelfServiceLogExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.member.self.vo.MyOrderItemsVO; import com.hzs.member.self.vo.SelfModifyAddressVO; import com.hzs.member.self.vo.DomicileChangeVO; @@ -13,48 +11,23 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 自助服务日志表 Mapper 接口 - *

* - * @author hzs - * @since 2023-04-17 */ public interface CuSelfServiceLogMapper extends BaseMapper { /** - * @description: 自助服务-查询已申请修改收货地址 - * @author: zhang jing - * @date: 2023/4/17 14:36 - * @param: [selfModifyAddressVO] - * @return: java.util.List + * 自助服务-查询已申请修改收货地址 **/ List querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO); + /** - * @description: 自助服务-查询已申请修改收货地址（管理端） - * @author: zhang jing - * @date: 2023/7/24 11:43 - * @param: [selfModifyAddressVO] - * @return: java.util.List + * 自助服务-查询已申请修改收货地址（管理端） **/ List querySelfModifyAddressManageList(SelfModifyAddressVO selfModifyAddressVO); - /** - * @description: 自助服务-校验是否存在重复审核 - * @author: zhang jing - * @date: 2023/4/17 16:40 - * @param: [selfModifyAddressVO] - * @return: java.lang.Integer - **/ - Integer checkSelfService(CuSelfServiceLog cuSelfServiceLog); - - /** - * @description: 自助服务-查询申请的最大次数 - * @author: zhang jing - * @date: 2023/4/17 17:08 - * @param: [selfModifyAddressVO] - * @return: java.lang.Integer + * 自助服务-查询申请的最大次数 **/ Integer selectByMaxApproveNumber(CuSelfServiceLog cuSelfServiceLog); @@ -74,16 +47,6 @@ public interface CuSelfServiceLogMapper extends BaseMapper { */ CuSelfServiceLogExt selectDomicileChangeDetail(@Param("pkId") Long pkId); - /** - * 根据用户ID和类型查询自动服务 - * - * @param editType 服务类型 - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @return CuSelfServiceLogExt - */ - CuSelfServiceLogExt selectDomicileChangeByPkMember(@Param("editType") Integer editType, @Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry); - /** * 根据业务类型、业务编号查询自助信息 * @@ -93,12 +56,6 @@ public interface CuSelfServiceLogMapper extends BaseMapper { */ CuSelfServiceLog selectSelfServiceByBusinessNo(@Param("editType") Integer editType, @Param("businessNo") String businessNo); - /** - * 根据业务编号更新审批信息 - */ - - Integer updateSelfServiceByBusinessNo(DomicileChangeVO domicileChangeVO); - /** * 根据订单ID查询订单明细列表（前台使用，尽量只查能用到的） * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java index d304978f..b93f1080 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.enums.EModifyRecordStatus; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.member.base.CuMember; @@ -14,7 +13,6 @@ import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.self.ICuSelfServiceServiceApi; import com.hzs.member.self.dto.SelfServiceDataDTO; import com.hzs.member.self.service.ICuSelfServiceLogService; -import com.hzs.member.self.vo.DomicileChangeVO; import com.hzs.member.self.vo.SelfModifyAddressVO; import com.hzs.system.base.IAreaServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; @@ -23,28 +21,19 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; import java.util.Map; /** * 自助服务Dubbo 服务 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/19 16:24 - * @Classname: ICuSelfServiceServiceProvider - * @Package_name: com.hzs.member.self.provider */ @Slf4j @DubboService public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi { @Autowired - ICuSelfServiceLogService cuSelfServiceLogService; + private ICuSelfServiceLogService iCuSelfServiceLogService; @Autowired - private ICuSelfServiceLogService serviceLogService; - @Autowired - private ICuMemberService cuMemberService; + private ICuMemberService iCuMemberService; @DubboReference IAreaServiceApi iAreaServiceApi; @@ -53,9 +42,6 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi { public R analysisSelfServiceData(SelfServiceDataDTO selfServiceDataDTO) { EApprovalBusiness eApprovalBusiness = EApprovalBusiness.getEnumByValue(selfServiceDataDTO.getEditType()); switch (eApprovalBusiness) { - case DOMICILE_CHANGE: - //户籍变更数据 - return R.ok(getDomicileChangeData(selfServiceDataDTO)); case SELF_MODIFY_ADDRESS: //修改地址 return R.ok(getSelfModifyAddress(selfServiceDataDTO)); @@ -65,24 +51,7 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi { } /** - * 户籍变更数据 - * - * @param selfServiceDataDTO 自助服务参数 - * @return List - */ - private List getDomicileChangeData(SelfServiceDataDTO selfServiceDataDTO) { - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().editType(selfServiceDataDTO.getEditType()) - .pkCountry(selfServiceDataDTO.getPkCountry()) - .businessNo(selfServiceDataDTO.getBusinessNo()).build(); - return (List) cuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; - } - - /** - * @description: 自助服务-修改收货地址 - * @author: zhang jing - * @date: 2023/4/20 16:18 - * @param: [selfServiceDataDTO] - * @return: java.util.List + * 自助服务-修改收货地址 **/ private SelfModifyAddressVO getSelfModifyAddress(SelfServiceDataDTO selfServiceDataDTO) { SelfModifyAddressVO selMad = SelfModifyAddressVO.builder() @@ -92,7 +61,7 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi { .build(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuSelfServiceLog::getBusinessNo, selfServiceDataDTO.getBusinessNo()); - CuSelfServiceLog serviceLog = serviceLogService.getOne(queryWrapper); + CuSelfServiceLog serviceLog = iCuSelfServiceLogService.getOne(queryWrapper); if (null != serviceLog) { // 调用system服务，获取地址 Map areaMap = iAreaServiceApi.getAreaMap(selfServiceDataDTO.getPkCountry()).getData(); @@ -102,7 +71,7 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi { //旧值 String recCountyVal = ""; sad.setOrderCode(serviceLog.getOrderCode()); - CuMember member = cuMemberService.getMember(serviceLog.getPkMember()); + CuMember member = iCuMemberService.getMember(serviceLog.getPkMember()); sad.setMemberName(member.getMemberName()); sad.setMemberCode(member.getMemberCode()); sad.setRecName(oldsad.getRecName()); @@ -138,30 +107,18 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi { if (StringUtils.isEmpty(businessCode) || null == approveOperation || null == eApprovalBusiness) { return R.fail("提交审核缺少参数！"); } - CuSelfServiceLog selfServiceLog = cuSelfServiceLogService.selectSelfServiceByBusinessNo(eApprovalBusiness.getValue(), businessCode); + CuSelfServiceLog selfServiceLog = iCuSelfServiceLogService.selectSelfServiceByBusinessNo(eApprovalBusiness.getValue(), businessCode); if (null == selfServiceLog) { return R.fail("审批记录不存在！"); } try { switch (eApprovalBusiness) { - //户籍变更数据 - case DOMICILE_CHANGE: - //审批通过 - if (approveOperation.equals(EModifyRecordStatus.APPROVE.getValue())) { - return R.ok(cuSelfServiceLogService.domicileChangeApproved(approvalBusinessResultDTO, selfServiceLog)); - } - //审批驳回 - if (approveOperation.equals(EModifyRecordStatus.REJECT.getValue())) { - //横冲手续费 - return R.ok(cuSelfServiceLogService.domicileChangeReject(approvalBusinessResultDTO, selfServiceLog)); - } case SELF_MODIFY_ADDRESS: //修改地址 - return R.ok(cuSelfServiceLogService.selfExamine(approvalBusinessResultDTO)); + return R.ok(iCuSelfServiceLogService.selfExamine(approvalBusinessResultDTO)); default: return R.fail(); } - } catch (Exception e) { log.error("审核状态为： {} 的审核出错", approveOperation, e); return R.fail("审批自助服务流程出错！"); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java index 300ecdf2..4b3e39e1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java @@ -24,11 +24,6 @@ public interface ICuSelfServiceLogService extends IService { **/ List querySelfModifyAddressManageList(SelfModifyAddressVO selfModifyAddressVO); - /** - * 自助服务-校验是否存在重复审核 - **/ - Integer checkSelfService(CuSelfServiceLog cuSelfServiceLog); - /** * **/ @@ -78,16 +73,6 @@ public interface ICuSelfServiceLogService extends IService { */ DomicileChangeVO selectDomicileChangeDetail(Long pkId); - /** - * 根据用户ID和类型查询自动服务 - * - * @param editType 服务类型 - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @return CuSelfServiceLogExt - */ - DomicileChangeVO selectDomicileChangeByPkMember(Long pkMember, Integer editType, Integer pkCountry); - /** * 根据业务类型、业务编号查询自助信息 * @@ -97,41 +82,6 @@ public interface ICuSelfServiceLogService extends IService { */ CuSelfServiceLog selectSelfServiceByBusinessNo(Integer editType, String businessNo); - /** - * 户籍变更审批通过 - * - * @param approvalBusinessResultDTO 审核参数 - * @param selfServiceLog 自助信息 - * @return Boolean - */ - Integer domicileChangeApproved(ApprovalBusinessResultDTO approvalBusinessResultDTO, CuSelfServiceLog selfServiceLog); - - /** - * 户籍变更审批驳回 - * - * @param approvalBusinessResultDTO 审核参数 - * @param selfServiceLog 自助信息 - * @return Integer - */ - Integer domicileChangeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO, CuSelfServiceLog selfServiceLog); - - /** - * 户籍变更审批驳回 - * - * @param domicileChangeVO ID - * @param pkMember 会员ID - * @return Integer - */ - Boolean domicileChangeRejectById(DomicileChangeVO domicileChangeVO, Long pkMember); - - /** - * 户籍变更审批同意（后台列表操作） - * - * @param domicileChangeVO 户籍变更 - * @return - */ - Integer domicileChangeAgree(DomicileChangeVO domicileChangeVO); - /** * **/ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java index 2026d1ff..026aa01b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java @@ -5,12 +5,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.MagicNumberConstants; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; @@ -18,14 +17,12 @@ import com.hzs.common.core.exception.ServiceException; import com.hzs.common.core.utils.CommonUtil; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.member.account.CuMemberAccount; -import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.self.CuSelfServiceLog; import com.hzs.common.domain.member.self.CuSelfServiceLogExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.account.dto.BusinessCommissionDTO; -import com.hzs.member.account.dto.MemberAmountDTO; import com.hzs.member.account.service.*; import com.hzs.member.base.service.ICuMemberBusinessService; import com.hzs.member.base.service.ICuMemberService; @@ -39,9 +36,7 @@ import com.hzs.sale.order.ISaOrderServiceApi; import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.ApprovalSubmitDTO; -import com.hzs.system.sys.dto.BusinessLogDTO; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -67,17 +62,13 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO) { @@ -89,11 +80,6 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.eq("PK_ID", cuSelfServiceLogExt.getPkId()); - update(updateWrapper); - } + + //更新业务 + iCuMemberService.updateMemberNameAndPhone(pkMember, domicileChangeVO.getChangeMemberName(), domicileChangeVO.getChangePhone(), pkMember); + // 注销实名认证、营业执照 + changeBusinessByChangeName(pkMember, pkMember); + //重置银行卡 + BusinessMemberVO businessMemberVO = BusinessMemberVO.builder().pkMember(pkMember).build(); +// iCuMemberBankService.batchUpdateBankBypkMembers(Collections.singletonList(businessMemberVO), pkModified); + //修改会员的变更次数 + List pkMembers = Collections.singletonList(businessMemberVO.getPkMember()); + iCuMemberService.updateMemberEditNumber(pkMembers, pkMember); + //变更前值 - DomicileChangeVO oldValue = DomicileChangeVO.builder().memberName(domicileChangeVO.getMemberName()) - .phone(domicileChangeVO.getPhone()).idFront(domicileChangeVO.getIdFront()).idBack(domicileChangeVO.getIdBack()).build(); + DomicileChangeVO oldValue = DomicileChangeVO.builder() + .memberName(domicileChangeVO.getMemberName()) + .phone(domicileChangeVO.getPhone()) + .idFront(domicileChangeVO.getIdFront()) + .idBack(domicileChangeVO.getIdBack()) + .build(); //变更后的值 - DomicileChangeVO newValue = DomicileChangeVO.builder().changeMemberName(domicileChangeVO.getChangeMemberName()) - .changePhone(domicileChangeVO.getChangePhone()).changeIdFront(domicileChangeVO.getChangeIdFront()).changeIdBack(domicileChangeVO.getChangeIdBack()).build(); + DomicileChangeVO newValue = DomicileChangeVO.builder() + .changeMemberName(domicileChangeVO.getChangeMemberName()) + .changePhone(domicileChangeVO.getChangePhone()) + .changeIdFront(domicileChangeVO.getChangeIdFront()) + .changeIdBack(domicileChangeVO.getChangeIdBack()) + .build(); String businessNo = CommonUtil.createSerialNumber(EOrderPrefix.SELF_SERVICE.getValue()); - CuSelfServiceLog oldServiceLog = CuSelfServiceLog.builder().pkMember(pkMember) - .editType(editType).oldValue(JSONUtil.toJsonStr(oldValue)).selfRemark(domicileChangeVO.getRemark()).description(domicileChangeVO.getDescription()) - .newValue(JSONUtil.toJsonStr(newValue)).businessNo(businessNo).approveStatus(EApproveRechargeStatus.SUBMIT.getValue()).pkAccount(domicileChangeVO.getPkAccount()) - .approveNumber(MagicNumberConstants.CHANGE_NUM).singleAmount(domicileChangeVO.getAmount()).editTypePay(ETradeType.getValueByApprovalValue(editType)).build(); - oldServiceLog.setPkCreator(pkMember); - oldServiceLog.setPkCountry(pkCountry); - //保存 - this.save(oldServiceLog); - //扣费 - return Charging(domicileChangeVO, businessNo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer domicileChangeAgree(DomicileChangeVO domicileChangeVO) { - String businessNo = domicileChangeVO.getBusinessNo(); - Long pkMember = domicileChangeVO.getPkMember(); - Long pkModified = domicileChangeVO.getPkModified(); - //更新审核状态 - DomicileChangeVO domicileChange = DomicileChangeVO.builder().businessNo(businessNo) - .approveStatus(EApproveRechargeStatus.WAIT.getValue()).approveTime(new Date()) - .pkModified(pkModified).build(); - Integer result = baseMapper.updateSelfServiceByBusinessNo(domicileChange); - //调用审批接口，修改审批状态 - ApprovalSubmitDTO approvalSubmitDTO = ApprovalSubmitDTO.builder().eApprovalBusiness(EApprovalBusiness.DOMICILE_CHANGE) - .businessCode(businessNo).signSource(ESignSource.MANAGE) - .signType(ESignType.GENERAL).userIdList(domicileChangeVO.getUserIdList()) - .remark(domicileChangeVO.getRemark()).pkMemberList(Collections.singleton(pkMember)) - .sendIdList(domicileChangeVO.getSendIdList()).fileList(domicileChangeVO.getFileList()) + CuSelfServiceLog oldServiceLog = CuSelfServiceLog.builder() + .pkMember(pkMember) + .editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) + .oldValue(JSONUtil.toJsonStr(oldValue)) + .newValue(JSONUtil.toJsonStr(newValue)) + .businessNo(businessNo) + .selfRemark(domicileChangeVO.getRemark()) + .description(domicileChangeVO.getDescription()) + .approveStatus(EApproveRechargeStatus.AGREE.getValue()) + .pkAccount(domicileChangeVO.getPkAccount()) + .approveNumber(MagicNumberConstants.CHANGE_NUM) + .singleAmount(domicileChangeVO.getAmount()) + .editTypePay(ETradeType.getValueByApprovalValue(EApprovalBusiness.DOMICILE_CHANGE.getValue())) .build(); - R submit = iApprovalServiceApi.submit(approvalSubmitDTO, domicileChangeVO.getLoginUser()); - if (!submit.isSuccess()) { - throw new RuntimeException(submit.getMsg()); - } - //MQ户籍变更操作日志 - CuSelfServiceLog cuSelfServiceLog = baseMapper.selectSelfServiceByBusinessNo(EApprovalBusiness.DOMICILE_CHANGE.getValue(), businessNo); - packageDomicileOperationLog(cuSelfServiceLog, businessNo, "同意", pkModified, false); - return result; + oldServiceLog.setPkCreator(pkMember); + oldServiceLog.setPkCountry(CountryConstants.CHINA_COUNTRY); + return this.save(oldServiceLog); } - /** - * 户籍变更操作日志 - * - * @param cuSelfServiceLog 入参 - * @param businessNo 业务编号 - * @param operationType 操作类型 - */ - private void packageDomicileOperationLog(CuSelfServiceLog cuSelfServiceLog, String businessNo, String operationType, Long pkMember, Boolean freeSignFlag) { - DomicileChangeVO oldValue = JSONUtil.toBean(cuSelfServiceLog.getOldValue(), DomicileChangeVO.class); - DomicileChangeVO newValue = JSONUtil.toBean(cuSelfServiceLog.getNewValue(), DomicileChangeVO.class); - CuMemberExt cumember = cuMemberService.getMemberById(cuSelfServiceLog.getPkMember()); - String sb = "会员编号：" + cumember.getMemberCode() + - " 变更前的会员姓名：" + oldValue.getMemberName() + - " 变更后的会员姓名：" + newValue.getChangeMemberName() + - " 变更前的联系方式：" + oldValue.getPhone() + - " 变更后的联系方式：" + newValue.getChangePhone() + - " 操作类型：" + operationType; - BusinessLogDTO businessLog = BusinessLogDTO.builder() - .businessType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) - .businessCode(businessNo).pkMember(cuSelfServiceLog.getPkMember()) - .content(sb).pkCreator(pkMember) - .pkCountry(cuSelfServiceLog.getPkCountry()) - .freeSignFlag(freeSignFlag).build(); - rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, Collections.singleton(businessLog)); - } - - - /** - * 扣费 - * - * @param domicileChangeVO 户籍变更信息 - * @param businessNo 业务编号 - */ - public Boolean Charging(DomicileChangeVO domicileChangeVO, String businessNo) { - MemberAmountDTO memberAmountDTO = MemberAmountDTO.builder().pkMember(domicileChangeVO.getPkMember()).tradeAmount(domicileChangeVO.getAmount()).build(); - List memberAmountDTOList = new ArrayList<>(); - memberAmountDTOList.add(memberAmountDTO); - - BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().pkAccount(domicileChangeVO.getPkAccount()) - .tradeType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) - .tradeCode(businessNo) - .pkCountry(domicileChangeVO.getPkCountry()) - .pkCreator(domicileChangeVO.getPkModified()).build(); - businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); - return cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); - } - - @Override public Object[] selectSelfServiceByPkMember(DomicileChangeVO domicileChangeVO) { DomicileChangeVO domicileChange; @@ -290,11 +215,11 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", pkMember); - queryWrapper.eq("PK_COUNTRY", pkCountry); - queryWrapper.eq("EDIT_TYPE", EApprovalBusiness.DOMICILE_CHANGE.getValue()); - queryWrapper.eq("APPROVE_STATUS", EApproveRechargeStatus.AGREE.getValue()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuSelfServiceLog::getPkMember, pkMember); + queryWrapper.eq(CuSelfServiceLog::getPkCountry, pkCountry); + queryWrapper.eq(CuSelfServiceLog::getEditType, EApprovalBusiness.DOMICILE_CHANGE.getValue()); + queryWrapper.eq(CuSelfServiceLog::getApproveStatus, EApproveRechargeStatus.AGREE.getValue()); Integer count = baseMapper.selectCount(queryWrapper); return count > 0 ? EYesNo.NO.getIntValue() : EYesNo.YES.getIntValue(); } @@ -303,15 +228,6 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl pkMembers = Collections.singletonList(businessMemberVO.getPkMember()); - cuMemberService.updateMemberEditNumber(pkMembers, pkModified); - //更新状态 - return updateApprovalStatus(approvalBusinessResultDTO, pkModified); - } - /** * 更新姓名删除相关实名操作 * @@ -372,72 +268,19 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl pkMembers = Collections.singletonList(pkMember); //更新实名认证 - Boolean auth = cuMemberAuthenticationService.deleteByPkMembers(pkMembers, pkModified); + Boolean auth = iCuMemberAuthenticationService.deleteByPkMembers(pkMembers, pkModified); //更新会员是否实名 if (auth) { - cuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.REAL_NAME.getValue()); + iCuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.REAL_NAME.getValue()); } //更新营业执照 - Boolean license = cuMemberBusinessLicenseService.updateMemberLicenseByPkMembers(pkMembers, pkModified); + Boolean license = iCuMemberBusinessLicenseService.updateMemberLicenseByPkMembers(pkMembers, pkModified); //更新会员是否营业执照 if (license) { - cuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.BUS_LICENSE.getValue()); + iCuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.BUS_LICENSE.getValue()); } } - @Override - @Transactional(rollbackFor = Exception.class) - public Integer domicileChangeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO, CuSelfServiceLog selfServiceLog) { - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - //扣费横冲 - EApprovalBusiness eApprovalBusiness = approvalBusinessResultDTO.getEApprovalBusiness(); - String businessCode = approvalBusinessResultDTO.getBusinessCode(); - BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().tradeType(eApprovalBusiness.getValue()) - .tradeCode(businessCode).pkCountry(selfServiceLog.getPkCountry()) - .pkCreator(userId).build(); - cuMemberTradeService.businessCommissionReject(businessCommissionDTO); - //更新状态 - return updateApprovalStatus(approvalBusinessResultDTO, userId); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean domicileChangeRejectById(DomicileChangeVO domicileChangeVO, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.set("approve_status", EApproveRechargeStatus.REJECT.getValue()); - updateWrapper.set("approve_time", new Date()); - updateWrapper.set("REJECT_MSG", domicileChangeVO.getRejectMsg()); - updateWrapper.eq("PK_ID", domicileChangeVO.getPkId()); - //更新状态 - update(updateWrapper); - CuSelfServiceLog selfServiceLog = baseMapper.selectById(domicileChangeVO.getPkId()); - //扣费横冲 - BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().tradeType(selfServiceLog.getEditType()) - .tradeCode(selfServiceLog.getBusinessNo()).pkCountry(selfServiceLog.getPkCountry()) - .pkCreator(pkMember).build(); - Boolean result = cuMemberTradeService.businessCommissionReject(businessCommissionDTO); - // MQ户籍变更操作日志 - packageDomicileOperationLog(selfServiceLog, selfServiceLog.getBusinessNo(), "驳回", pkMember, true); - return result; - } - - /** - * 更新审核状态 - * - * @param approvalBusinessResultDTO 审核参数 - * @param pkModified 修改人ID - * @return Integer - */ - public Integer updateApprovalStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Long pkModified) { - DomicileChangeVO domicileChange = DomicileChangeVO.builder().businessNo(approvalBusinessResultDTO.getBusinessCode()) - .approveStatus(approvalBusinessResultDTO.getApproveOperation() + 1).approveTime(new Date()) - .pkModified(pkModified).build(); - return baseMapper.updateSelfServiceByBusinessNo(domicileChange); - } - @Transactional(rollbackFor = Exception.class) @Override @@ -490,7 +333,7 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl cuMemberList = iCuMemberService.listMemberByPhone(phone); - if (CollectionUtil.isEmpty(cuMemberList)) { - return AjaxResult.error("会员联系方式不存在"); + CuMember cuMember = iCuMemberService.getMember(memberCode); + if (null == cuMember) { + return AjaxResult.error("会员或联系方式不存在"); } - return toAjax(iApiCodeService.sendRecoverCode(phone)); + return toAjax(iApiAliSmsService.sendRecoverCode(phone, cuMember.getPkId())); } /** @@ -72,7 +70,7 @@ public class ApiSmsController extends BaseController { return AjaxResult.error("会员信息不存在"); } - return toAjax(iApiCodeService.resetPayPasswordCode(cuMemberExt.getPhone())); + return toAjax(iApiAliSmsService.resetPayPasswordCode(cuMemberExt.getPhone(), cuMemberExt.getPkId())); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiAliSmsService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiAliSmsService.java index f5d40803..971d6ec6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiAliSmsService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiAliSmsService.java @@ -13,7 +13,7 @@ public interface IApiAliSmsService { * @param sendTimKey 验证码重复发送间隔KEY -- 为空使用默认 * @return */ - String sendCode(String phone, String checkKey, String sendTimKey); + String sendCode(String phone, String checkKey, String sendTimKey, Long pkMember); /** * 校验短信验证码 @@ -23,7 +23,7 @@ public interface IApiAliSmsService { * @param checkKey 验证码KEY -- 为空使用默认 * @return */ - String checkCode(String phone, String smsCode, String checkKey); + String checkCode(String phone, String smsCode, String checkKey, Long pkMember); // /** // * 登录发送验证码 @@ -65,7 +65,7 @@ public interface IApiAliSmsService { * @param phone 手机号码 * @return */ - String sendRecoverCode(String phone); + String sendRecoverCode(String phone, Long pkMember); /** * 校验找回密码验证码 @@ -74,7 +74,7 @@ public interface IApiAliSmsService { * @param smsCode 短信验证码 * @return */ - String checkRecoverCode(String phone, String smsCode); + String checkRecoverCode(String phone, String smsCode, Long pkMember); /** * 重置支付密码发送验证码 @@ -82,7 +82,7 @@ public interface IApiAliSmsService { * @param phone 手机号码 * @return */ - String resetPayPasswordCode(String phone); + String resetPayPasswordCode(String phone, Long pkMember); /** * 校验重置支付密码验证码 @@ -91,6 +91,6 @@ public interface IApiAliSmsService { * @param smsCode 短信验证码 * @return */ - String checkPayPasswordCode(String phone, String smsCode); + String checkPayPasswordCode(String phone, String smsCode, Long pkMember); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiCodeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiCodeService.java deleted file mode 100644 index 2489f9b2..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/IApiCodeService.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.hzs.member.sms.service; - -/** - * 验证码服务 - */ -public interface IApiCodeService { - - /** - * 短信验证码 - * - * @param phone 联系方式 - * @param checkKey 验证码KEY -- 为空使用默认 - * @param sendTimKey 验证码重复发送间隔KEY -- 为空使用默认 - * @return - */ - String sendCode(String phone, String checkKey, String sendTimKey); - - /** - * 校验短信验证码 - * - * @param phone 联系方式 - * @param smsCode 短信验证码 - * @param checkKey 验证码KEY -- 为空使用默认 - * @return - */ - String checkCode(String phone, String smsCode, String checkKey); - - /** - * 注册发送验证码 - * - * @param phone 联系方式 - * @return - */ - String sendRegisterCode(String phone); - - /** - * 校验注册验证码 - * - * @param phone 联系方式 - * @param smsCode 短信验证码 - * @return - */ - String checkRegisterCode(String phone, String smsCode); - - /** - * 找回密码发送验证码 - * - * @param phone 联系方式 - * @return - */ - String sendRecoverCode(String phone); - - /** - * 校验找回密码验证码 - * - * @param phone 联系方式 - * @param smsCode 短信验证码 - * @return - */ - String checkRecoverCode(String phone, String smsCode); - - /** - * 重置支付密码发送验证码 - * - * @param phone 联系方式 - * @return - */ - String resetPayPasswordCode(String phone); - - /** - * 校验重置支付密码验证码 - * - * @param phone 联系方式 - * @param smsCode 短信验证码 - * @return - */ - String checkPayPasswordCode(String phone, String smsCode); - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiAliSmsServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiAliSmsServiceImpl.java index 501821f2..80b18eec 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiAliSmsServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiAliSmsServiceImpl.java @@ -33,12 +33,12 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService { ISmsServiceApi iSmsServiceApi; @Override - public String sendCode(String phone, String checkKey, String sendTimKey) { - // 每个手机号每天只能获取30次短信验证码 + public String sendCode(String phone, String checkKey, String sendTimKey, Long pkMember) { + // 每个手机号每天只能获取20次短信验证码 String smsCountKey = String.format(CacheConstants.SMS_COUNT, DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN)); Object smsCountObj = redisService.getCacheMapValue(smsCountKey, phone); if (smsCountObj != null) { - if (Integer.parseInt(smsCountObj.toString()) >= 30) { + if (Integer.parseInt(smsCountObj.toString()) > 20) { return "当前手机号码获取短信已达当日上限"; } } @@ -64,12 +64,11 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService { if (sendResult.isSuccess()) { // 返回成功，验证码放入缓存 // 验证码缓存有效期5分钟 - redisService.setCacheObject(checkKey + phone, code, 5L, TimeUnit.MINUTES); + redisService.setCacheObject(checkKey + (null != pkMember ? pkMember : phone), code, 5L, TimeUnit.MINUTES); // 验证码发送间隔不能低于1分钟 redisService.setCacheObject(sendTimKey + phone, "", 1L, TimeUnit.MINUTES); - // 每天只能发送30次短信验证码 if (smsCountObj == null) { redisService.setCacheMapValue(smsCountKey, phone, 1); redisService.expire(smsCountKey, 1, TimeUnit.DAYS); @@ -84,7 +83,7 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService { } @Override - public String checkCode(String phone, String smsCode, String checkKey) { + public String checkCode(String phone, String smsCode, String checkKey, Long pkMember) { if (EEnv.TEST.getValue().equals(BdConfig.getEnv()) && "ASDF".equals(smsCode)) { // 测试环境暂时不发放短信 return null; @@ -95,16 +94,16 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService { checkKey = CacheConstants.DEFAULT_CHECK; } - String cacheSmsCode = redisService.getCacheObject(checkKey + phone); + String cacheSmsCode = redisService.getCacheObject(checkKey + (null != pkMember ? pkMember : phone)); if (null == cacheSmsCode) { return "验证码已失效"; } if (!cacheSmsCode.equals(smsCode)) { - // 验证码错误，需不需要清除缓存验证码？？会不会存在暴力破解情况？？ + // TODO 验证码错误，需不需要清除缓存验证码？？会不会存在暴力破解情况？？ return "验证码错误"; } // 校验通过，删除验证码缓存 - redisService.deleteObject(checkKey + phone); + redisService.deleteObject(checkKey + (null != pkMember ? pkMember : phone)); return null; } @@ -125,12 +124,12 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService { @Override public String sendRegisterCode(String phone) { - return this.sendCode(phone, CacheConstants.REGISTER_CHECK, CacheConstants.REGISTER_SEND_TIME); + return this.sendCode(phone, CacheConstants.REGISTER_CHECK, CacheConstants.REGISTER_SEND_TIME, null); } @Override public String checkRegisterCode(String phone, String smsCode) { - String str = this.checkCode(phone, smsCode, CacheConstants.REGISTER_CHECK); + String str = this.checkCode(phone, smsCode, CacheConstants.REGISTER_CHECK, null); if (null == str) { // 删除验证码间隔时间缓存 redisService.deleteObject(CacheConstants.REGISTER_SEND_TIME + phone); @@ -139,13 +138,13 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService { } @Override - public String sendRecoverCode(String phone) { - return this.sendCode(phone, CacheConstants.RECOVER_CHECK, CacheConstants.RECOVER_SEND_TIME); + public String sendRecoverCode(String phone, Long pkMember) { + return this.sendCode(phone, CacheConstants.RECOVER_CHECK, CacheConstants.RECOVER_SEND_TIME, pkMember); } @Override - public String checkRecoverCode(String phone, String smsCode) { - String str = this.checkCode(phone, smsCode, CacheConstants.RECOVER_CHECK); + public String checkRecoverCode(String phone, String smsCode, Long pkMember) { + String str = this.checkCode(phone, smsCode, CacheConstants.RECOVER_CHECK, pkMember); if (null == str) { // 删除验证码间隔时间缓存 redisService.deleteObject(CacheConstants.RECOVER_SEND_TIME + phone); @@ -154,13 +153,13 @@ public class ApiAliSmsServiceImpl implements IApiAliSmsService { } @Override - public String resetPayPasswordCode(String phone) { - return this.sendCode(phone, CacheConstants.RESET_CHECK, CacheConstants.RESET_SEND_TIME); + public String resetPayPasswordCode(String phone, Long pkMember) { + return this.sendCode(phone, CacheConstants.RESET_CHECK, CacheConstants.RESET_SEND_TIME, pkMember); } @Override - public String checkPayPasswordCode(String phone, String smsCode) { - String str = this.checkCode(phone, smsCode, CacheConstants.RESET_CHECK); + public String checkPayPasswordCode(String phone, String smsCode, Long pkMember) { + String str = this.checkCode(phone, smsCode, CacheConstants.RESET_CHECK, pkMember); if (null == str) { // 删除验证码间隔时间缓存 redisService.deleteObject(CacheConstants.RESET_SEND_TIME + phone); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiCodeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiCodeServiceImpl.java deleted file mode 100644 index 24c0b2a2..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/sms/service/impl/ApiCodeServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hzs.member.sms.service.impl; - -import com.hzs.member.sms.service.IApiAliSmsService; -import com.hzs.member.sms.service.IApiCodeService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * 验证码服务 - */ -@Slf4j -@Service -public class ApiCodeServiceImpl implements IApiCodeService { - - @Autowired - private IApiAliSmsService iApiAliSmsService; - - @Override - public String sendCode(String phone, String checkKey, String sendTimKey) { - return iApiAliSmsService.sendCode(phone, checkKey, sendTimKey); - } - - @Override - public String checkCode(String phone, String smsCode, String checkKey) { - return iApiAliSmsService.checkCode(phone, smsCode, checkKey); - } - - @Override - public String sendRegisterCode(String phone) { - return iApiAliSmsService.sendRegisterCode(phone); - } - - @Override - public String checkRegisterCode(String phone, String smsCode) { - return iApiAliSmsService.checkRegisterCode(phone, smsCode); - } - - @Override - public String sendRecoverCode(String phone) { - return iApiAliSmsService.sendRecoverCode(phone); - } - - @Override - public String checkRecoverCode(String phone, String smsCode) { - return iApiAliSmsService.checkRecoverCode(phone, smsCode); - } - - @Override - public String resetPayPasswordCode(String phone) { - return iApiAliSmsService.resetPayPasswordCode(phone); - } - - @Override - public String checkPayPasswordCode(String phone, String smsCode) { - return iApiAliSmsService.checkPayPasswordCode(phone, smsCode); - } - -} diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index fe0f02b6..1b45105f 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -1267,40 +1267,29 @@ cm.MEMBER_CODE as memberCode, cm.MEMBER_NAME memberName, cm.PHONE phone, - bg.PK_TRANSACTION as pkRegisterGrade, - bgg.PK_TRANSACTION as pkSettleGrade, - ba.PK_TRANSACTION as pkAwards, - bamax.PK_TRANSACTION as pkMaxAwards, + cm.pk_register_grade as pkRegisterGrade, + cm.pk_settle_grade as pkSettleGrade, + cm.pk_awards as pkAwards, + cm.PK_MAX_AWARDS as pkMaxAwards, ma.SEX as sex, cm.birth_date birthDate, ma.ID_TYPE idType, ma.ID_CARD idCard, ma.ID_FRONT idFront, ma.ID_BACK idBack, - ma.PK_PROVINCE pkProvince, - ma.PK_CITY pkCity, - ma.PK_COUNTY pkCounty, ma.ADDRESS address, - bb.BANK_NAME bankName, - ma.SUB_BANK_NAME subBankName, - ma.ACCOUNT_NAME accountName, ma.PHONE reservedPhone, ma.CARD_NUMBER cardNumber, - cm.EMAIL email, ma.CREATION_TIME certificationTime, cm.CREATION_TIME creationTime, cm.PAY_TIME payTime, cm.DIRECT_PUSH_NUMBER directPushNumber - from CU_MEMBER cm - left join CU_MEMBER_AUTHENTICATION ma on ma.PK_MEMBER = cm.PK_ID and ma.del_flag = 0 - left join BD_BANK bb on bb.PK_ID = ma.pk_bank - left join BD_GRADE bg on bg.pk_id=cm.PK_REGISTER_GRADE - left join BD_GRADE bgg on bgg.pk_id=cm.PK_SETTLE_GRADE - left join BD_AWARDS ba on ba.pk_id=cm.PK_AWARDS - left join BD_AWARDS baMax on baMax.pk_id=cm.PK_MAX_AWARDS + from CU_MEMBER_AUTHENTICATION ma + left join CU_MEMBER cm on ma.PK_MEMBER = cm.PK_ID left join bd_vertex ver on cm.pk_vertex = ver.pk_id LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code where cm.del_flag = 0 + and ma.del_flag = 0 and cm.PK_SETTLE_COUNTRY = #{pkCountry} @@ -1313,8 +1302,8 @@ and cm.MEMBER_NAME like #{memberName} ||'%' - - and ma.ID_CARD like '%' || #{birthDate} ||'%' + + and cm.birth_date = to_date(#{birthDate}, 'yyyy-mm-dd') and cm.PHONE = #{phone} @@ -1334,33 +1323,9 @@ and ma.ID_CARD = #{idCard} - - and ma.PK_PROVINCE = #{pkProvince} - - - and ma.PK_CITY = #{pkCity} - - - and ma.PK_COUNTY = #{pkCounty} - - - and ma.ADDRESS like #{address} ||'%' - and ma.SEX = #{sex} - - and bb.BANK_NAME like #{bankName}||'%' - - - and ma.SUB_BANK_NAME like #{subBankName}||'%' - - - and ma.CARD_NUMBER like #{cardNumber}||'%' - - - and cm.EMAIL like #{email}||'%' - and ma.CREATION_TIME >= to_date(#{startCertificationTime}, 'yyyy-mm-dd') diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml index f4b068a8..db9a44db 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberTeamMapper.xml @@ -64,86 +64,6 @@ ORDER BY a.CREATION_TIME DESC - - - - update cu_member diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml index 604953f4..96bdd03a 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml @@ -58,7 +58,6 @@ - @@ -69,21 +68,8 @@ - - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MEMBER, EDIT_TYPE, OLD_VALUE, NEW_VALUE, BUSINESS_NO, APPROVE_STATUS, APPROVE_NUMBER, EDIT_TYPE_PAY, SINGLE_AMOUNT - - - @@ -267,14 +253,14 @@ and l.business_no = #{businessNo} - and m.member_code like '%'|| #{memberCode} || '%' + and m.member_code like '%'|| #{memberCode} || '%' and l.OLD_VALUE like '%'|| #{memberName} || '%' - and l.OLD_VALUE like '%'|| #{phone} || '%' + and l.OLD_VALUE like '%'|| #{phone} || '%' and l.APPROVE_STATUS = #{approveStatus} @@ -291,67 +277,29 @@ - - - - - - - - - update cu_self_service_log - - approve_status = #{approveStatus}, - approve_time = #{approveTime}, - pk_modified = #{pkModified}, - modified_time = sysdate - - where BUSINESS_NO = #{businessNo} - - diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java index 906dd0c9..6bc02871 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java @@ -1,11 +1,4 @@ package com.hzs.report.member.vo; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/25 10:24 - * @Classname: directPushNewVo - * @PackageName: com.hzs.sale.order.vo - */ import com.fasterxml.jackson.annotation.JsonFormat; import com.hzs.common.core.annotation.BigDecimalFormat; @@ -21,14 +14,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.order.vo - *@Author: yh - *@CreateTime: 2023-08-25 10:24 - *@Description: TODO - *@Version: 1.0 - */ @AllArgsConstructor @NoArgsConstructor @Builder @@ -84,95 +69,95 @@ public class DirectPushNewVo { */ @Excel(name = "新增金额(￥)") @BigDecimalFormat() - private BigDecimal orderAmount=BigDecimal.ZERO; + private BigDecimal orderAmount = BigDecimal.ZERO; /** * 订单实际业绩 */ @Excel(name = "新增业绩(PV)") @BigDecimalFormat() - private BigDecimal orderAchieve=BigDecimal.ZERO; + private BigDecimal orderAchieve = BigDecimal.ZERO; /** * 大区业绩 */ @Excel(name = "大区业绩(PV)") @BigDecimalFormat() - private BigDecimal bigArealPv=BigDecimal.ZERO; + private BigDecimal bigArealPv = BigDecimal.ZERO; /** * 小区业绩 */ @Excel(name = "小区业绩(PV)") @BigDecimalFormat() - private BigDecimal smallAreaPv=BigDecimal.ZERO; + private BigDecimal smallAreaPv = BigDecimal.ZERO; /** * 大区金额 */ @Excel(name = "大区金额") @BigDecimalFormat() - private BigDecimal bigArealAm=BigDecimal.ZERO; + private BigDecimal bigArealAm = BigDecimal.ZERO; /** * 小区金额 */ @Excel(name = "小区金额") @BigDecimalFormat() - private BigDecimal smallAreaAm=BigDecimal.ZERO; + private BigDecimal smallAreaAm = BigDecimal.ZERO; /** * 注册金额 */ @Excel(name = "注册金额(￥)") @BigDecimalFormat() - private BigDecimal regAmount=BigDecimal.ZERO; + private BigDecimal regAmount = BigDecimal.ZERO; /** * 注册业绩 */ @Excel(name = "注册业绩(PV)") @BigDecimalFormat() - private BigDecimal regAchieve=BigDecimal.ZERO; + private BigDecimal regAchieve = BigDecimal.ZERO; /** * 升级金额 */ @Excel(name = "升级金额(￥)") @BigDecimalFormat() - private BigDecimal upgAmount=BigDecimal.ZERO; + private BigDecimal upgAmount = BigDecimal.ZERO; /** * 升级业绩 */ @Excel(name = "升级业绩(PV)") @BigDecimalFormat() - private BigDecimal upgAchieve=BigDecimal.ZERO; + private BigDecimal upgAchieve = BigDecimal.ZERO; /** * 复购金额 */ @Excel(name = "复购金额(￥)") @BigDecimalFormat() - private BigDecimal repAmount=BigDecimal.ZERO; + private BigDecimal repAmount = BigDecimal.ZERO; /** * 复购业绩 */ @Excel(name = "复购业绩(PV)") @BigDecimalFormat() - private BigDecimal repAchieve=BigDecimal.ZERO; + private BigDecimal repAchieve = BigDecimal.ZERO; /** * 重消金额 */ @Excel(name = "重消金额(￥)") @BigDecimalFormat() - private BigDecimal conAmount=BigDecimal.ZERO; + private BigDecimal conAmount = BigDecimal.ZERO; /** * 重消业绩 */ @Excel(name = "重消业绩(PV)") @BigDecimalFormat() - private BigDecimal conAchieve=BigDecimal.ZERO; + private BigDecimal conAchieve = BigDecimal.ZERO; /** @@ -188,7 +173,6 @@ public class DirectPushNewVo { private Date zonpayTime; - /** * 订单实际考核业绩 */ @@ -300,7 +284,7 @@ public class DirectPushNewVo { * 金额 */ @BigDecimalFormat() - private BigDecimal arealAm=BigDecimal.ZERO; + private BigDecimal arealAm = BigDecimal.ZERO; /** * 盒数 */ @@ -319,5 +303,4 @@ public class DirectPushNewVo { private String memberCodeStr; - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java index 61ad3f7a..fa108fc1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java @@ -2,7 +2,6 @@ package com.hzs.sale.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.retail.member.ext.CuMemberRetailRegionExt; -import com.hzs.common.domain.sale.ext.SaDeliverItemsExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrder; @@ -42,16 +41,6 @@ public interface SaOrderMapper extends BaseMapper { List queryRetailSaOrderByDay(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("orderCode") String orderCode); - /* - * 查询订单，存在可能已经撤单的 - **/ - SaOrder querySaOrderExtByPkId(Long pkId); - - /* - * 根据发货单查询销售订单 - **/ - List querySaOrderByDeliverList(@Param("deliverItemExtList") List deliverItemExtList); - /** * 查询总销售金额 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java index f0fdbb83..b3e21cac 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java @@ -5,10 +5,8 @@ import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.ComputeUtil; -import com.hzs.common.domain.sale.ext.SaDeliverItemsExt; import com.hzs.common.domain.member.ext.CuMemberAccountExt; import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrderItems; import com.hzs.sale.order.ISaOrderServiceApi; @@ -44,23 +42,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi { return R.ok(iSaOrderService.queryRetailSaOrderByDay(startDate, endDate, orderCode)); } - @Override - public R querySaOrderExtByPkId(Long pkId) { - return R.ok(iSaOrderService.querySaOrderExtByPkId(pkId)); - } - - @Override - public R> querySaOrderByDeliverList(List deliverItemExtList) { - return R.ok(iSaOrderService.querySaOrderByDeliverList(deliverItemExtList)); - } - - @Override - public R> queryOrderItemsListByOrderId(List pkOrderList, Integer pkCountry) { - OrderSelectParam param = new OrderSelectParam(); - param.setPkOrderList(pkOrderList); - return R.ok(iSaOrderService.queryOrderSelect(param, pkCountry)); - } - @Override @Transactional(rollbackFor = Exception.class) public R regEmptyOrderApproved(ApprovalBusinessResultDTO approvalBusinessResultDTO) { @@ -114,17 +95,6 @@ public class SaOrderServiceProvider implements ISaOrderServiceApi { return R.fail(); } - @Override - public R saveOrder(SaOrderExt saOrderExt) { - try { - iSaOrderService.saveSaOrderByOrderExt(saOrderExt); - } catch (Exception e) { - e.printStackTrace(); - return R.fail(e.getMessage()); - } - return R.ok(); - } - @Override public List checkMemberIsFirstOrder(List memberCodeList) { List memberFirstOrderVos = iSaOrderService.checkMemberIsFirstOrder(memberCodeList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 1d062ba5..c5dcf188 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -309,16 +309,6 @@ public interface ISaOrderService extends IService { */ List queryRetailSaOrderByDay(Date startDate, Date endDate, String orderCode); - /* - * 查询订单，存在可能已经撤单的 - **/ - SaOrder querySaOrderExtByPkId(Long pkId); - - /* - * 根据发货单查询销售订单 - **/ - List querySaOrderByDeliverList(List deliverItemExtList); - /** * 获取系统参数 * @@ -555,11 +545,6 @@ public interface ISaOrderService extends IService { */ int insertBach(List orderList, List orderItemsList); - /** - * 生成三方销售订单 - */ - void saveSaOrderByOrderExt(SaOrderExt saOrderExt); - /** * 根据编号查询会员首单 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index c6175807..b23cf8e7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -1466,16 +1466,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.queryRetailSaOrderByDay(startDate, endDate, orderCode); } - @Override - public SaOrder querySaOrderExtByPkId(Long pkId) { - return baseMapper.querySaOrderExtByPkId(pkId); - } - - @Override - public List querySaOrderByDeliverList(List deliverItemExtList) { - return baseMapper.querySaOrderByDeliverList(deliverItemExtList); - } - @Override public String querySystemConfigByKey(Integer pkCountry, String key) { return iSystemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData(); @@ -1780,16 +1770,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return i; } - @Override - @Transactional(rollbackFor = Exception.class) - public void saveSaOrderByOrderExt(SaOrderExt saOrderExt) { - save(saOrderExt); - for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) { - saOrderItems.setPkOrder(saOrderExt.getPkId()); - } - iSaOrderItemsService.saveBatch(saOrderExt.getOrderItemsList()); - } - @Override public List checkMemberIsFirstOrder(List memberCodeList) { return baseMapper.checkMemberIsFirstOrder(memberCodeList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/DirectPushNewVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/DirectPushNewVo.java deleted file mode 100644 index 1f6d4c72..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/DirectPushNewVo.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.hzs.sale.order.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/25 10:24 - * @Classname: directPushNewVo - * @PackageName: com.hzs.sale.order.vo - */ - -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.order.vo - *@Author: yh - *@CreateTime: 2023-08-25 10:24 - *@Description: TODO - *@Version: 1.0 - */ -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -public class DirectPushNewVo { - - /** - * 用户编号 - */ - private String memberCode; - - /** - * 用户姓名 - */ - private String userName; - - /** - * 订单实际金额 - */ - - private BigDecimal orderAmount; - - /** - * 订单实际业绩 - */ - private BigDecimal orderAchieve; - - /** - * 订单实际考核业绩 - */ - private BigDecimal orderAssAchieve; - - /** - * 联创编号 - */ - private BigDecimal LcMemberCode; - - - /** - * 联创姓名 - */ - private BigDecimal LcUserName; - - /** - * 奖衔名称 - */ - private String awardsUserName; -} diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index 75d981c9..d4bcb027 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -1188,52 +1188,6 @@ SELECT 1 FROM dual - - select * from BD_TRADE_CONFIG c where c.del_flag = 0 and c.pk_country= #{pkCountry} @@ -54,29 +42,28 @@ order by c.creation_time desc - diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdTradeWhiteConfigMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdTradeWhiteConfigMapper.xml index 06f2f0a5..832bd458 100644 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdTradeWhiteConfigMapper.xml +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdTradeWhiteConfigMapper.xml @@ -17,19 +17,6 @@ - - - DEL_FLAG - , - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_MEMBER, WITHDRAWAL_STATE, TRANSFER_STATE - - - - -