From c89448aa0ec87638e4714ee2f38404774e73b989 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 27 May 2025 16:33:14 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=B4=AD=E7=A5=A8=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/member/base/IMemberServiceApi.java | 64 ++++------- .../base/provider/MemberServiceProvider.java | 63 +---------- .../ticket/mapper/AcTicketMapper.java | 16 +++ .../ticket/service/IAcTicketService.java | 2 +- .../service/impl/AcTicketServiceImpl.java | 8 +- .../controller/ParentOrderController.java | 102 ++++++------------ .../api/ApiOthSaOrderController.java | 52 +-------- .../controller/api/ApiSaTicketController.java | 51 ++++----- .../controller/manage/SaTicketController.java | 3 +- .../sale/ticket/service/ISaTicketService.java | 11 +- .../service/impl/SaTicketServiceImpl.java | 4 +- .../mapper/activity/ticket/AcTicketMapper.xml | 13 ++- .../mapper/sale/ticket/SaTicketMapper.xml | 39 ++++--- .../domain/sale/ticket/SaBuyTicket.java | 2 +- .../common/domain/sale/ticket/SaTicket.java | 9 +- 15 files changed, 149 insertions(+), 290 deletions(-) diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java index 50d8b445..8335cff4 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java @@ -134,7 +134,6 @@ public interface IMemberServiceApi { * * @param memberId 会员编号 * @param placeDept 1代表左区极左极下，2代表右区极左极下 - * @return: CuMemberExt */ R queryPlaceSponsorLastLeft(Long memberId, Integer placeDept); @@ -162,28 +161,21 @@ public interface IMemberServiceApi { */ R queryMember(String memberCode); - /* - * 查询会员 - * @author: sui q - * @date: 2023/4/25 10:32 - * @param: null null - **/ + /** + * 查询会员 + */ R queryMember(Long pkMember); /** * 保存新会员信息,待支付订单 * * @param cuMember 会员信息 - * @return: R */ R saveMember(CuMember cuMember); - /* - * 查询网体是否存在推荐人 - * @author: sui q - * @date: 2023/9/11 9:53 - * @param: null null - **/ + /** + * 查询网体是否存在推荐人 + */ R queryCuMemberByPkMember(Long pkReference); /** @@ -191,7 +183,6 @@ public interface IMemberServiceApi { * * @param saOrder 订单信息 * @param cuMemberAccountExt 会员账户信息 - * @return: Boolean */ R saveMember(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt); @@ -200,7 +191,6 @@ public interface IMemberServiceApi { * * @param cuMember 会员信息 * @param saOrder 订单信息 - * @return: Boolean */ R saveMember(CuMember cuMember, SaOrder saOrder); @@ -210,7 +200,6 @@ public interface IMemberServiceApi { * @param cuMember 会员信息 * @param saOrder 订单信息 * @param cuMemberAccountExt 会员账户信息 - * @return: Boolean */ R saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt); @@ -221,7 +210,6 @@ public interface IMemberServiceApi { * @param saOrder 订单信息 * @param isPay 是否支付 * @param cuMemberAccountExt 支付账号 - * @return: R */ R saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt); @@ -230,7 +218,6 @@ public interface IMemberServiceApi { * * @param cuMember 会员 * @param isHaiFun 是否嗨粉 - * @return: R */ R createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun); @@ -238,7 +225,6 @@ public interface IMemberServiceApi { * 创建注册会员编号（放入会员编号批次占用） * * @param cuMember 会员信息 - * @return */ R createRegisterMemberCode(CuMember cuMember); @@ -246,7 +232,6 @@ public interface IMemberServiceApi { * 创建空单注册会员 * * @param member - * @return */ R createEmptyOrderMember(CuMemberExt member); @@ -254,7 +239,6 @@ public interface IMemberServiceApi { * 校验会员下的安置人、推荐人是否存在 * * @param pkMember 会员ID - * @return */ R checkLowerMember(Long pkMember); @@ -262,7 +246,6 @@ public interface IMemberServiceApi { * 取消用户（取消注册相关订单，同步取消用户） * * @param pkMember - * @return */ R cancelMember(Long pkMember); @@ -271,7 +254,6 @@ public interface IMemberServiceApi { * * @param pkMemberList 会员ID列表 -- 必传 * @param pkCountry 国家ID -- 非必传 - * @return */ R> findMemberByMemberId(List pkMemberList, Integer pkCountry); @@ -279,7 +261,6 @@ public interface IMemberServiceApi { * 查询分享会员 * * @param pkMember 主键 - * @return: R */ R queryCuMemberShare(Long pkMember); @@ -287,23 +268,22 @@ public interface IMemberServiceApi { * 根据会员主键查询会员注册信息 * * @param pkMember 会员主键 - * @return: CuMemberRegister */ R queryCuMemberRegister(Long pkMember); - /* - * 会员编号，账户类型，抽奖金额 - **/ + /** + * 会员编号，账户类型，抽奖金额 + */ R updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney); - /* - * 会员抽奖，购买抽奖次数支付金额 - **/ + /** + * 会员抽奖，购买抽奖次数支付金额 + */ R updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney); - /* - * 会员抽奖，购买抽奖次数支付金额 - **/ + /** + * 会员抽奖，购买抽奖次数支付金额 + */ R updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt); /** @@ -321,7 +301,6 @@ public interface IMemberServiceApi { * * @param topCode 顶点编号 * @param userId 当前会员 - * @return */ R checkParent(String topCode, Long userId); @@ -330,7 +309,6 @@ public interface IMemberServiceApi { * * @param topCodeList 顶点编号列表 * @param userId 当前会员 - * @return */ R checkMemberByParentList(List topCodeList, Long userId); @@ -350,7 +328,6 @@ public interface IMemberServiceApi { * 校验商品团队信息是否可见 * * @param showWaresDTOS - * @return */ R> checkIsShowWares(List showWaresDTOS); @@ -368,9 +345,9 @@ public interface IMemberServiceApi { */ R clearMemberEmptyCode(); - /* - * 查询伞下会员 - **/ + /** + * 查询伞下会员 + */ R queryCuMemberUnderUmbrella(Long pkMember); /** @@ -383,7 +360,6 @@ public interface IMemberServiceApi { * * @param topCode 顶点编号 * @param pkMember 当前会员 - * @return */ R checkPlaceParent(String topCode, Long pkMember); @@ -397,7 +373,6 @@ public interface IMemberServiceApi { * * @param userId 当前用户 * @param pkCountry 所属国家 - * @return */ R handleExpireDate(Long userId, Integer pkCountry); @@ -410,7 +385,6 @@ public interface IMemberServiceApi { * 更新会员信息（目前部分活动使用，） * * @param cuMember 会员信息 - * @return */ R updateMemberInfo(CuMember cuMember); @@ -420,7 +394,7 @@ public interface IMemberServiceApi { * @param memberContinueDTO * @return */ - R handleMemberContinue(MemberContinueDTO memberContinueDTO); + R handleMemberContinue(MemberContinueDTO memberContinueDTO); /** * 根据会员编号查询会员信息（数量超过1000） diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java index d9e136e2..2073ac74 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java @@ -93,12 +93,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.getMemberByCode(memberCode)); } - /** - * 前台查询会员的方法，通过传输不同的参数，查询不同的会员 - * - * @param cuMember 会员各种值 - * @return: R - */ @Override public R> getMemberInfo(CuMember cuMember) { return R.ok(iCuMemberService.getMemberInfoByCondition(cuMember)); @@ -130,9 +124,6 @@ public class MemberServiceProvider implements IMemberServiceApi { } } - /** - * @description: 自助撤单-注册单撤单 - **/ @Override public R singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) { try { @@ -143,7 +134,6 @@ public class MemberServiceProvider implements IMemberServiceApi { } } - @Override public R mergeRevokeMemberByRegisterOrder(Long pkApprove, List memberList, Map saOrderMap, BusinessCommissionDTO businessCommissionDTO) { try { @@ -191,24 +181,11 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList)); } - /** - * 查找安置人伞下 - * - * @param memberId 安置人，编号 - * @return: List - */ @Override public R> queryPlaceSponsorUnderUmbrella(Long memberId, String... placeParent) { return R.ok(iCuMemberService.queryPlaceSponsorUnderUmbrella(memberId, placeParent)); } - /** - * 根据会员编号，查找该会员编号极左极下的那个人 - * - * @param memberId 会员编号 - * @param placeDept 1代表左区极左极下，2代表右区极左极下 - * @return: CuMemberExt - */ @Override public R queryPlaceSponsorLastLeft(Long memberId, Integer placeDept) { return R.ok(iCuMemberService.queryPlaceSponsorLastLeft(memberId, placeDept)); @@ -234,12 +211,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.queryMember(pkMember)); } - /** - * 保存会员信息，预订单 - * - * @param cuMember 会员 - * @return: R - */ @Override public R saveMember(CuMember cuMember) { try { @@ -275,14 +246,6 @@ public class MemberServiceProvider implements IMemberServiceApi { } } - /** - * 修改会员信息，确认升级、复购订单信息，流水（升级订单、复购订单） - * - * @param cuMember 会员信息 - * @param saOrder 订单信息 - * @param cuMemberAccountExt 会员账户信息 - * @return: Boolean - */ @Override public R saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt) { try { @@ -293,14 +256,6 @@ public class MemberServiceProvider implements IMemberServiceApi { } } - /** - * 修改会员信息，确认注册订单信息，流水（升级订单、复购订单） - * - * @param cuMember 会员信息 - * @param saOrder 订单信息 - * @param cuMemberAccountExt 会员账户信息 - * @return: Boolean - */ @Override public R saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt) { try { @@ -321,12 +276,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.createRegisterMemberCode(cuMember)); } - /** - * 创建空单注册会员 - * - * @param member - * @return - */ @Override public R createEmptyOrderMember(CuMemberExt member) { return R.ok(iCuMemberService.createEmptyOrderMember(member)); @@ -410,12 +359,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.findAll()); } - /** - * 校验商品团队信息是否可见 - * - * @param showWaresDTOS - * @return - */ @Override public R> checkIsShowWares(List showWaresDTOS) { return R.ok(iCuMemberService.checkIsShowWares(showWaresDTOS)); @@ -436,9 +379,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(iCuMemberService.queryCuMemberUnderUmbrella(pkMember)); } - /** - * @description: 零元撤单签呈列表 - **/ @Override public R> zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam) { return R.ok(iCuMemberService.zeroByBusinessList(analysisBusinessAppealParam)); @@ -477,7 +417,6 @@ public class MemberServiceProvider implements IMemberServiceApi { return R.ok(); } - @Override public R updateMemberExpireDate() { try { @@ -501,7 +440,7 @@ public class MemberServiceProvider implements IMemberServiceApi { } @Override - public R handleMemberContinue(MemberContinueDTO memberContinueDTO) { + public R handleMemberContinue(MemberContinueDTO memberContinueDTO) { try { String str = iCuMemberBusinessService.handleMemberContinue(memberContinueDTO); if (null == str) { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/mapper/AcTicketMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/mapper/AcTicketMapper.java index f626d031..f1ac8e70 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/mapper/AcTicketMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/mapper/AcTicketMapper.java @@ -2,10 +2,26 @@ package com.hzs.activity.ticket.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.activity.ticket.AcTicket; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; /** * 门票 Mapper 接口 */ public interface AcTicketMapper extends BaseMapper { + /** + * 购票活动列表 + * + * @param queryDate + * @param pkVertex + * @param pkCountry + * @return + */ + List listTicket(@Param("queryDate") Date queryDate, + @Param("pkVertex") Long pkVertex, + @Param("pkCountry") Integer pkCountry); + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/IAcTicketService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/IAcTicketService.java index e354f705..a8f23038 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/IAcTicketService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/IAcTicketService.java @@ -19,5 +19,5 @@ public interface IAcTicketService extends IService { /* * 根据查询日期查询能展示的活动 **/ - List queryAcTicketByDate(Date queryDate, Integer pkCountry); + List listTicket(Date queryDate, Long pkVertex, Integer pkCountry); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/impl/AcTicketServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/impl/AcTicketServiceImpl.java index 15a3c95b..1e645bd2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/impl/AcTicketServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/impl/AcTicketServiceImpl.java @@ -27,11 +27,7 @@ public class AcTicketServiceImpl extends ServiceImpl i } @Override - public List queryAcTicketByDate(Date queryDate, Integer pkCountry) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.le(AcTicket::getDisStartDate, queryDate); - queryWrapper.ge(AcTicket::getDisEndDate, queryDate); - queryWrapper.eq(AcTicket::getPkCountry, pkCountry); - return baseMapper.selectList(queryWrapper); + public List listTicket(Date queryDate, Long pkVertex, Integer pkCountry) { + return baseMapper.listTicket(queryDate, pkVertex, pkCountry); } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java index 563089d2..3523dcb9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java @@ -32,7 +32,6 @@ import com.hzs.sale.shopping.service.IShoppingCartService; import com.hzs.sale.shopping.vo.ProductGroup; import com.hzs.sale.shopping.vo.ShoppingCartRedis; import com.hzs.sale.shopping.vo.ShoppingCartVO; -import com.hzs.sale.wares.service.IBdWaresDetailService; import com.hzs.system.base.IAreaServiceApi; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; @@ -54,23 +53,15 @@ public abstract class ParentOrderController extends BaseController { @DubboReference IMemberServiceApi iMemberServiceApi; - private ISaOrderService iSaOrderService; - - @Autowired - private IBdWaresDetailService iBdWaresDetailService; @Autowired protected IShoppingCartService iShoppingCartService; - + @Autowired protected RedisService redisService; + private ISaOrderService iSaOrderService; @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - - @Autowired - public void setOrderService(ISaOrderService iSaOrderService) { - this.iSaOrderService = iSaOrderService; + public void setOrderService(ISaOrderService orderService) { + this.iSaOrderService = orderService; } public ISaOrderService getOrderService() { @@ -79,22 +70,18 @@ public abstract class ParentOrderController extends BaseController { /** + * 根据code、编码获取值 + * * @param code 查询的code - * @Description: 根据code、编码获取值 - * @return: CuMember - * @Author: sui q - * @Date: 2022/8/30 8:48 */ protected CuMember getCuMemberByCode(String code) { return iSaOrderService.getCuMemberByCode(code); } /** + * 验证字段是否必输 + * * @param fieldList 需要验证的字段 - * @Description: 验证字段是否必输 - * @return: boolean - * @Author: sui q - * @Date: 2022/8/29 11:13 */ protected boolean validateFieldNotNull(OrderParam orderParam, List fieldList) { return fieldList.stream().anyMatch(field -> { @@ -104,11 +91,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证手机号+姓名 + * * @param orderParam 手机号、姓名、安置人必输 - * @Description: 验证手机号+姓名 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:51 */ protected AjaxResult validatePhone(OrderParam orderParam) { if (StringUtils.isEmpty(orderParam.getPhone()) || StringUtils.isEmpty(orderParam.getMemberName())) { @@ -169,11 +154,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证推荐编号，成功后返回姓名，如果首单返回安置人、安置部门 + * * @param orderParam 必须推荐人 - * @Description: 验证推荐编号，成功后返回姓名，如果首单返回安置人、安置部门 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ protected AjaxResult validateReferenceRelation(OrderParam orderParam) { if (StringUtils.isEmpty(orderParam.getParent())) { @@ -256,11 +239,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证安置编号、安置部门，成功后返回姓名 + * * @param orderParam 必须安置人 - * @Description: 验证安置编号、安置部门，成功后返回姓名 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ protected AjaxResult validatePlaceParentMemberCode(OrderParam orderParam) { if (StringUtils.isEmpty(orderParam.getParent())) { @@ -333,11 +314,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证需要注册的信息, 订单保存时需要调用的验证 + * * @param orderParam 所有信息 - * @Description: 验证需要注册的信息, 订单保存时需要调用的验证 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/9/2 16:15 */ protected AjaxResult validateSaveMember(OrderParam orderParam) { // 安置编号 @@ -387,12 +366,10 @@ public abstract class ParentOrderController extends BaseController { } /** + * 对安置位置进行加锁预防位置重复 + * * @param placeParentId 安置人 * @param placeDept 安置位置 - * @Description: 对安置位置进行加锁预防位置重复 - * @return: void - * @Author: sui q - * @Date: 2022/9/5 9:20 */ protected boolean validatePlacePosition(Long placeParentId, Integer placeDept) { // 验证通过对安置人，安置部门加锁，防止同时安置引起错误，最后解锁 @@ -402,10 +379,6 @@ public abstract class ParentOrderController extends BaseController { /** * @param placeParentId 安置位置 * @param placeDept 安置部门 - * @Description: - * @return: String - * @Author: sui q - * @Date: 2022/9/5 10:35 */ private String getLockKey(Long placeParentId, Integer placeDept) { return CacheConstants.POSITION + @@ -414,20 +387,13 @@ public abstract class ParentOrderController extends BaseController { } /** + * 空单注册 验证权限，验证编号是否有报单权限 + * * @param centerCodeId 验证的权限 - * @Description: 空单注册 验证权限，验证编号是否有报单权限 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:53 */ protected AjaxResult validateRegisterAuthority(Long centerCodeId, Integer specialArea) { // 前台登录验证登录会员，后台空点验证输入的报单人 CuMember cuMember = iSaOrderService.getCuMemberByKey(centerCodeId); - // 2024.01.11新需求（6866），报单413除0元会员之外，都可以进行报单 - if (null != specialArea - && EGrade.START_UP.getIndex() != cuMember.getPkSettleGrade()) { - return AjaxResult.success(); - } if (cuMember == null || cuMember.getRegisterAuthority() == ERegistrationAuthority.ORDINARY.getValue()) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.REGISTER_AUTHORITY)); } @@ -503,10 +469,6 @@ public abstract class ParentOrderController extends BaseController { * 验证手机号注册次数 * * @param cuMemberExtList 会员数量 - * @Description: - * @return: Boolean - * @Author: sui q - * @Date: 2022/8/29 11:38 */ private Boolean validatePhoneCount(List cuMemberExtList) { // 判断次数，获取系统参数，从redis中获取系统参数 @@ -527,7 +489,7 @@ public abstract class ParentOrderController extends BaseController { * @return AjaxResult */ protected AjaxResult validateMemberAccount(OrderParam orderParam) { - List cuMemberAccountExtList = getOrderService().queryMemberAccountByCondition(getCuMemberAccount(orderParam)); + List cuMemberAccountExtList = iSaOrderService.queryMemberAccountByCondition(getCuMemberAccount(orderParam)); if (cuMemberAccountExtList == null || cuMemberAccountExtList.size() <= 0) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.CENTER_NOT_EXISTS)); } @@ -544,11 +506,9 @@ public abstract class ParentOrderController extends BaseController { } /** + * 验证升级关系，只能给自己或者自己安置伞下升级 + * * @param orderParam 前台传递的参数 - * @Description: 验证升级关系，只能给自己或者自己安置伞下升级 - * @return: boolean - * @Author: sui q - * @Date: 2023/1/10 14:05 */ protected AjaxResult validateUpgradeRelation(OrderParam orderParam) { CuMember upgradeMember = iSaOrderService.getCuMemberByCode(orderParam.getUpgradeMemberCode()); @@ -563,7 +523,7 @@ public abstract class ParentOrderController extends BaseController { if (!orderParam.getCenterCodeId().equals(upgradeMember.getPkId())) { // 可以给别人升级，只能是自己的安置伞下 - List cuMemberExtList = getOrderService().queryPlaceSponsorUnderUmbrella(orderParam.getCenterCodeId(), upgradeMember.getMemberCode()); + List cuMemberExtList = iSaOrderService.queryPlaceSponsorUnderUmbrella(orderParam.getCenterCodeId(), upgradeMember.getMemberCode()); boolean flag = cuMemberExtList.stream().noneMatch(cuMemberExt -> cuMemberExt.getPkId().equals(upgradeMember.getPkId())); if (flag) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.PLACE_NOT_TEAM)); @@ -582,16 +542,14 @@ public abstract class ParentOrderController extends BaseController { } /** + * 查询订单返回值，用于支付 + * * @param saOrder 订单 * @param orderParam 参数 - * @Description: 查询订单返回值，用于支付 - * @return: OrderReturn - * @Author: sui q - * @Date: 2023/2/2 11:11 */ protected OrderReturn getOrderReturn(SaOrder saOrder, OrderParam orderParam) { // 封装订单信息 - long maxPayTime = getOrderService().getIsToBePayTime(orderParam.getPkSettleCountry(), saOrder.getOrderType()); + long maxPayTime = iSaOrderService.getIsToBePayTime(orderParam.getPkSettleCountry(), saOrder.getOrderType()); // 剩余支付秒数 //查询带关闭参数 // 获取行政区划map @@ -633,9 +591,9 @@ public abstract class ParentOrderController extends BaseController { return orderReturn; } - /* - * @description: 将购物车的数量转换到sku种 - **/ + /** + * 将购物车的数量转换到sku种 + */ protected void convertShoppingCarToSku(OrderParam orderParam) { ShoppingCartVO shoppingCartVO = new ShoppingCartVO(); shoppingCartVO.setDeleteList(orderParam.getDeleteList()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java index 56c5b3c1..55921cd7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java @@ -18,7 +18,6 @@ import com.hzs.common.security.utils.SecurityUtils; import com.hzs.sale.order.controller.ParentOrderController; import com.hzs.sale.order.param.OrderParam; import com.hzs.sale.order.param.OrderReturn; -import com.hzs.sale.order.service.ISaOrderService; import com.hzs.sale.shopping.vo.ShoppingCartVO; import com.hzs.sale.wares.service.IBdWaresService; import lombok.extern.slf4j.Slf4j; @@ -29,7 +28,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * @Description: 其他订单（升级、复购）订单 + * 其他订单（升级、复购）订单 */ @RestController @RequestMapping("/api/order") @@ -40,9 +39,9 @@ public class ApiOthSaOrderController extends ParentOrderController { private IBdWaresService iBdWaresService; /** + * 提供确认订单的方法 + * * @param orderParam 前台传递的参数 - * @Description: 提供确认订单的方法 - * @return: AjaxResult */ @PostMapping("/confirm-oth-order") @RepeatSubmit @@ -103,10 +102,6 @@ public class ApiOthSaOrderController extends ParentOrderController { /** * @param orderParam 订单参数 - * @Description: - * @return: AjaxResult - * @Author: sui q - * @Date: 2023/2/4 14:48 */ @PostMapping("/validate-upg-rel") public AjaxResult validateUpgradeMemberCodeRelation(@RequestBody OrderParam orderParam) { @@ -116,10 +111,6 @@ public class ApiOthSaOrderController extends ParentOrderController { /** * @param orderParam 订单参数 - * @Description: - * @return: AjaxResult - * @Author: sui q - * @Date: 2023/2/4 14:48 */ @PostMapping("/query-special-deduct") public AjaxResult querySpecialDeduct(@RequestBody OrderParam orderParam) { @@ -130,13 +121,10 @@ public class ApiOthSaOrderController extends ParentOrderController { return validateUpgradeRelation(orderParam); } - /** + * 支付升级订单，生成支付订单或者更新待支付订单 + * * @param orderParam 订单参数 - * @Description: 支付升级订单，生成支付订单或者更新待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 */ @PostMapping("/pay-oth-order") @RepeatSubmit @@ -202,24 +190,6 @@ public class ApiOthSaOrderController extends ParentOrderController { return AjaxResult.error(cuMemberAccountExt.getErrorMsg()); } - /** - * 校验支付方式（2024.02.02 签呈需求，暂时以【板栗】开头的复购商品，不能使用在线支付） - * - * @param orderParam 入参 - * @return - */ - @PostMapping("/check-pay-type") - public AjaxResult checkPayType(@RequestBody OrderParam orderParam) { - if (null == orderParam.getSpecialArea() || CollectionUtil.isEmpty(orderParam.getOrderItemsParams())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - - // 是否显示 - boolean showFlag = true; - return AjaxResult.success(showFlag); - } - /** * 查询复购商品列表 * @@ -234,16 +204,4 @@ public class ApiOthSaOrderController extends ParentOrderController { return AjaxResult.success(); } - /** - * 专供临时使用 - * - * @param orderParam - * @return - */ - @PostMapping("/check-member-relation") - public AjaxResult checkMemberRelation(@RequestBody OrderParam orderParam) { - orderParam.setUpgradeMemberName(orderParam.getUpgradeMemberCode()); - return AjaxResult.success(orderParam); - } - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java index 1edc7876..e39c03df 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java @@ -12,12 +12,14 @@ import com.hzs.common.core.utils.reflect.ReflectUtils; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.activity.ticket.AcTicket; +import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberAccountExt; import com.hzs.common.domain.sale.ticket.SaBuyTicket; import com.hzs.common.domain.sale.ticket.SaTicket; import com.hzs.common.domain.sale.ticket.ext.SaTicketExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.util.TransactionUtils; +import com.hzs.member.base.IMemberServiceApi; import com.hzs.sale.order.controller.ParentOrderController; import com.hzs.sale.order.param.OrderParam; import com.hzs.sale.ticket.param.BuyTicketParam; @@ -26,6 +28,7 @@ import com.hzs.sale.ticket.service.ISaBuyTicketService; import com.hzs.sale.ticket.service.ISaTicketService; import com.hzs.sale.ticket.vo.AcTicketVO; import com.hzs.sale.ticket.vo.SaTicketVO; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -48,6 +51,28 @@ public class ApiSaTicketController extends ParentOrderController { @Autowired private IAcTicketService iAcTicketService; + @DubboReference + IMemberServiceApi iMemberServiceApi; + + /** + * 门票活动列表 + * + * @return + */ + @GetMapping("/query-ac") + public TableDataInfo queryAcTick() { + Long pkMember = SecurityUtils.getUserId(); + CuMember cuMember = iMemberServiceApi.getMember(pkMember).getData(); + + List acTicketList = iAcTicketService.listTicket(new Date(), cuMember.getPkVertex(), SecurityUtils.getPkCountry()); + List acTicketVOList = new ArrayList<>(); + for (AcTicket acTicket : acTicketList) { + AcTicketVO acTicketVO = BeanUtil.copyProperties(acTicket, AcTicketVO.class); + acTicketVOList.add(acTicketVO); + } + return getDataTable(acTicketVOList); + } + /** * 支付购买订单 * @@ -165,19 +190,10 @@ public class ApiSaTicketController extends ParentOrderController { } /** - * 支付购买订单 + * 我的门票列表 * - * @param orderParam 订单参数 + * @return */ - @PostMapping("/pay-back") - public AjaxResult payBackSaTicketOnline(@RequestBody OrderParam orderParam) { - iSaTicketService.paySaTicketOnlineOrderCode(SecurityUtils.getUserId(), orderParam.getOrderCode()); - return AjaxResult.success(); - } - - /** - * 会员前台查询门票活动列表 - **/ @GetMapping("/query") public TableDataInfo querySaTick() { SaTicketParam saTicketParam = SaTicketParam.builder() @@ -235,19 +251,6 @@ public class ApiSaTicketController extends ParentOrderController { return AjaxResult.success(); } - /** - * 会员前台查询门票活动列表 - **/ - @GetMapping("/query-ac") - public TableDataInfo queryAcTick() { - List acTicketList = iAcTicketService.queryAcTicketByDate(new Date(), SecurityUtils.getPkCountry()); - List acTicketVOList = new ArrayList<>(); - for (AcTicket acTicket : acTicketList) { - AcTicketVO acTicketVO = BeanUtil.copyProperties(acTicket, AcTicketVO.class); - acTicketVOList.add(acTicketVO); - } - return getDataTable(acTicketVOList); - } /** * @param fieldList 需要验证的字段 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/manage/SaTicketController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/manage/SaTicketController.java index 9d1b1bdf..acd396e1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/manage/SaTicketController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/manage/SaTicketController.java @@ -35,7 +35,7 @@ public class SaTicketController extends BaseController { private ISaTicketService iSaTicketService; /** - * 会员前台查询门票活动列表 + * 查询门票活动列表 **/ @PostMapping("/query") public TableDataInfo querySaTick(@RequestBody SaTicketParam saTicketParam) { @@ -67,7 +67,6 @@ public class SaTicketController extends BaseController { return AjaxResult.success(); } - @PostMapping("/export") public void homeExport(HttpServletResponse response, SaTicketParam saTicketParam) { saTicketParam.setPkCountry(SecurityUtils.getPkCountry()); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/ISaTicketService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/ISaTicketService.java index cd58a443..ef2ac459 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/ISaTicketService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/ISaTicketService.java @@ -13,9 +13,6 @@ import java.util.List; /** * 门票主表 服务类 - * - * @author hzs - * @since 2025-01-09 */ public interface ISaTicketService extends IService { @@ -59,14 +56,14 @@ public interface ISaTicketService extends IService { */ SaTicket paySaTicket(OrderParam orderParam, BigDecimal price, CuMemberAccountExt cuMemberAccountExt, String orderCode); - /* + /** * 在线支付生成订单编号 - **/ + */ String querySaTicketOnlineOrderCode(OrderParam orderParam, BigDecimal price); - /* + /** * 在线支付回调 - **/ + */ void paySaTicketOnlineOrderCode(Long pkMember, String orderCode); /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/impl/SaTicketServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/impl/SaTicketServiceImpl.java index 7261bc1d..6cc53e75 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/impl/SaTicketServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/impl/SaTicketServiceImpl.java @@ -131,8 +131,8 @@ public class SaTicketServiceImpl extends ServiceImpl i } } - @Override @Transactional(rollbackFor = Exception.class) + @Override public SaTicket paySaTicket(OrderParam orderParam, BigDecimal price, CuMemberAccountExt cuMemberAccountExt, String orderCode) { if (null == orderCode) { orderCode = saOrderHandle.createOrderCode(EOrderPrefix.ACTIVITY_CODE.getValue()); @@ -151,6 +151,7 @@ public class SaTicketServiceImpl extends ServiceImpl i saTicket.setPkTicket(orderParam.getPkTicket()); saTicket.setCreationTime(date); save(saTicket); + List saBuyTicketList = new ArrayList<>(); for (BuyTicketParam buyTicketParam : orderParam.getTicketParamList()) { SaBuyTicket saBuyTicket = BeanUtil.copyProperties(buyTicketParam, SaBuyTicket.class); @@ -165,6 +166,7 @@ public class SaTicketServiceImpl extends ServiceImpl i saBuyTicket.setPkTeam(cuMember.getPkVertex()); } iSaBuyTicketService.saveBatch(saBuyTicketList); + SaOrderExt saOrderExt = new SaOrderExt(); saOrderExt.setPkCountry(orderParam.getPkSettleCountry()); saOrderExt.setPkCreator(orderParam.getCenterCodeId()); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml index 81d82f0d..b44563d1 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml @@ -1,5 +1,16 @@ - + + + + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/ticket/SaTicketMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/ticket/SaTicketMapper.xml index 45023c02..b1cd26c6 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/ticket/SaTicketMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/ticket/SaTicketMapper.xml @@ -19,7 +19,6 @@ - @@ -37,34 +36,44 @@