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

## 撤注册单，如果有政策币或重消币，不能撤（148）；优化部分注释和方法；

This commit is contained in:
cabbage 2025-06-05 10:26:07 +08:00
parent ef6dc35429
commit 5a34c190eb
35 changed files with 46 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberAccountServiceApi.java
View File

@ -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<Long> 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);
/**
* 订单合单退单
*

20
bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberAccountServiceProvider.java
View File

@ -56,16 +56,6 @@ public class MemberAccountServiceProvider implements IMemberAccountServiceApi {
return R.ok();
}
@Override
public R<?> orderReturnMember(List<Long> 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 {

1
bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberAccountService.java
View File

@ -24,7 +24,6 @@ public interface ICuMemberAccountService extends IService<CuMemberAccount> {
*/
List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount);
/**
* 根据会员编码获取余额
*

9
bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberAccountServiceImpl.java
View File

@ -72,15 +72,6 @@ public class CuMemberAccountServiceImpl extends ServiceImpl<CuMemberAccountMappe
@DubboReference
ITransactionServiceApi iTransactionServiceApi;
/**
* 查询会员账户状态，账户信息
*
* @param cuMemberAccount 会员账户条件信息
* @return: List<CuMemberAccountExt>
* @Author: sui q
* @Date: 2022/9/5 11:57
*/
@Override
public List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount) {
return baseMapper.queryMemberAccountByCondition(cuMemberAccount);

9
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRegisterMapper.java
View File

@ -10,9 +10,6 @@ import java.util.List;
/**
* 会员历史记录 Mapper 接口
*
* @author hzs
* @since 2022-08-22
*/
public interface CuMemberRegisterMapper extends BaseMapper<CuMemberRegister> {
@ -20,9 +17,6 @@ public interface CuMemberRegisterMapper extends BaseMapper<CuMemberRegister> {
* 根据条件查询会员注册信息
*
* @param memberParam 会员查询条件
* @return: List<CuMemberRegisterExt>
* @Author: sui q
* @Date: 2022/10/13 9:51
*/
List<CuMemberVO> queryCuMemberRegisterExeByCondition(MemberParam memberParam);
@ -30,9 +24,6 @@ public interface CuMemberRegisterMapper extends BaseMapper<CuMemberRegister> {
* 将用户注册表信息更改为死点
*
* @param cuMemberRegister 会员注册信息
* @return: void
* @Author: sui q
* @Date: 2022/10/22 21:11
*/
void updateCuMemberRegister(CuMemberRegister cuMemberRegister);

8
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberShareMapper.java
View File

@ -8,18 +8,16 @@ import com.hzs.member.marketnews.vo.SeaFlourVo;
import java.util.List;
/**
* <p>
* 分享注册记录会员 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-03-15
*/
public interface CuMemberShareMapper extends BaseMapper<CuMemberShare> {
/**
* 海粉列表
*
* @param seaFlourParam
* @return
*/
List<SeaFlourVo> seaFlourList(SeaFlourParam seaFlourParam);
}

8
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java
View File

@ -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<Long> pkMemberList, Long userId);
/**
* 订单自提退邮费
*

21
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRegisterService.java
View File

@ -9,37 +9,28 @@ import java.util.List;
/**
* 会员历史记录 服务类
*
* @author hzs
* @since 2022-08-22
*/
public interface ICuMemberRegisterService extends IService<CuMemberRegister> {
/**
* 根据条件查询会员注册信息
*
* @param memberParam 会员查询条件
* @return: List<CuMemberRegisterExt>
* @Author: sui q
* @Date: 2022/10/13 9:51
*/
*/
List<CuMemberVO> 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);
/**

27
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberShareService.java
View File

@ -8,44 +8,27 @@ import com.hzs.member.marketnews.vo.SeaFlourVo;
import java.util.List;
/**
* <p>
* 分享注册记录会员 服务类
* </p>
*
* @author hzs
* @since 2023-03-15
*/
public interface ICuMemberShareService extends IService<CuMemberShare> {
/**
* 保存会员分享
* @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
*/

93
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -1129,99 +1129,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void orderReturnMember(List<Long> pkMemberList, Long userId) {
// 注册类订单，需要更新用户为已注销状态
LambdaUpdateWrapper<CuMember> 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<CuMemberChangeLog> 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) {
// 查询退邮费对应币种

5
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRegisterServiceImpl.java
View File

@ -17,16 +17,13 @@ import java.util.List;
/**
* 会员历史记录 服务实现类
*
* @author hzs
* @since 2022-08-22
*/
@Service
public class CuMemberRegisterServiceImpl extends ServiceImpl<CuMemberRegisterMapper, CuMemberRegister> implements ICuMemberRegisterService {
@Override
public List<CuMemberVO> queryCuMemberRegisterExeByCondition(MemberParam memberParam) {
if(memberParam.getEndDate() != null){
if (memberParam.getEndDate() != null) {
memberParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, memberParam.getEndDate()));
}
return baseMapper.queryCuMemberRegisterExeByCondition(memberParam);

18
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberShareServiceImpl.java
View File

@ -14,24 +14,11 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 分享注册记录会员 服务实现类
* </p>
*
* @author hzs
* @since 2023-03-15
*/
@Service
public class CuMemberShareServiceImpl extends ServiceImpl<CuMemberShareMapper, CuMemberShare> 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<CuMemberShare> queryWrapper = new QueryWrapper<>();
@ -48,11 +35,6 @@ public class CuMemberShareServiceImpl extends ServiceImpl<CuMemberShareMapper, C
return baseMapper.updateById(cuMemberShare) > 0 ? Boolean.TRUE : Boolean.FALSE;
}
/**
* 海粉列表
* @param seaFlourParam
* @return
*/
@Override
public List<SeaFlourVo> seaFlourList(SeaFlourParam seaFlourParam) {
return baseMapper.seaFlourList(seaFlourParam);

3
bd-business/bd-business-member/src/main/java/com/hzs/member/empty/mapper/CuMemberEmptyCodeMapper.java
View File

@ -8,9 +8,6 @@ import java.util.List;
/**
* 会员空单编号 Mapper 接口
*
* @author hzs
* @since 2023-08-29
*/
public interface CuMemberEmptyCodeMapper extends BaseMapper<CuMemberEmptyCode> {

3
bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/ICuMemberEmptyCodeService.java
View File

@ -7,9 +7,6 @@ import java.util.List;
/**
* 会员空单编号 服务类
*
* @author hzs
* @since 2023-08-29
*/
public interface ICuMemberEmptyCodeService extends IService<CuMemberEmptyCode> {

3
bd-business/bd-business-member/src/main/java/com/hzs/member/empty/service/impl/CuMemberEmptyCodeServiceImpl.java
View File

@ -19,9 +19,6 @@ import java.util.List;
/**
* 会员空单编号 服务实现类
*
* @author hzs
* @since 2023-08-29
*/
@Service
public class CuMemberEmptyCodeServiceImpl extends ServiceImpl<CuMemberEmptyCodeMapper, CuMemberEmptyCode> implements ICuMemberEmptyCodeService {

14
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetDetailMapper.java
View File

@ -8,20 +8,12 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 会员甩网设置明细 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-08-30
*/
public interface CuMemberSwingNetDetailMapper extends BaseMapper<CuMemberSwingNetDetail> {
/*
* @description: 更新或修改会员甩网设置明细
* @author: sui q
* @date: 2023/8/30 11:23
* @param: null null
**/
/**
* 更新或修改会员甩网设置明细
*/
void mergeCuMemberSwingNetDetail(@Param("cuMemberSwingNetDetailVOList") List<CuMemberSwingNetDetailVO> cuMemberSwingNetDetailVOList);
}

16
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/mapper/CuMemberSwingNetMapper.java
View File

@ -10,29 +10,17 @@ import com.hzs.member.swing.param.SwingNetLogParam;
import java.util.List;
/**
* <p>
* 会员网体甩网配置 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-08-30
*/
public interface CuMemberSwingNetMapper extends BaseMapper<CuMemberSwingNet> {
/*
* @description: 查询甩网数据
* @author: sui q
* @date: 2023/8/30 15:05
* @param: null null
* 查询甩网数据
**/
List<CuMemberSwingNetExt> queryCuMemberSwingNetExt(CuMemberSwingNetParam cuMemberSwingNetParam);
/**
* @description: 甩网配置详情
* @author: zhang jing
* @date: 2024/3/12 9:53
* @param: [param]
* @return: java.util.List<com.hzs.common.domain.member.swing.ext.CuMemberSwingNetLogExt>
* 甩网配置详情
**/
List<CuMemberSwingNetLogExt> swingNetLogList(SwingNetLogParam param);
}

7
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetDetailVO.java
View File

@ -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 {

7
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/CuMemberSwingNetParam.java
View File

@ -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 {

7
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/param/SwingNetLogParam.java
View File

@ -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 {

15
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetDetailService.java
View File

@ -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;
/**
* <p>
* 会员甩网设置明细 服务类
* </p>
*
* @author hzs
* @since 2023-08-30
*/
public interface ICuMemberSwingNetDetailService extends IService<CuMemberSwingNetDetail> {
/*
* @description: 更新或修改会员甩网设置明细
* @author: sui q
* @date: 2023/8/30 11:23
* @param: null null
**/
/**
* 更新或修改会员甩网设置明细
*/
void mergeCuMemberSwingNetDetail(List<CuMemberSwingNetDetailVO> cuMemberSwingNetDetailVOList);
}

25
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/ICuMemberSwingNetService.java
View File

@ -10,29 +10,18 @@ import com.hzs.member.swing.param.SwingNetLogParam;
import java.util.List;
/**
* <p>
* 会员网体甩网配置 服务类
* </p>
*
* @author hzs
* @since 2023-08-30
*/
public interface ICuMemberSwingNetService extends IService<CuMemberSwingNet> {
/*
* @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<CuMemberSwingNetExt> queryCuMemberSwingNetExt(CuMemberSwingNetParam cuMemberSwingNetParam);
/**
@ -43,6 +32,6 @@ public interface ICuMemberSwingNetService extends IService<CuMemberSwingNet> {
*/
void deleteNet(Long pkId, Long userId);
List<CuMemberSwingNetLogExt>swingNetLogList(SwingNetLogParam param);
List<CuMemberSwingNetLogExt> swingNetLogList(SwingNetLogParam param);
}

3
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetDetailServiceImpl.java
View File

@ -11,9 +11,6 @@ import java.util.List;
/**
* 会员甩网设置明细 服务实现类
*
* @author hzs
* @since 2023-08-30
*/
@Service
public class CuMemberSwingNetDetailServiceImpl extends ServiceImpl<CuMemberSwingNetDetailMapper, CuMemberSwingNetDetail> implements ICuMemberSwingNetDetailService {

12
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/service/impl/CuMemberSwingNetServiceImpl.java
View File

@ -28,16 +28,12 @@ import java.util.stream.Collectors;
/**
* 会员网体甩网配置 服务实现类
*
* @author hzs
* @since 2023-08-30
*/
@Service
public class CuMemberSwingNetServiceImpl extends ServiceImpl<CuMemberSwingNetMapper, CuMemberSwingNet> implements ICuMemberSwingNetService {
@Autowired
private ICuMemberSwingNetDetailService cuMemberSwingNetDetailService;
private ICuMemberSwingNetDetailService iCuMemberSwingNetDetailService;
@Override
@Transactional(rollbackFor = Exception.class)
@ -75,11 +71,11 @@ public class CuMemberSwingNetServiceImpl extends ServiceImpl<CuMemberSwingNetMap
updateWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue());
updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkCreator);
updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, dateTime);
cuMemberSwingNetDetailService.update(updateWrapper);
iCuMemberSwingNetDetailService.update(updateWrapper);
}
}
cuMemberSwingNetDetailService.mergeCuMemberSwingNetDetail(detailList);
iCuMemberSwingNetDetailService.mergeCuMemberSwingNetDetail(detailList);
}
@Override
@ -104,7 +100,7 @@ public class CuMemberSwingNetServiceImpl extends ServiceImpl<CuMemberSwingNetMap
swingNetDetailWrapper.set(SystemFieldConstants.PK_MODIFIED, userId);
swingNetDetailWrapper.set(SystemFieldConstants.MODIFIED_TIME, nowDate);
swingNetDetailWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue());
cuMemberSwingNetDetailService.update(swingNetDetailWrapper);
iCuMemberSwingNetDetailService.update(swingNetDetailWrapper);
}
@Override

7
bd-business/bd-business-member/src/main/java/com/hzs/member/swing/vo/CuMemberRetVO.java
View File

@ -5,12 +5,7 @@ import lombok.Data;
import java.io.Serializable;
/**
* @description: 会员返回值
* @author: sui q
* @time: 2023/8/30 19:01
* @classname: CuMemberVO
* @package_name: com.hzs.member.swing.vo
* version 1.0.0
* 会员返回值
*/
@Data
public class CuMemberRetVO implements Serializable {

1
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRegisterMapper.xml
View File

@ -171,5 +171,4 @@
) t
</insert>
</mapper>

1
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml
View File

@ -20,7 +20,6 @@
<result column="PK_COUNTRY" property="pkCountry"/>
</resultMap>
<select id="seaFlourList" resultType="com.hzs.member.marketnews.vo.SeaFlourVo">
select ms.MEMBER_CODE memberCode,ms.MEMBER_NAME memberName,ms.PHONE phone,ms.CREATION_TIME creationTime,
ms.pk_vertex,

18
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
View File

@ -7,7 +7,6 @@ import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.hzs.activity.pick.service.IAcPickService;
import com.hzs.bonus.settle.IMemberSettleBonusApi;
import com.hzs.common.core.constant.*;
import com.hzs.common.core.constant.msg.CommonMsgConstants;
import com.hzs.common.core.constant.msg.DocumentMsgConstants;
@ -113,8 +112,6 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
@DubboReference
ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference
IMemberSettleBonusApi iMemberSettleBonusApi;
@DubboReference
IAccountServiceApi iAccountServiceApi;
@DubboReference
ISystemConfigServiceApi iSystemConfigServiceApi;
@ -1197,13 +1194,6 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
iAcPickService.deductionsCouponByOrder(saOrder.getPkMember(), saOrder.getPkId());
}
// // 根据订单退业绩
// Boolean bool = iMemberSettleBonusApi.chargeBackSaOrder(saOrder);
// if (!bool) {
// log.error("订单退单同意处理失败: 订单退业绩失败");
// throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.APPROVAL_ERROR) + "：" + "订单业务回退失败");
// }
// 根据订单原路退回支付信息
R<?> resultR = iMemberAccountServiceApi.orderReturnBatch(saOrder, userId);
if (!resultR.isSuccess()) {
@ -1339,7 +1329,9 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
return validateCancelOrderVO;
}
CuMemberAccountExt cuMemberAccountExt = cuMemberAccountExtList.get(0);
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(cuMemberAccountExt.getAccount1(), cuMemberAccountExt.getAccount2(), cuMemberAccountExt.getAccount4()))) {
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(cuMemberAccountExt.getAccount1(), cuMemberAccountExt.getAccount2(), cuMemberAccountExt.getAccount4(),
cuMemberAccountExt.getAccount3(), cuMemberAccountExt.getAccount5()))) {
// 2025.06.05 添加需求（148），撤销注册类订单，如果会员账户存在政策币或者重消币，不能进行撤单
validateCancelOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.MEMBER_ACCOUNT_NOT_ZERO));
return validateCancelOrderVO;
}
@ -1388,7 +1380,9 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
Map<Long, CuMemberAccount> revokeMemberBySaOrder = getRevokeMemberBySaOrder(underMemberList);
for (Long pkMember : revokeMemberBySaOrder.keySet()) {
CuMemberAccount memberAccount = revokeMemberBySaOrder.get(pkMember);
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(memberAccount.getAccount1(), memberAccount.getAccount2(), memberAccount.getAccount4()))) {
if (ComputeUtil.compareValue(ComputeUtil.computeAddNum(memberAccount.getAccount1(), memberAccount.getAccount2(), memberAccount.getAccount4(),
memberAccount.getAccount3(), memberAccount.getAccount5()))) {
// 2025.06.05 添加需求（148），撤销注册类订单，如果会员账户存在政策币或者重消币，不能进行撤单
validateCancelOrderVO.setMsg(TransactionUtils.getContent(MemberMsgConstants.UNDER_UMBRELLA_ACCOUNT_NOT_ZERO));
return validateCancelOrderVO;
}

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberRegister.java
View File

@ -18,12 +18,7 @@ import lombok.*;
import lombok.experimental.Accessors;
/**
* <p>
* 会员历史记录
* </p>
*
* @author hzs
* @since 2022-08-22
*/
@Data
@EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/base/CuMemberShare.java
View File

@ -9,12 +9,7 @@ import lombok.*;
import lombok.experimental.Accessors;
/**
* <p>
* 分享注册记录会员
* </p>
*
* @author hzs
* @since 2023-03-15
*/
@Data
@EqualsAndHashCode(callSuper = true)

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/empty/CuMemberEmptyCode.java
View File

@ -11,9 +11,6 @@ import lombok.experimental.Accessors;
/**
* 会员空单编号
*
* @author hzs
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/swing/CuMemberSwingNet.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 会员网体甩网配置
* </p>
*
* @author hzs
* @since 2023-08-30
*/
@Data
@EqualsAndHashCode(callSuper = true)

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/swing/CuMemberSwingNetDetail.java
View File

@ -15,9 +15,6 @@ import lombok.experimental.Accessors;
/**
* 会员甩网设置明细
*
* @author hzs
* @since 2023-08-30
*/
@Data
@EqualsAndHashCode(callSuper = true)

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/swing/ext/CuMemberSwingNetDetailExt.java
View File

@ -7,12 +7,7 @@ import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* @description: 甩网子表
* @author: sui q
* @time: 2023/8/30 15:02
* @classname: CuMemberSwingNetDetailExt
* @package_name: com.hzs.common.domain.member.swing.ext.ext
* version 1.0.0
* 甩网子表
*/
@EqualsAndHashCode(callSuper = true)
@Data

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/swing/ext/CuMemberSwingNetExt.java
View File

@ -8,12 +8,7 @@ import lombok.EqualsAndHashCode;
import java.util.List;
/**
* @description: 会员甩网配置扩展表
* @author: sui q
* @time: 2023/8/30 15:00
* @classname: CuMemberSwingNet
* @package_name: com.hzs.common.domain.member.swing.ext
* version 1.0.0
* 会员甩网配置扩展表
*/
@EqualsAndHashCode(callSuper = true)
@Data