angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 购票会员端接口修改；

This commit is contained in:
cabbage 2025-05-27 16:33:14 +08:00
parent 1968f456fc
commit c89448aa0e
15 changed files with 149 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java
View File

@ -134,7 +134,6 @@ public interface IMemberServiceApi {
*
* @param memberId 会员编号
* @param placeDept 1代表左区极左极下，2代表右区极左极下
* @return: CuMemberExt
*/
R<CuMemberExt> queryPlaceSponsorLastLeft(Long memberId, Integer placeDept);
@ -162,28 +161,21 @@ public interface IMemberServiceApi {
*/
R<CuMember> queryMember(String memberCode);
/*
* 查询会员
* @author: sui q
* @date: 2023/4/25 10:32
* @param: null null
**/
/**
* 查询会员
*/
R<CuMember> queryMember(Long pkMember);
/**
* 保存新会员信息,待支付订单
*
* @param cuMember 会员信息
* @return: R<Integer>
*/
R<Boolean> saveMember(CuMember cuMember);
/*
* 查询网体是否存在推荐人
* @author: sui q
* @date: 2023/9/11 9:53
* @param: null null
**/
/**
* 查询网体是否存在推荐人
*/
R<Integer> queryCuMemberByPkMember(Long pkReference);
/**
@ -191,7 +183,6 @@ public interface IMemberServiceApi {
*
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
* @return: Boolean
*/
R<Boolean> saveMember(SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
@ -200,7 +191,6 @@ public interface IMemberServiceApi {
*
* @param cuMember 会员信息
* @param saOrder 订单信息
* @return: Boolean
*/
R<Boolean> saveMember(CuMember cuMember, SaOrder saOrder);
@ -210,7 +200,6 @@ public interface IMemberServiceApi {
* @param cuMember 会员信息
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
* @return: Boolean
*/
R<Boolean> saveMember(CuMember cuMember, SaOrderExt saOrder, CuMemberAccountExt cuMemberAccountExt);
@ -221,7 +210,6 @@ public interface IMemberServiceApi {
* @param saOrder 订单信息
* @param isPay 是否支付
* @param cuMemberAccountExt 支付账号
* @return: R<Integer>
*/
R<Boolean> saveMember(CuMember cuMember, SaOrderExt saOrder, Boolean isPay, CuMemberAccountExt cuMemberAccountExt);
@ -230,7 +218,6 @@ public interface IMemberServiceApi {
*
* @param cuMember 会员
* @param isHaiFun 是否嗨粉
* @return: R<Boolean>
*/
R<CuMember> createMemberIdAndCode(CuMember cuMember, Boolean isHaiFun);
@ -238,7 +225,6 @@ public interface IMemberServiceApi {
* 创建注册会员编号（放入会员编号批次占用）
*
* @param cuMember 会员信息
* @return
*/
R<CuMember> createRegisterMemberCode(CuMember cuMember);
@ -246,7 +232,6 @@ public interface IMemberServiceApi {
* 创建空单注册会员
*
* @param member
* @return
*/
R<CuMember> createEmptyOrderMember(CuMemberExt member);
@ -254,7 +239,6 @@ public interface IMemberServiceApi {
* 校验会员下的安置人、推荐人是否存在
*
* @param pkMember 会员ID
* @return
*/
R<Boolean> checkLowerMember(Long pkMember);
@ -262,7 +246,6 @@ public interface IMemberServiceApi {
* 取消用户（取消注册相关订单，同步取消用户）
*
* @param pkMember
* @return
*/
R<Boolean> cancelMember(Long pkMember);
@ -271,7 +254,6 @@ public interface IMemberServiceApi {
*
* @param pkMemberList 会员ID列表 -- 必传
* @param pkCountry 国家ID -- 非必传
* @return
*/
R<List<CuMemberExt>> findMemberByMemberId(List<Long> pkMemberList, Integer pkCountry);
@ -279,7 +261,6 @@ public interface IMemberServiceApi {
* 查询分享会员
*
* @param pkMember 主键
* @return: R<CuMemberShare>
*/
R<CuMemberShare> queryCuMemberShare(Long pkMember);
@ -287,23 +268,22 @@ public interface IMemberServiceApi {
* 根据会员主键查询会员注册信息
*
* @param pkMember 会员主键
* @return: CuMemberRegister
*/
R<CuMemberRegister> queryCuMemberRegister(Long pkMember);
/*
* 会员编号，账户类型，抽奖金额
**/
/**
* 会员编号，账户类型，抽奖金额
*/
R<Boolean> updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney);
/*
* 会员抽奖，购买抽奖次数支付金额
**/
/**
* 会员抽奖，购买抽奖次数支付金额
*/
R<Boolean> updateCuMemberAccountByDraw(CuMemberAccountExt cuMemberAccountExt, BigDecimal payMoney);
/*
* 会员抽奖，购买抽奖次数支付金额
**/
/**
* 会员抽奖，购买抽奖次数支付金额
*/
R<Boolean> updateCuMemberAccountByDraw(Integer payNum, AcDrawRewardNumExt acDrawRewardNumExt);
/**
@ -321,7 +301,6 @@ public interface IMemberServiceApi {
*
* @param topCode 顶点编号
* @param userId 当前会员
* @return
*/
R<Boolean> checkParent(String topCode, Long userId);
@ -330,7 +309,6 @@ public interface IMemberServiceApi {
*
* @param topCodeList 顶点编号列表
* @param userId 当前会员
* @return
*/
R<CuMemberExt> checkMemberByParentList(List<String> topCodeList, Long userId);
@ -350,7 +328,6 @@ public interface IMemberServiceApi {
* 校验商品团队信息是否可见
*
* @param showWaresDTOS
* @return
*/
R<Map<Integer, Boolean>> checkIsShowWares(List<ShowWaresDTO> showWaresDTOS);
@ -368,9 +345,9 @@ public interface IMemberServiceApi {
*/
R<Integer> clearMemberEmptyCode();
/*
* 查询伞下会员
**/
/**
* 查询伞下会员
*/
R<Boolean> queryCuMemberUnderUmbrella(Long pkMember);
/**
@ -383,7 +360,6 @@ public interface IMemberServiceApi {
*
* @param topCode 顶点编号
* @param pkMember 当前会员
* @return
*/
R<Boolean> 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）

63
bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java
View File

@ -93,12 +93,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
return R.ok(iCuMemberService.getMemberByCode(memberCode));
}
/**
* 前台查询会员的方法，通过传输不同的参数，查询不同的会员
*
* @param cuMember 会员各种值
* @return: R<CuMember>
*/
@Override
public R<List<CuMemberExt>> getMemberInfo(CuMember cuMember) {
return R.ok(iCuMemberService.getMemberInfoByCondition(cuMember));
@ -130,9 +124,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
}
}
/**
* @description: 自助撤单-注册单撤单
**/
@Override
public R<Boolean> singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) {
try {
@ -143,7 +134,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
}
}
@Override
public R<Boolean> mergeRevokeMemberByRegisterOrder(Long pkApprove, List<Long> memberList, Map<Long, SaOrderExt> saOrderMap, BusinessCommissionDTO businessCommissionDTO) {
try {
@ -191,24 +181,11 @@ public class MemberServiceProvider implements IMemberServiceApi {
return R.ok(iCuMemberService.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList));
}
/**
* 查找安置人伞下
*
* @param memberId 安置人，编号
* @return: List<CuMemberExt>
*/
@Override
public R<List<CuMemberExt>> queryPlaceSponsorUnderUmbrella(Long memberId, String... placeParent) {
return R.ok(iCuMemberService.queryPlaceSponsorUnderUmbrella(memberId, placeParent));
}
/**
* 根据会员编号，查找该会员编号极左极下的那个人
*
* @param memberId 会员编号
* @param placeDept 1代表左区极左极下，2代表右区极左极下
* @return: CuMemberExt
*/
@Override
public R<CuMemberExt> 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<Boolean>
*/
@Override
public R<Boolean> saveMember(CuMember cuMember) {
try {
@ -275,14 +246,6 @@ public class MemberServiceProvider implements IMemberServiceApi {
}
}
/**
* 修改会员信息，确认升级、复购订单信息，流水（升级订单、复购订单）
*
* @param cuMember 会员信息
* @param saOrder 订单信息
* @param cuMemberAccountExt 会员账户信息
* @return: Boolean
*/
@Override
public R<Boolean> 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<Boolean> 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<CuMember> 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<Map<Integer, Boolean>> checkIsShowWares(List<ShowWaresDTO> 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<List<ZeroElementRevokeDTO>> 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) {

16
bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/mapper/AcTicketMapper.java
View File

@ -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<AcTicket> {
/**
* 购票活动列表
*
* @param queryDate
* @param pkVertex
* @param pkCountry
* @return
*/
List<AcTicket> listTicket(@Param("queryDate") Date queryDate,
@Param("pkVertex") Long pkVertex,
@Param("pkCountry") Integer pkCountry);
}

2
bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/IAcTicketService.java
View File

@ -19,5 +19,5 @@ public interface IAcTicketService extends IService<AcTicket> {
/*
* 根据查询日期查询能展示的活动
**/
List<AcTicket> queryAcTicketByDate(Date queryDate, Integer pkCountry);
List<AcTicket> listTicket(Date queryDate, Long pkVertex, Integer pkCountry);
}

8
bd-business/bd-business-sale/src/main/java/com/hzs/activity/ticket/service/impl/AcTicketServiceImpl.java
View File

@ -27,11 +27,7 @@ public class AcTicketServiceImpl extends ServiceImpl<AcTicketMapper, AcTicket> i
}
@Override
public List<AcTicket> queryAcTicketByDate(Date queryDate, Integer pkCountry) {
LambdaQueryWrapper<AcTicket> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.le(AcTicket::getDisStartDate, queryDate);
queryWrapper.ge(AcTicket::getDisEndDate, queryDate);
queryWrapper.eq(AcTicket::getPkCountry, pkCountry);
return baseMapper.selectList(queryWrapper);
public List<AcTicket> listTicket(Date queryDate, Long pkVertex, Integer pkCountry) {
return baseMapper.listTicket(queryDate, pkVertex, pkCountry);
}
}

102
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java
View File

@ -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<String> 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<CuMemberExt> cuMemberExtList) {
// 判断次数，获取系统参数，从redis中获取系统参数
@ -527,7 +489,7 @@ public abstract class ParentOrderController extends BaseController {
* @return AjaxResult
*/
protected AjaxResult validateMemberAccount(OrderParam orderParam) {
List<CuMemberAccountExt> cuMemberAccountExtList = getOrderService().queryMemberAccountByCondition(getCuMemberAccount(orderParam));
List<CuMemberAccountExt> 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<CuMemberExt> cuMemberExtList = getOrderService().queryPlaceSponsorUnderUmbrella(orderParam.getCenterCodeId(), upgradeMember.getMemberCode());
List<CuMemberExt> 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());

52
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java
View File

@ -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);
}
}

51
bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/api/ApiSaTicketController.java
View File

@ -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<AcTicket> acTicketList = iAcTicketService.listTicket(new Date(), cuMember.getPkVertex(), SecurityUtils.getPkCountry());
List<AcTicketVO> 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<AcTicket> acTicketList = iAcTicketService.queryAcTicketByDate(new Date(), SecurityUtils.getPkCountry());
List<AcTicketVO> acTicketVOList = new ArrayList<>();
for (AcTicket acTicket : acTicketList) {
AcTicketVO acTicketVO = BeanUtil.copyProperties(acTicket, AcTicketVO.class);
acTicketVOList.add(acTicketVO);
}
return getDataTable(acTicketVOList);
}
/**
* @param fieldList 需要验证的字段

3
bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/controller/manage/SaTicketController.java
View File

@ -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());

11
bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/ISaTicketService.java
View File

@ -13,9 +13,6 @@ import java.util.List;
/**
* 门票主表 服务类
*
* @author hzs
* @since 2025-01-09
*/
public interface ISaTicketService extends IService<SaTicket> {
@ -59,14 +56,14 @@ public interface ISaTicketService extends IService<SaTicket> {
*/
SaTicket paySaTicket(OrderParam orderParam, BigDecimal price, CuMemberAccountExt cuMemberAccountExt, String orderCode);
/*
/**
* 在线支付生成订单编号
**/
*/
String querySaTicketOnlineOrderCode(OrderParam orderParam, BigDecimal price);
/*
/**
* 在线支付回调
**/
*/
void paySaTicketOnlineOrderCode(Long pkMember, String orderCode);
/**

4
bd-business/bd-business-sale/src/main/java/com/hzs/sale/ticket/service/impl/SaTicketServiceImpl.java
View File

@ -131,8 +131,8 @@ public class SaTicketServiceImpl extends ServiceImpl<SaTicketMapper, SaTicket> 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<SaTicketMapper, SaTicket> i
saTicket.setPkTicket(orderParam.getPkTicket());
saTicket.setCreationTime(date);
save(saTicket);
List<SaBuyTicket> saBuyTicketList = new ArrayList<>();
for (BuyTicketParam buyTicketParam : orderParam.getTicketParamList()) {
SaBuyTicket saBuyTicket = BeanUtil.copyProperties(buyTicketParam, SaBuyTicket.class);
@ -165,6 +166,7 @@ public class SaTicketServiceImpl extends ServiceImpl<SaTicketMapper, SaTicket> i
saBuyTicket.setPkTeam(cuMember.getPkVertex());
}
iSaBuyTicketService.saveBatch(saBuyTicketList);
SaOrderExt saOrderExt = new SaOrderExt();
saOrderExt.setPkCountry(orderParam.getPkSettleCountry());
saOrderExt.setPkCreator(orderParam.getCenterCodeId());

13
bd-business/bd-business-sale/src/main/resources/mapper/activity/ticket/AcTicketMapper.xml
View File

@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzs.activity.ticket.mapper">
<mapper namespace="com.hzs.activity.ticket.mapper.AcTicketMapper">
<!-- 购票活动列表 -->
<select id="listTicket" resultType="com.hzs.common.domain.activity.ticket.AcTicket">
select *
from ac_ticket at
where at.del_flag = 0
and to_char(#{queryDate}, 'yyyy-mm-dd') >= to_char(at.dis_start_date, 'yyyy-mm-dd')
and to_char(at.dis_end_date, 'yyyy-mm-dd') >= to_char((#{queryDate}, 'yyyy-mm-dd')
and (at.pk_vertex is null or at.pk_vertex = '' or at.pk_vertex like ',' || #{pkVertex} || ',')
and at.pk_country = #{pkCountry}
</select>
</mapper>

39
bd-business/bd-business-sale/src/main/resources/mapper/sale/ticket/SaTicketMapper.xml
View File

@ -19,7 +19,6 @@
<result column="ACT_NAME" property="actName"/>
<result column="MEMBER_CODE" property="memberCode"/>
<result column="MEMBER_NAME" property="memberName"/>
<result column="SYSTEM_TYPE" property="systemType"/>
<collection property="saBuyTicketList" ofType="com.hzs.common.domain.sale.ticket.ext.SaBuyTicketExt">
<result column="ITEM_ID" property="pkId"/>
<result column="BUY_NAME" property="buyName"/>
@ -37,34 +36,44 @@
</resultMap>
<select id="querySaTicketByParam" resultMap="SaTicketExt">
select st.*,sc.pk_id item_id,sc.buy_name,sc.phone,sc.id_card,sc.sex,sc.cloth_size,sc.cohabitant,
sc.emergency_phone,bv.vertex_name,ac.act_name,
ac.act_start_date,ac.act_end_date,cm.member_code,cm.member_name,cmt.team_name
select st.*,
sc.pk_id item_id,
sc.buy_name,
sc.phone,
sc.id_card,
sc.sex,
sc.cloth_size,
sc.cohabitant,
sc.emergency_phone,
bv.vertex_name,
ac.act_name,
ac.act_start_date,
ac.act_end_date,
cm.member_code,
cm.member_name,
cmt.team_name
from sa_ticket st
inner join sa_buy_ticket sc
on st.pk_id=sc.pk_sa_ticket
on st.pk_id = sc.pk_sa_ticket
inner join ac_ticket ac
on ac.pk_id=st.pk_ticket
on ac.pk_id = st.pk_ticket
left join bd_vertex bv
on bv.pk_id=sc.pk_team and bv.del_flag=0
on bv.pk_id = sc.pk_team and bv.del_flag=0
left join cu_member cm
on cm.pk_id=st.pk_creator and cm.del_flag=0
left join CU_MEMBER_TEAM cmt on cm.PK_TEAM_CODE=cmt.pk_id and cmt.del_flag=0
where st.del_flag=0 and sc.del_flag=0 and ac.del_flag=0
on cm.pk_id = st.pk_creator and cm.del_flag = 0
left join CU_MEMBER_TEAM cmt on cm.PK_TEAM_CODE = cmt.pk_id and cmt.del_flag = 0
where st.del_flag = 0 and sc.del_flag = 0 and ac.del_flag = 0
<if test="saTicketParam.pkCountry != null">
and st.PK_COUNTRY = #{saTicketParam.pkCountry}
</if>
<if test="saTicketParam.systemType != null">
and st.SYSTEM_TYPE = #{saTicketParam.systemType}
</if>
<if test="saTicketParam.pkMember != null">
and st.pk_creator = #{saTicketParam.pkMember}
</if>
<if test="saTicketParam.memberCode != null and saTicketParam.memberCode != ''">
and cm.member_code like '%'||#{saTicketParam.memberCode} || '%'
and cm.member_code like '%' || #{saTicketParam.memberCode} || '%'
</if>
<if test="saTicketParam.memberName != null and saTicketParam.memberName != ''">
and cm.member_name like '%'||#{saTicketParam.memberName} || '%'
and cm.member_name like '%' || #{saTicketParam.memberName} || '%'
</if>
<if test="saTicketParam.pkTicket != null">
and st.pk_ticket = #{saTicketParam.pkTicket}

2
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ticket/SaBuyTicket.java
View File

@ -30,7 +30,7 @@ public class SaBuyTicket extends BaseEntity {
private Long pkId;
/**
* 主表主键
* 门票主表主键
*/
@TableField("PK_SA_TICKET")
private Long pkSaTicket;

9
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ticket/SaTicket.java
View File

@ -59,13 +59,10 @@ public class SaTicket extends BaseEntity {
@TableField("QUANTITY")
private Integer quantity;
/**
* 门票活动ID
*/
@TableField("PK_TICKET")
private Long pkTicket;
/**
* 系统类型（2=新零售，3=美业）
*/
@TableField("SYSTEM_TYPE")
private Integer systemType;
}