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

## Opt - 区分精品专区/商城专区

This commit is contained in:
sangelxiu1 2025-09-23 09:49:16 +08:00 committed by zhangheng
parent 8642d1aca3
commit 336db5dd2a
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,10 +621,13 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
public Boolean singleRevokeMemberBySelfRevokeOrder(Long pkApprove, SaOrderExt saOrder, BusinessCommissionDTO businessCommissionDTO) {
deductCancelOrderCost(businessCommissionDTO);
// 回退给创建人
CuMember member = cuMemberService.getMember(saOrder.getPkMember());
CuMemberAccount payMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(saOrder.getPkCreator());
if (EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType()) {
if (
EOrderType.RETAIL_REGISTER.getValue() == saOrder.getOrderType()
|| (saOrder.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue() && saOrder.getPayTime().equals(member.getPayTime()))
) {
// 会员账号 验证会员账户是否存在金额
CuMember member = cuMemberService.getMember(saOrder.getPkMember());
//删除会员
LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();

2
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
View File

@ -2402,7 +2402,7 @@
inner join cu_member cm
on cm.pk_id = so.pk_creator
where so.del_flag = 0
and so.order_type = 41
and so.order_type in (41, 43)
and so.order_code = #{orderCode}
</select>
</mapper>

3
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -636,7 +636,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
saOrderExt.setPkMember(newMember.getPkId());
if(ObjectUtil.isNotEmpty(registerParam.getCuMemberShare())){
saOrderExt.setPkReference(registerParam.getCuMemberShare().getPkParent());
saOrderExt.setOrderType(EOrderType.RETAIL_REGISTER.getValue());
// saOrderExt.setOrderType(EOrderType.RETAIL_REGISTER.getValue());
saOrderExt.setOrderType(registerParam.getSpecialArea());
}
resultStr = this.payRegOrder(saOrderExt, newMember, null);

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

@ -1154,7 +1154,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
saOrderChargeLogService.save(saOrderChargeLog);
// 撤销注册订单
CuMember member = memberServiceApi.getMember(myOrderVO.getPkMember()).getData();
CuMember member = memberServiceApi.getMember(SecurityUtils.getUserId()).getData();
if (myOrderVO.getOrderType() == EOrderType.RETAIL_REGISTER.getValue()
|| (myOrderVO.getOrderType() == EOrderType.RETAIL_REPURCHASE.getValue() && myOrderVO.getPayTime().equals(member.getPayTime()))
) {