From a6ee758940176211bcc7c601b4081be04b7bcbd6 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 5 Jun 2025 10:26:07 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=92=A4=E6=B3=A8=E5=86=8C=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89=E6=94=BF=E7=AD=96=E5=B8=81?= =?UTF-8?q?=E6=88=96=E9=87=8D=E6=B6=88=E5=B8=81=EF=BC=8C=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=92=A4=EF=BC=88148=EF=BC=89=EF=BC=9B=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A=E5=92=8C=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/IMemberAccountServiceApi.java | 16 ---- .../MemberAccountServiceProvider.java | 20 ---- .../service/ICuMemberAccountService.java | 1 - .../impl/CuMemberAccountServiceImpl.java | 9 -- .../base/mapper/CuMemberRegisterMapper.java | 9 -- .../base/mapper/CuMemberShareMapper.java | 8 +- .../service/ICuMemberBusinessService.java | 8 -- .../service/ICuMemberRegisterService.java | 21 ++--- .../base/service/ICuMemberShareService.java | 27 +----- .../impl/CuMemberBusinessServiceImpl.java | 93 ------------------- .../impl/CuMemberRegisterServiceImpl.java | 5 +- .../impl/CuMemberShareServiceImpl.java | 18 ---- .../empty/mapper/CuMemberEmptyCodeMapper.java | 3 - .../service/ICuMemberEmptyCodeService.java | 3 - .../impl/CuMemberEmptyCodeServiceImpl.java | 3 - .../mapper/CuMemberSwingNetDetailMapper.java | 14 +-- .../swing/mapper/CuMemberSwingNetMapper.java | 16 +--- .../swing/param/CuMemberSwingNetDetailVO.java | 7 +- .../swing/param/CuMemberSwingNetParam.java | 7 +- .../member/swing/param/SwingNetLogParam.java | 7 +- .../ICuMemberSwingNetDetailService.java | 15 +-- .../service/ICuMemberSwingNetService.java | 25 ++--- .../CuMemberSwingNetDetailServiceImpl.java | 3 - .../impl/CuMemberSwingNetServiceImpl.java | 12 +-- .../hzs/member/swing/vo/CuMemberRetVO.java | 7 +- .../member/base/CuMemberRegisterMapper.xml | 1 - .../member/base/CuMemberShareMapper.xml | 1 - .../impl/OrderBusinessServiceImpl.java | 18 ++-- .../domain/member/base/CuMemberRegister.java | 5 - .../domain/member/base/CuMemberShare.java | 5 - .../member/empty/CuMemberEmptyCode.java | 3 - .../domain/member/swing/CuMemberSwingNet.java | 5 - .../member/swing/CuMemberSwingNetDetail.java | 3 - .../swing/ext/CuMemberSwingNetDetailExt.java | 7 +- .../member/swing/ext/CuMemberSwingNetExt.java | 7 +- 35 files changed, 46 insertions(+), 366 deletions(-) diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java index 6eb06d6c..c3daad71 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java @@ -47,14 +47,6 @@ public interface IMemberAccountServiceApi { */ R orderChangeProduct(SaOrder saOrder, SaOrder updateOrder, Long userId, Object obj); - /** - * 订单退单注册会员 - * - * @param pkMemberList 会员ID列表 - * @param userId 操作用户ID - */ - R orderReturnMember(List pkMemberList, Long userId); - /** * 订单自提退邮费 * @@ -67,14 +59,6 @@ public interface IMemberAccountServiceApi { */ R orderSelfDeliver(Long pkMember, Integer pkRate, Integer pkCountry, BigDecimal postage, Long userId); - /** - * 扣款并插入明细 - * - * @param saOrder 订单 - * @param cuMemberAccount 会员账户 - */ - R insertMemberTrade(SaOrder saOrder, CuMemberAccountExt cuMemberAccount); - /** * 订单合单退单 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java index 0bce26ab..cfbafa5b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java @@ -56,16 +56,6 @@ public class MemberAccountServiceProvider implements IMemberAccountServiceApi { return R.ok(); } - @Override - public R orderReturnMember(List pkMemberList, Long userId) { - try { - iCuMemberBusinessService.orderReturnMember(pkMemberList, userId); - } catch (Exception e) { - return R.fail(e.getMessage()); - } - return R.ok(); - } - @Override public R orderSelfDeliver(Long pkMember, Integer pkRate, Integer pkCountry, BigDecimal postage, Long userId) { try { @@ -79,16 +69,6 @@ public class MemberAccountServiceProvider implements IMemberAccountServiceApi { return R.ok(); } - @Override - public R insertMemberTrade(SaOrder saOrder, CuMemberAccountExt cuMemberAccount) { - try { - iCuMemberBusinessService.insertMemberTrade(saOrder, cuMemberAccount); - } catch (Exception e) { - return R.fail(e.getMessage()); - } - return R.ok(); - } - @Override public R orderReturnBatch(SaOrder saOrder, Long userId) { try { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java index b42b3db1..1f26196b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java @@ -24,7 +24,6 @@ public interface ICuMemberAccountService extends IService { */ List queryMemberAccountByCondition(CuMemberAccount cuMemberAccount); - /** * 根据会员编码获取余额 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java index e883378e..48d27424 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java @@ -72,15 +72,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl - * @Author: sui q - * @Date: 2022/9/5 11:57 - */ @Override public List queryMemberAccountByCondition(CuMemberAccount cuMemberAccount) { return baseMapper.queryMemberAccountByCondition(cuMemberAccount); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java index ad0722f3..038c5495 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 会员历史记录 Mapper 接口 - * - * @author hzs - * @since 2022-08-22 */ public interface CuMemberRegisterMapper extends BaseMapper { @@ -20,9 +17,6 @@ public interface CuMemberRegisterMapper extends BaseMapper { * 根据条件查询会员注册信息 * * @param memberParam 会员查询条件 - * @return: List - * @Author: sui q - * @Date: 2022/10/13 9:51 */ List queryCuMemberRegisterExeByCondition(MemberParam memberParam); @@ -30,9 +24,6 @@ public interface CuMemberRegisterMapper extends BaseMapper { * 将用户注册表信息更改为死点 * * @param cuMemberRegister 会员注册信息 - * @return: void - * @Author: sui q - * @Date: 2022/10/22 21:11 */ void updateCuMemberRegister(CuMemberRegister cuMemberRegister); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java index 9683ac95..bea74eaa 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java @@ -8,18 +8,16 @@ import com.hzs.member.marketnews.vo.SeaFlourVo; import java.util.List; /** - *

* 分享注册记录会员 Mapper 接口 - *

- * - * @author hzs - * @since 2023-03-15 */ public interface CuMemberShareMapper extends BaseMapper { + /** * 海粉列表 + * * @param seaFlourParam * @return */ List seaFlourList(SeaFlourParam seaFlourParam); + } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java index 888bf4ae..ab75377d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java @@ -131,14 +131,6 @@ public interface ICuMemberBusinessService { */ void orderChangeProduct(SaOrder saOrder, SaOrder updateOrder, Long userId, Object obj); - /** - * 订单退单注册会员 - * - * @param pkMemberList 会员ID列表 - * @param userId 操作用户ID - */ - void orderReturnMember(List pkMemberList, Long userId); - /** * 订单自提退邮费 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java index 7b8a2555..1d4ae7f3 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java @@ -9,37 +9,28 @@ import java.util.List; /** * 会员历史记录 服务类 - * - * @author hzs - * @since 2022-08-22 */ public interface ICuMemberRegisterService extends IService { /** * 根据条件查询会员注册信息 + * * @param memberParam 会员查询条件 - * @return: List - * @Author: sui q - * @Date: 2022/10/13 9:51 - */ + */ List queryCuMemberRegisterExeByCondition(MemberParam memberParam); /** * 根据会员主键查询会员注册信息 + * * @param pkMember 会员主键 - * @return: CuMemberRegister - * @Author: sui q - * @Date: 2023/3/29 18:33 - */ + */ CuMemberRegister queryCuMemberRegister(Long pkMember); /** * 将用户注册表信息更改为死点 + * * @param cuMemberRegister 会员注册信息 - * @return: void - * @Author: sui q - * @Date: 2022/10/22 21:11 - */ + */ void updateCuMemberRegister(CuMemberRegister cuMemberRegister); /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java index 1b396981..5a661fe2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java @@ -8,44 +8,27 @@ import com.hzs.member.marketnews.vo.SeaFlourVo; import java.util.List; /** - *

* 分享注册记录会员 服务类 - *

- * - * @author hzs - * @since 2023-03-15 */ public interface ICuMemberShareService extends IService { - /** - * 保存会员分享 - * @param cuMemberShare 会员分享 - * @return: CuMemberShare - * @Author: sui q - * @Date: 2023/3/15 10:42 - */ - Boolean saveCuMemberShare(CuMemberShare cuMemberShare); - /** * 查询会员分享 + * * @param pkMember 会员主键 - * @return: CuMemberShare - * @Author: sui q - * @Date: 2023/3/15 14:29 - */ + */ CuMemberShare queryCuMemberShare(Long pkMember); /** * 更新会员分享的支付状态 + * * @param pkMember 会员主机那 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/15 14:32 - */ + */ Boolean updateCuMemberShare(Long pkMember); /** * 海粉列表 + * * @param seaFlourParam * @return */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 0980a78c..5fb807bf 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -1129,99 +1129,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { } } - @Transactional(rollbackFor = Exception.class) - @Override - public void orderReturnMember(List pkMemberList, Long userId) { - // 注册类订单，需要更新用户为已注销状态 - LambdaUpdateWrapper memberUpdateWrapper = new LambdaUpdateWrapper<>(); - memberUpdateWrapper.in(CuMember::getPkId, pkMemberList); - memberUpdateWrapper.set(CuMember::getPkModified, userId); - memberUpdateWrapper.set(CuMember::getModifiedTime, new Date()); - memberUpdateWrapper.set(CuMember::getCategory, ECategory.LOGGED_OUT.getValue()); - iCuMemberService.update(memberUpdateWrapper); - // 添加会员信息修改记录 - List cuMemberChangeLogList = new ArrayList<>(); - for (Long pkMember : pkMemberList) { - CuMemberChangeLog cuMemberChangeLog = new CuMemberChangeLog(); - cuMemberChangeLog.setPkMember(pkMember); - cuMemberChangeLog.setChangeType(EMemberChangeType.ORDER_RETURN.getValue()); - cuMemberChangeLog.setChangeFront(""); - cuMemberChangeLog.setChangeAfter(ECategory.LOGGED_OUT.getLabel()); - cuMemberChangeLogList.add(cuMemberChangeLog); - } - iCuMemberChangeLogService.saveBatch(cuMemberChangeLogList); - } - - - /** - * 根据订单生成 - * - * @param saOrder 订单 - * @param pkAccount 账户类型 - * @param eTradeType 交易类型（小类） - * @param eTradeClassify 交易分类（大类） - * @param beforeBalance 交易前余额 - * @param tradeAmount 交易金额 - * @param remarks 备注 - * @param userId 操作用户 - * @return - */ - private CuMemberTrade createMemberTradeByOrder(SaOrder saOrder, Integer pkAccount, ETradeType eTradeType, ETradeClassify eTradeClassify, - BigDecimal beforeBalance, BigDecimal tradeAmount, String remarks, Long userId) { - CuMemberTrade result = CuMemberTrade.builder() - .pkMember(saOrder.getPkCreator()) - .tradeCode(memberToolsHandler.createTradeCode(EOrderPrefix.TRADE_CODE.getValue())) - .pkAccount(pkAccount) - .tradeType(eTradeType.getValue()) - .tradeClassify(eTradeClassify.getValue()) - .pkRate(saOrder.getPkRate()) - .tradeBeforeBalance(beforeBalance) - .tradeAmount(tradeAmount) - .tradeBalance(beforeBalance.add(tradeAmount)) - .sourceCode(saOrder.getOrderCode()) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .remarks(remarks) - .build(); - result.setPkCountry(saOrder.getPkCountry()); - result.setPkCreator(userId); - result.setCreationTime(new Date()); - return result; - } - - /** - * 根据交易明细生成 - * - * @param cuMemberTrade 交易明细 - * @param eTradeType 交易类型（小类） - * @param eTradeClassify 交易分类（大类） - * @param beforeBalance 交易前余额 - * @param tradeAmount 交易金额 - * @param remarks 备注 - * @param userId 操作用户 - * @return - */ - private CuMemberTrade createMemberTradeByTrade(CuMemberTrade cuMemberTrade, ETradeType eTradeType, ETradeClassify eTradeClassify, - BigDecimal beforeBalance, BigDecimal tradeAmount, String remarks, Long userId) { - CuMemberTrade result = CuMemberTrade.builder() - .pkMember(cuMemberTrade.getPkMember()) - .tradeCode(memberToolsHandler.createTradeCode(EOrderPrefix.TRADE_CODE.getValue())) - .pkAccount(cuMemberTrade.getPkAccount()) - .tradeType(eTradeType.getValue()) - .tradeClassify(eTradeClassify.getValue()) - .pkRate(cuMemberTrade.getPkRate()) - .tradeBeforeBalance(beforeBalance) - .tradeAmount(tradeAmount) - .tradeBalance(beforeBalance.add(tradeAmount)) - .sourceCode(cuMemberTrade.getSourceCode()) - .tradeStatue(ETradeStatus.TAKE_EFFECT.getValue()) - .remarks(remarks) - .build(); - result.setPkCountry(cuMemberTrade.getPkCountry()); - result.setPkCreator(userId); - result.setCreationTime(new Date()); - return result; - } - @Override public String orderSelfDeliver(Long pkMember, Integer pkRate, Integer pkCountry, BigDecimal postage, Long userId) { // 查询退邮费对应币种 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java index c46d3406..49760771 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java @@ -17,16 +17,13 @@ import java.util.List; /** * 会员历史记录 服务实现类 - * - * @author hzs - * @since 2022-08-22 */ @Service public class CuMemberRegisterServiceImpl extends ServiceImpl implements ICuMemberRegisterService { @Override public List queryCuMemberRegisterExeByCondition(MemberParam memberParam) { - if(memberParam.getEndDate() != null){ + if (memberParam.getEndDate() != null) { memberParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, memberParam.getEndDate())); } return baseMapper.queryCuMemberRegisterExeByCondition(memberParam); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java index 917bdecd..812819e2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java @@ -14,24 +14,11 @@ import org.springframework.stereotype.Service; import java.util.List; /** - *

* 分享注册记录会员 服务实现类 - *

- * - * @author hzs - * @since 2023-03-15 */ @Service public class CuMemberShareServiceImpl extends ServiceImpl implements ICuMemberShareService { - @Override - public Boolean saveCuMemberShare(CuMemberShare cuMemberShare) { - if (baseMapper.insert(cuMemberShare) > 0) { - return Boolean.TRUE; - } - return Boolean.FALSE; - } - @Override public CuMemberShare queryCuMemberShare(Long pkMember) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -48,11 +35,6 @@ public class CuMemberShareServiceImpl extends ServiceImpl 0 ? Boolean.TRUE : Boolean.FALSE; } - /** - * 海粉列表 - * @param seaFlourParam - * @return - */ @Override public List seaFlourList(SeaFlourParam seaFlourParam) { return baseMapper.seaFlourList(seaFlourParam); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java index 4d5957fa..0cb935b1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java @@ -8,9 +8,6 @@ import java.util.List; /** * 会员空单编号 Mapper 接口 - * - * @author hzs - * @since 2023-08-29 */ public interface CuMemberEmptyCodeMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java index 9e2ca8f7..885b2608 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java @@ -7,9 +7,6 @@ import java.util.List; /** * 会员空单编号 服务类 - * - * @author hzs - * @since 2023-08-29 */ public interface ICuMemberEmptyCodeService extends IService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java index 2938d2c8..a0189815 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java @@ -19,9 +19,6 @@ import java.util.List; /** * 会员空单编号 服务实现类 - * - * @author hzs - * @since 2023-08-29 */ @Service public class CuMemberEmptyCodeServiceImpl extends ServiceImpl implements ICuMemberEmptyCodeService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java index 7d637174..e5b9e1a0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java @@ -8,20 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员甩网设置明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-08-30 */ public interface CuMemberSwingNetDetailMapper extends BaseMapper { - /* - * @description: 更新或修改会员甩网设置明细 - * @author: sui q - * @date: 2023/8/30 11:23 - * @param: null null - **/ + /** + * 更新或修改会员甩网设置明细 + */ void mergeCuMemberSwingNetDetail(@Param("cuMemberSwingNetDetailVOList") List cuMemberSwingNetDetailVOList); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java index 030403ec..6c6c8a6f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java @@ -10,29 +10,17 @@ import com.hzs.member.swing.param.SwingNetLogParam; import java.util.List; /** - *

* 会员网体甩网配置 Mapper 接口 - *

- * - * @author hzs - * @since 2023-08-30 */ public interface CuMemberSwingNetMapper extends BaseMapper { /* - * @description: 查询甩网数据 - * @author: sui q - * @date: 2023/8/30 15:05 - * @param: null null + * 查询甩网数据 **/ List queryCuMemberSwingNetExt(CuMemberSwingNetParam cuMemberSwingNetParam); /** - * @description: 甩网配置详情 - * @author: zhang jing - * @date: 2024/3/12 9:53 - * @param: [param] - * @return: java.util.List + * 甩网配置详情 **/ List swingNetLogList(SwingNetLogParam param); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java index 2d7e77ec..17d138b2 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java @@ -8,12 +8,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @description: 甩网配置明细 - * @author: sui q - * @time: 2023/8/30 11:13 - * @classname: CuMemberSwingNetDetailVO - * @package_name: com.hzs.member.swing.param - * version 1.0.0 + * 甩网配置明细 */ @Data public class CuMemberSwingNetDetailVO implements Serializable { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java index 24ee9d32..58aa87c5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java @@ -7,12 +7,7 @@ import java.util.Date; import java.util.List; /** - * @description: 甩网配置 - * @author: sui q - * @time: 2023/8/30 11:12 - * @classname: CuMemberSwingNetVO - * @package_name: com.hzs.member.swing.param - * version 1.0.0 + * 甩网配置 */ @Data public class CuMemberSwingNetParam implements Serializable { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java index a8eb6949..324d319f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java @@ -4,14 +4,9 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; -import java.util.List; /** - * @description: 甩网详情Param - * @author: zhang jing - * @date: 2024/3/11 15:39 - * @param: - * @return: + * 甩网详情Param **/ @Data public class SwingNetLogParam implements Serializable { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java index 6178ec44..b866a2a9 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java @@ -3,25 +3,16 @@ package com.hzs.member.swing.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.swing.CuMemberSwingNetDetail; import com.hzs.member.swing.param.CuMemberSwingNetDetailVO; -import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员甩网设置明细 服务类 - *

- * - * @author hzs - * @since 2023-08-30 */ public interface ICuMemberSwingNetDetailService extends IService { - /* - * @description: 更新或修改会员甩网设置明细 - * @author: sui q - * @date: 2023/8/30 11:23 - * @param: null null - **/ + /** + * 更新或修改会员甩网设置明细 + */ void mergeCuMemberSwingNetDetail(List cuMemberSwingNetDetailVOList); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java index 2bba30b8..dc1f7532 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java @@ -10,29 +10,18 @@ import com.hzs.member.swing.param.SwingNetLogParam; import java.util.List; /** - *

* 会员网体甩网配置 服务类 - *

- * - * @author hzs - * @since 2023-08-30 */ public interface ICuMemberSwingNetService extends IService { - /* - * @description: 保存会员甩网数据 - * @author: sui q - * @date: 2023/8/30 11:14 - * @param: null null - **/ + /** + * 保存会员甩网数据 + */ void saveCuMemberSingNet(CuMemberSwingNetParam cuMemberSwingNetParam, Integer pkCountry, Long pkCreator); - /* - * @description: 查询甩网数据 - * @author: sui q - * @date: 2023/8/30 15:05 - * @param: null null - **/ + /** + * 查询甩网数据 + */ List queryCuMemberSwingNetExt(CuMemberSwingNetParam cuMemberSwingNetParam); /** @@ -43,6 +32,6 @@ public interface ICuMemberSwingNetService extends IService { */ void deleteNet(Long pkId, Long userId); - ListswingNetLogList(SwingNetLogParam param); + List swingNetLogList(SwingNetLogParam param); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java index 0d9ce1cc..e5fef4c6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java @@ -11,9 +11,6 @@ import java.util.List; /** * 会员甩网设置明细 服务实现类 - * - * @author hzs - * @since 2023-08-30 */ @Service public class CuMemberSwingNetDetailServiceImpl extends ServiceImpl implements ICuMemberSwingNetDetailService { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java index 48ba1237..b5e92fa7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java @@ -28,16 +28,12 @@ import java.util.stream.Collectors; /** * 会员网体甩网配置 服务实现类 - * - * @author hzs - * @since 2023-08-30 */ @Service public class CuMemberSwingNetServiceImpl extends ServiceImpl implements ICuMemberSwingNetService { @Autowired - private ICuMemberSwingNetDetailService cuMemberSwingNetDetailService; - + private ICuMemberSwingNetDetailService iCuMemberSwingNetDetailService; @Override @Transactional(rollbackFor = Exception.class) @@ -75,11 +71,11 @@ public class CuMemberSwingNetServiceImpl extends ServiceImpl - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml index 10903ed7..857526d6 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml @@ -20,7 +20,6 @@ -