From e6ad85f4cfbedf629e5c10d13487d18bcea5bd83 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 12 May 2025 10:38:54 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=85=85=E5=80=BC=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E3=80=81=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/system/base/ICurrencyServiceApi.java | 27 ---- .../mapper/CuMemberRechargeDetailMapper.java | 7 +- .../service/ICuMemberRechargeService.java | 10 -- .../impl/CuMemberRechargeServiceImpl.java | 125 ++++++------------ .../member/account/vo/CuMemberRechargeVO.java | 22 +-- .../service/ICuMemberBusinessService.java | 72 ---------- .../base/service/ICuMemberTeamService.java | 17 --- .../statis/mapper/CuBonusStatisMapper.java | 3 - .../hzs/member/statis/vo/CuBonusStatisVO.java | 5 +- .../account/CuMemberRechargeDetailMapper.xml | 24 +--- 10 files changed, 55 insertions(+), 257 deletions(-) diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java index 363bce62..aa5879be 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java @@ -1,7 +1,6 @@ package com.hzs.system.base; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.base.BdCubasdoc; import com.hzs.common.domain.system.base.BdStorehouse; import com.hzs.common.domain.system.base.ext.BdCubasdocExt; import com.hzs.common.domain.system.sys.SysCorp; @@ -13,8 +12,6 @@ import java.util.Set; /** * @Description: - * @Author: sui q - * @Time: 2022/9/8 15:11 * @Classname: ICurrencyServiceApi * @PackageName: com.hzs.system.base */ @@ -24,9 +21,6 @@ public interface ICurrencyServiceApi { * 根据国家获得币种 * * @param pkCountry 国家 - * @return: BdCurrency - * @Author: sui q - * @Date: 2022/9/8 15:05 */ R getCurrency(Integer pkCountry); @@ -40,9 +34,6 @@ public interface ICurrencyServiceApi { /* * @description: 查询需要的所有汇率 - * @author: sui q - * @date: 2023/5/11 14:58 - * @param: null null **/ R> getCurrencyById(Set currencyIdSet); @@ -56,17 +47,11 @@ public interface ICurrencyServiceApi { /* * @description: 根据省查询对应的发货仓库 - * @author: sui q - * @date: 2023/5/8 14:22 - * @param: null null **/ R queryBdStorehouseByProvince(Integer province, Integer... type); /* * @description: 根据省查询对应的发货仓库 - * @author: sui q - * @date: 2023/5/8 14:22 - * @param: null null **/ R queryBdStorehouseById(Integer pkId); @@ -92,33 +77,21 @@ public interface ICurrencyServiceApi { /* * @description: 提供查询供应商的dubbo调用 - * @author: sui q - * @date: 2023/11/20 16:45 - * @param: null null **/ R queryBdCubasdocById(Integer pkId, Integer pkCountry); /* * @description: 提供查询供应商的dubbo调用 - * @author: sui q - * @date: 2023/11/20 16:45 - * @param: null null **/ R queryBdCustomerById(Integer pkId, Integer pkCountry); /* * @description: 提供查询采购组织的dubbo调用 - * @author: sui q - * @date: 2023/11/20 17:47 - * @param: null null **/ R querySysCorp(Integer pkId, Integer pkCountry); /* * @description: 根据仓库主键查询仓库 - * @author: sui q - * @date: 2023/11/20 17:54 - * @param: null null **/ R> queryStorehouseByIds(Set storehouseIdSet, Integer pkCountry, Integer pkCorp); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java index bd487af0..530fb93d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberRechargeDetailMapper.java @@ -1,6 +1,5 @@ package com.hzs.member.account.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.account.CuMemberRechargeDetail; import org.apache.ibatis.annotations.Param; @@ -8,12 +7,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员充值详情表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-05 */ public interface CuMemberRechargeDetailMapper extends BaseMapper { @@ -24,4 +18,5 @@ public interface CuMemberRechargeDetailMapper extends BaseMapper cuMemberRechargeDetails); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java index dced0eda..530ae4ca 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberRechargeService.java @@ -18,13 +18,9 @@ import java.util.List; /** * 会员充值表 服务类 - * - * @author hzs - * @since 2022-09-08 */ public interface ICuMemberRechargeService extends IService { - /** * 根据批次查询充值信息 * @@ -33,7 +29,6 @@ public interface ICuMemberRechargeService extends IService { */ List selectRechargeByBatch(String batch); - /** * 会员批量充值 * @@ -42,7 +37,6 @@ public interface ICuMemberRechargeService extends IService { */ Integer saveBatchMemberRecharge(CuMemberBatchRechargeParam batchRechargeParam); - /** * 根据充值单号更新审核状态信息 * @@ -59,7 +53,6 @@ public interface ICuMemberRechargeService extends IService { */ Integer submitAuditMemberRecharge(MemberAccountAudit memberAccountAudit); - /** * 审核通过后插入交易明细和用户余额表 * @@ -103,7 +96,6 @@ public interface ICuMemberRechargeService extends IService { */ Boolean preCharge(String rechargeAmount, Integer pkCountry, Long pkMember, String rechargeCode, Long pkCreator); - /** * 会员端在线支付更新审批状态 * @@ -122,7 +114,6 @@ public interface ICuMemberRechargeService extends IService { */ CuMemberRecharge getCuMemberRechargeByRechargeCode(String rechargeCode); - /** * 根据充值单号与用户ID查询充值信息 * @@ -139,7 +130,6 @@ public interface ICuMemberRechargeService extends IService { */ void saveMemberTradeDetailAndBonus(List memberAccountList, Integer rechargeMethod, String businessCode); - /** * 根据会员编号查询提交审核的用户 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java index 7e3502d8..f5c8d2d8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberRechargeServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.MemberFieldConstants; @@ -27,7 +27,6 @@ import com.hzs.member.account.vo.CuMemberPetitionListVO; import com.hzs.member.account.vo.CuMemberPetitionVO; import com.hzs.member.account.vo.CuMemberRechargeDetailVO; import com.hzs.member.account.vo.CuMemberRechargeVO; -import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAccountServiceApi; import com.hzs.system.sys.IApprovalServiceApi; @@ -41,39 +40,31 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; /** * 会员充值表 服务实现类 - * - * @author hzs - * @since 2022-09-08 */ @Service public class CuMemberRechargeServiceImpl extends ServiceImpl implements ICuMemberRechargeService { @Autowired - ICuMemberTradeService cuMemberTradeService; + private ICuMemberTradeService iCuMemberTradeService; @Autowired - ICuMemberAccountService cuMemberAccountService; + private ICuMemberAccountService iCuMemberAccountService; @Autowired - ICuMemberBaseService cuMemberBaseService; - @Autowired - ICuMemberSettlePeriodService cuMemberSettlePeriodService; - @Autowired - CuMemberRechargeDetailMapper cuMemberRechargeDetailMapper; - @Autowired - ICuMemberTradeDetailService cuMemberTradeDetailService; - @Autowired - ICuMemberTradeBonusService cuMemberTradeBonusService; + private ICuMemberBaseService iCuMemberBaseService; + + @Resource + private CuMemberRechargeDetailMapper cuMemberRechargeDetailMapper; @DubboReference - IApprovalServiceApi approvalServiceApi; + IApprovalServiceApi iApprovalServiceApi; @DubboReference - IAccountServiceApi accountServiceApi; + IAccountServiceApi iAccountServiceApi; @Autowired private ITransactionCommonService iTransactionCommonService; @@ -82,8 +73,8 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl selectRechargeByBatch(String batch) { //根据单号查询充值信息 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("BATCH", batch); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberRecharge::getBatch, batch); return baseMapper.selectList(queryWrapper); } @@ -101,7 +92,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl memberCodes = batchRechargeParam.getMemberCodes(); //查询账户余额 - List cuMemberAccounts = cuMemberAccountService.queryMemberAccountByMemberCodes(new ArrayList<>(), memberCodes); + List cuMemberAccounts = iCuMemberAccountService.queryMemberAccountByMemberCodes(new ArrayList<>(), memberCodes); Map memberAccountExtMap = cuMemberAccounts.stream().collect(Collectors.toMap(CuMemberAccountExt::getMemberCode, o -> o)); batchRechargeParam.setMemberAccountExtMap(memberAccountExtMap); //会员的累计账户余额 @@ -133,7 +124,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl cuMemberRecharges, CuMemberBatchRechargeParam batchRechargeParam, String batchNum) { StringBuilder sb; List businessLogDTOList = new ArrayList<>(); - BusinessLogDTO businessLog = null; if (CollUtil.isNotEmpty(cuMemberRecharges)) { //会员信息 List cuMembers = batchRechargeParam.getCuMembers(); @@ -144,12 +134,12 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl submit = approvalServiceApi.submit(approvalSubmitDTO, batchRechargeParam.getLoginUser()); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, batchRechargeParam.getLoginUser()); if (!submit.isSuccess()) { throw new RuntimeException(submit.getMsg()); } @@ -268,7 +257,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl memberAccountExtMap = batchRechargeParam.getMemberAccountExtMap(); - BigDecimal balance = ReflectUtils.invokeGetter(memberAccountExtMap.get(memberCode), MemberFieldConstants.ACCOUNT + cuMemberBaseService.getAccountValueById(pkAccount)); + BigDecimal balance = ReflectUtils.invokeGetter(memberAccountExtMap.get(memberCode), MemberFieldConstants.ACCOUNT + iCuMemberBaseService.getAccountValueById(pkAccount)); //充值方式 Integer rechargeMethod = batchRechargeParam.getRechargeMethod(); //根据充值方式获取充值金额 @@ -339,31 +328,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl cuMemberRecharges) { @@ -394,9 +357,9 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl memberAccountList, Integer rechargeMethod, String businessCode) { //充值为正时插入奖金余额表 if (rechargeMethod.equals(ERechargeMethod.BANK_TRANSFER.getValue())) { - cuMemberBaseService.handleRepeatMemberTradeDetailAndBonus(memberAccountList, EConsumeType.RECHARGE.getValue()); + iCuMemberBaseService.handleRepeatMemberTradeDetailAndBonus(memberAccountList, EConsumeType.RECHARGE.getValue()); } else { - cuMemberBaseService.saveMemberTradeDetail(businessCode); + iCuMemberBaseService.saveMemberTradeDetail(businessCode); } } @@ -419,13 +382,13 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl memberAccountBalance) { Long pkMember = cuMemberRecharge.getPkMember(); int pkAccount = cuMemberRecharge.getPkAccount(); - BdAccount account = cuMemberBaseService.getAccount(pkAccount); + BdAccount account = iCuMemberBaseService.getAccount(pkAccount); //会员当前余额 BigDecimal memberBalance = memberAccountBalance.get(pkMember + "_" + pkAccount); //充值金额 BigDecimal tradeAmount = cuMemberRecharge.getRechargeAmount(); //查询余额 - BigDecimal balance = cuMemberAccountService.selectBalanceByMemberCode(pkMember, account.getFieldValue()); + BigDecimal balance = iCuMemberAccountService.selectBalanceByMemberCode(pkMember, account.getFieldValue()); if (null == memberBalance) { memberAccountBalance.put(pkMember + "_" + pkAccount, balance.add(tradeAmount)); } else { @@ -448,7 +411,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl> mapR = approvalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.RECHARGE.getValue()), memberRechargeParam.getPkCountry()); + R> mapR = iApprovalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.RECHARGE.getValue()), memberRechargeParam.getPkCountry()); //批次号 String batchNum = CommonUtil.createSerialNumber(EOrderPrefix.RECHARGE_CODE.getValue()); memberPetitionVo.setBusinessNo(batchNum); @@ -529,7 +489,7 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl memberCodes = memberRechargeParam.getMemberCode(); - List cuMemberAccountExts = cuMemberAccountService.queryMemberAccountByMemberCodes(null, memberCodes); + List cuMemberAccountExts = iCuMemberAccountService.queryMemberAccountByMemberCodes(null, memberCodes); Map memberAccounMap = cuMemberAccountExts.stream().collect(Collectors.toMap(CuMemberAccountExt::getMemberCode, o -> o)); //在线签呈的业务列表展示 if (CollUtil.isNotEmpty(cuMemberAccountExts)) { @@ -546,11 +506,11 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("RECHARGE_CODE", rechargeCode); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberRecharge::getRechargeCode, rechargeCode); return baseMapper.selectOne(queryWrapper); } @@ -629,7 +586,6 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl selectMemberRechargeApproveByUserCode(Integer pkCountry, List memberCodes) { return baseMapper.selectMemberRechargeApproveByUserCode(pkCountry, memberCodes); @@ -645,5 +601,4 @@ public class CuMemberRechargeServiceImpl extends ServiceImpl - * @Author: sui q - * @Date: 2022/9/9 9:39 */ Boolean saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt); - /* - * @description: 保存分享会员，直接上树，生成账户 - * @author: sui q - * @date: 2023/8/15 15:07 - * @param: null null - **/ - Boolean saveShareMember(CuMember cuMember); - /** * 保存分享新会员信息，确认支付订单 * * @param cuMember 会员信息 * @param saOrder 订单信息 - * @return: R - * @Author: sui q - * @Date: 2022/9/9 9:39 */ Boolean saveMember(CuMember cuMember, SaOrder saOrder); /* * @description: 在线支付修改记录 - * @author: sui q - * @date: 2023/5/16 10:47 - * @param: null null **/ Boolean saveMemberOnLineTrade(CuMember cuMember, SaOrder saOrder, CuMemberAccountExt cuMemberAccountExt); @@ -88,9 +63,6 @@ public interface ICuMemberBusinessService { * 插入充值记录 * * @param saOrderExt 订单 - * @return: CuMemberAccountExt - * @Author: sui q - * @Date: 2023/3/23 16:00 */ CuMemberAccountExt insertMemberRecharge(SaOrder saOrderExt); @@ -107,18 +79,11 @@ public interface ICuMemberBusinessService { * * @param pkApprove 审核人 * @param saOrder 销售订单 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/22 16:43 */ Boolean singleRevokeMemberByRegisterOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO); /** * @description: 自助撤单-注册单撤单 - * @author: zhang jing - * @date: 2023/11/23 16:17 - * @param: [pkApprove, saOrder, businessCommissionDTO] - * @return: java.lang.Boolean **/ Boolean singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO); @@ -129,9 +94,6 @@ public interface ICuMemberBusinessService { * @param pkApprove 审核人 * @param memberList 会员lieb * @param saOrderMap 销售订单 - * @return: Boolean - * @Author: sui q - * @Date: 2022/10/22 16:43 */ Boolean mergeRevokeMemberByRegisterOrder(Long pkApprove, List memberList, Map saOrderMap, BusinessCommissionDTO businessCommissionDTO); @@ -141,9 +103,6 @@ public interface ICuMemberBusinessService { * @param pkApprove 审核人 * @param saOrder 订单 * @param cuMember 升级订单 - * @return: R - * @Author: sui q - * @Date: 2023/3/25 14:13 */ Boolean normalRevokeOrder(Long pkApprove, SaOrderExt saOrder, CuMember cuMember, List pkOrderItemList, BusinessCommissionDTO businessCommissionDTO); @@ -152,9 +111,6 @@ public interface ICuMemberBusinessService { * * @param pkApprove 发起人 * @param saOrder 订单 backOrderAmount 需要填写回退的金额 - * @return: void - * @Author: sui q - * @Date: 2023/3/30 15:40 */ void cancelPartOrderBackAmount(Long pkApprove, SaOrderExt saOrder); @@ -188,15 +144,6 @@ public interface ICuMemberBusinessService { */ void orderReturn(SaOrder saOrder, Long userId, BigDecimal changeAmount, String changeRemark); -// /** -// * 订单合单退单 -// * -// * @param returnDTOList 退单DTO列表 -// * @param userId 操作用户ID -// * @return -// */ -// void orderReturnBatch(List returnDTOList, Long userId); - /** * 订单退单注册会员 * @@ -217,42 +164,26 @@ public interface ICuMemberBusinessService { */ String orderSelfDeliver(Long pkMember, Integer pkRate, Integer pkCountry, BigDecimal postage, Long userId); - /** * @description: 自助服务(修改收货地址)-生成订单 - * @author: zhang jing - * @date: 2023/4/18 17:16 - * @param: [saOrder, cuMemberAccountExt] - * @return: void **/ void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount); /* * @description: 会员编号，账户类型，抽奖金额 - * @author: sui q - * @date: 2023/4/25 16:31 - * @param: null null **/ Boolean updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney); - /* * @description: 会员抽奖，购买抽奖次数支付金额 - * @author: sui q - * @date: 2023/4/27 15:54 - * @param: null null **/ Boolean updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney); /* * @description: 会员抽奖，购买抽奖次数支付金额 - * @author: sui q - * @date: 2023/4/27 15:54 - * @param: null null **/ Boolean updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt); - /** * 更新用户等级 * @@ -264,9 +195,6 @@ public interface ICuMemberBusinessService { /* * @description: 查询会员的安置位置 - * @author: sui q - * @date: 2023/8/15 13:58 - * @param: null null **/ CuMember queryCuMemberPlaceDept(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve); 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 1340f901..c6903730 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 @@ -10,35 +10,21 @@ import java.util.List; /** * 隶属团队 服务类 - * - * @author hzs - * @since 2022-09-01 */ public interface ICuMemberTeamService extends IService { /** * @description: 隶属团队列表 - * @author: zhang jing - * @date: 2022/11/9 14:13 - * @param: [cuMemberTeamExt] - * @return: java.util.List **/ List queryCuMemberTeam(CuMemberTeamExt cuMemberTeamExt); /* * @description: 根据会员主键获得所属团队 - * @author: sui q - * @date: 2023/4/25 9:17 - * @param: pkMember 会员主键 **/ CuMemberTeamExt getCuMemberTeamById(Long pkMember); /** * @description: 根据国家查询隶属团队 - * @author: zhang jing - * @date: 2022/11/10 19:26 - * @param: [pkCountry] - * @return: java.util.List **/ List queryCuMemberTeam(Integer pkCountry); @@ -52,9 +38,6 @@ public interface ICuMemberTeamService extends IService { /* * @description: 更新体系下的团队 - * @author: sui q - * @date: 2023/4/24 19:18 - * @param: null null **/ Boolean updateCuMemberTeamByVertex(Long pkTeamCode); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java index 152b236b..0c0272f9 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/mapper/CuBonusStatisMapper.java @@ -9,9 +9,6 @@ import java.util.List; /** * 奖金拨比统计 Mapper 接口 - * - * @author zhangjing - * @since 2023-05-31 */ public interface CuBonusStatisMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java index 8fa55728..c0378e48 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java @@ -13,9 +13,6 @@ import java.util.List; * 奖金拨比统计 * 每个团队，每天一条数据 * 数据来自 订单表和 CU_MEMBER_BONUS 会员奖金-会员奖金汇总表 - * - * @author zhangjing - * @since 2023-05-31 */ @Data public class CuBonusStatisVO { @@ -729,7 +726,7 @@ public class CuBonusStatisVO { */ private String endDate; /** - * 汇率 *100 + * 汇率 * 100 */ private BigDecimal perCent = BigDecimal.ZERO; diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml index 7f6a52a8..588e11fb 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberRechargeDetailMapper.xml @@ -2,33 +2,13 @@ - - - - - - - - - - - - - - - - CREATION_TIME, - DEL_FLAG, - PK_CREATOR, - PK_ID, PK_MEMBER_RECHARGE, PAYMENT_METHOD, PAYMENT_AMOUNT - - insert into CU_MEMBER_RECHARGE_DETAIL (PK_ID, RECHARGE_CODE, PAYMENT_METHOD, PAYMENT_AMOUNT,PK_CREATOR,PAYMENT_BALANCE,PAYMENT_BEFORE_BALANCE) SELECT cu_member_recharge_detail_seq.nextval,d.* FROM ( - SELECT #{item.rechargeCode},#{item.paymentMethod},#{item.paymentAmount} ,#{item.pkCreator},#{item.paymentBalance},#{item.paymentBeforeBalance} + SELECT #{item.rechargeCode},#{item.paymentMethod},#{item.paymentAmount} + ,#{item.pkCreator},#{item.paymentBalance},#{item.paymentBeforeBalance} FROM dual ) d