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

## 报单添加购买188送VIP处理；

This commit is contained in:
cabbage 2025-07-15 16:14:40 +08:00
parent 6773e0c38f
commit 4b5b058af5
13 changed files with 102 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberBankServiceApi.java
View File

@ -1,21 +0,0 @@
package com.hzs.member.account;
import com.hzs.common.core.domain.R;
import com.hzs.member.account.dto.CuMemberBankParam;
/**
* @Description: 银行卡操作API
* @Author: ljc
* @Time: 2022/11/11 17:07
* @Classname: IMemberBankServiceApi
* @Package_name: com.hzs.member.account
*/
public interface IMemberBankServiceApi {
/**
* 添加银行卡信息
*
* @param cuMemberBankParam 银行上信息
* @return R
*/
R addBankInfo(CuMemberBankParam cuMemberBankParam);
}

5
bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java
View File

@ -8,12 +8,7 @@ import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* <p>
* 会员信息-银行卡信息
* </p>
*
* @author hzs
* @since 2022-08-31
*/
@Data
@AllArgsConstructor

2
bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/LoginUser.java
View File

@ -7,8 +7,6 @@ import lombok.Data;
/**
* 管理用户信息
*
* @author hzs
*/
@Data
public class LoginUser implements Serializable {

29
bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/MemberBankServiceProvider.java
View File

@ -1,29 +0,0 @@
package com.hzs.member.account.provider;
import com.hzs.common.core.domain.R;
import com.hzs.member.account.IMemberBankServiceApi;
import com.hzs.member.account.dto.CuMemberBankParam;
import com.hzs.member.account.service.ICuMemberBankService;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: 银行卡 Doubbo服务
* @Author: ljc
* @Time: 2022/11/11 16:31
* @Classname: MemberBankServiceProvider
* @Package_name: com.hzs.member.account.provider
*/
@Slf4j
@DubboService
public class MemberBankServiceProvider implements IMemberBankServiceApi {
@Autowired
ICuMemberBankService cuMemberBankService;
@Override
public R addBankInfo(CuMemberBankParam cuMemberBankParam) {
return R.ok(cuMemberBankService.saveMemberBank(cuMemberBankParam));
}
}

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

@ -3,7 +3,6 @@ package com.hzs.member.base.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.DesensitizedUtil;
import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.sign.Base64Util;
import com.hzs.common.domain.member.base.CuMember;

65
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java
View File

@ -21,13 +21,6 @@ import java.util.List;
*/
public interface SaOrderMapper extends BaseMapper<SaOrder> {
/**
* 查询会员注册、升级累计消费的业绩，用于计算海外升级
*
* @param memberCode 会员编号
*/
SaOrderVO queryTotalOrderAchieve(String memberCode);
/**
* 根据查询条件查询销售订单
*
@ -35,23 +28,8 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
*/
List<SaOrderVO> querySaOrderByCondition(OrderQueryParam orderQueryParam);
/**
* 批量更新订单发货方式
*
* @param idList 订单ID殂
* @param deliveryWay 发货方式
* @param userId
* @return
*/
int updateDeliveryWayBatch(@Param("idList") List<Long> idList,
@Param("deliveryWay") Integer deliveryWay,
@Param("userId") Long userId);
/*
* 批量撤单
* @author: sui q
* @date: 2023/7/27 16:04
* @param: null null
**/
void updateSaOrderByMember(@Param("memberList") List<Long> memberList, @Param("pkApprove") Long pkApprove, @Param("currentDateTime") Date currentDateTime);
@ -74,9 +52,6 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
/*
* 根据发货单查询销售订单
* @author: sui q
* @date: 2023/11/30 10:58
* @param: null null
**/
List<SaOrderExt> querySaOrderByDeliverList(@Param("deliverItemExtList") List<SaDeliverItemsExt> deliverItemExtList);
@ -179,18 +154,6 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
@Param("memberId") Long memberId,
@Param("pkCountry") Integer pkCountry);
/**
* 订单打印（前台）
*
* @param orderCode 订单编号
* @param memberId 用户ID
* @param pkCountry 所属国家
* @return MyOrderPrintVO
*/
MyOrderPrintVO orderPrint(@Param("orderCode") String orderCode,
@Param("memberId") Long memberId,
@Param("pkCountry") Integer pkCountry);
/**
* 订单业务列表
*
@ -242,8 +205,6 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
*/
int closeOrder(@Param("pkCountry") Integer pkCountry, @Param("data") String data, @Param("orderType") Integer orderType);
List<SaOrder> selectCancelableOrder(@Param("pkCountry") Integer pkCountry, @Param("data") String data, @Param("orderType") Integer orderType);
/**
* 查询订单类型
*
@ -253,9 +214,9 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
*/
List<Integer> queryOrderType(@Param("memberId") Long memberId, @Param("pkCountry") Integer pkCountry);
/*
* 查询满足复购分享收益的订单
**/
/**
* 查询满足复购分享收益的订单
*/
List<SaOrder> querySaOrderByTimeForCouponShare(@Param("startDate") Date startDate, @Param("endDate") Date endDate,
@Param("orderTypeList") List<Integer> orderTypeList, @Param("orderAmount") BigDecimal orderAmount,
@Param("orderAchieve") BigDecimal orderAchieve, @Param("pkCountry") Integer pkCountry);
@ -325,24 +286,4 @@ public interface SaOrderMapper extends BaseMapper<SaOrder> {
*/
List<SingleItemStatVo> singleItemStat(SingleItemStatParam singleItemStatParam);
/**
* 根据订单类型和商品编码查询列表
*
* @param pkMember 会员ID（必填）
* @param orderTypeList 订单类型列表（必填）
* @param waresCodeList 商品编码列表（必填）
* @return
*/
List<SaOrder> listByOrderTypeAndWaresCode(@Param("pkMember") Long pkMember,
@Param("orderTypeList") List<Integer> orderTypeList,
@Param("waresCodeList") List<String> waresCodeList);
/**
* 根据主键列表更新订单明细，删除部分退的订单
*
* @param pkOrder 订单明细
* @param pkApprove 审核人
* @param currentDate 更新时间
*/
Boolean updateOrderById(@Param("pkOrder") Long pkOrder, @Param("pkApprove") Long pkApprove, @Param("currentDateTime") Date currentDate);
}

10
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java
View File

@ -462,16 +462,6 @@ public interface ISaOrderService extends IService<SaOrder> {
*/
String myOrderCancel(SaOrder saOrder, Long memberId);
/**
* 订单打印（前台）
*
* @param orderCode
* @param memberId
* @param pkCountry
* @return
*/
MyOrderPrintVO orderPrint(String orderCode, Long memberId, Integer pkCountry);
/**
* 订单业务列表
*

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

@ -36,16 +36,13 @@ import com.hzs.common.domain.sale.wares.BdWares;
import com.hzs.common.domain.system.base.BdCountry;
import com.hzs.common.domain.system.base.ext.BdProductStorehouseExt;
import com.hzs.common.domain.system.config.BdAwards;
import com.hzs.common.domain.third.pay.TOnlinePayment;
import com.hzs.common.domain.third.pay.ext.TOnlineRefundExt;
import com.hzs.common.security.service.UserTokenService;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.util.TransactionUtils;
import com.hzs.member.account.IMemberAccountServiceApi;
import com.hzs.member.account.IMemberBankServiceApi;
import com.hzs.member.account.IMemberTradeServiceApi;
import com.hzs.member.account.dto.BusinessCommissionDTO;
import com.hzs.member.account.dto.CuMemberBankParam;
import com.hzs.member.account.dto.MemberAmountDTO;
import com.hzs.member.achieve.IMemberAchieveServiceApi;
import com.hzs.member.base.IMemberServiceApi;
@ -77,7 +74,6 @@ import com.hzs.system.sys.IApprovalServiceApi;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import com.hzs.system.sys.dto.ApprovalSubmitDTO;
import com.hzs.system.sys.dto.LoginUser;
import com.hzs.third.pay.ITOnlinePaymentServiceApi;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
@ -100,29 +96,27 @@ import java.util.stream.Collectors;
public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> implements ISaOrderService {
@DubboReference
IMemberServiceApi memberServiceApi;
IMemberServiceApi iMemberServiceApi;
@DubboReference
IGradeServiceApi iGradeServiceApi;
@DubboReference
IAwardsServiceApi iAwardsServiceApi;
@DubboReference
IAreaServiceApi areaServiceApi;
IAreaServiceApi iAreaServiceApi;
@DubboReference
IMemberBankServiceApi memberBankServiceApi;
IMemberAccountServiceApi iMemberAccountServiceApi;
@DubboReference
IMemberAccountServiceApi memberAccountServiceApi;
IAreaCurrencyServiceApi iAreaCurrencyServiceApi;
@DubboReference
IAreaCurrencyServiceApi areaCurrencyServiceApi;
ICountryServiceApi iCountryServiceApi;
@DubboReference
ICountryServiceApi countryServiceApi;
ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference
ICurrencyServiceApi currencyServiceApi;
IApprovalServiceApi iApprovalServiceApi;
@DubboReference
IApprovalServiceApi approvalServiceApi;
IMemberAchieveServiceApi iMemberAchieveServiceApi;
@DubboReference
IMemberAchieveServiceApi memberAchieveServiceApi;
@DubboReference
ISystemConfigServiceApi systemConfigServiceApi;
ISystemConfigServiceApi iSystemConfigServiceApi;
@DubboReference
ICuMemberServiceLogServiceApi iCuMemberServiceLogServiceApi;
@DubboReference
@ -131,8 +125,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
ICuMemberDetailServiceApi iCuMemberDetailServiceApi;
@DubboReference
ICuMemberAgreementWhiteApi cuMemberAgreementWhiteApi;
@DubboReference
ITOnlinePaymentServiceApi itOnlinePaymentServiceApi;
@Autowired
private IBdWaresService iBdWaresService;
@ -141,37 +133,38 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Autowired
private SaOrderHandle saOrderHandle;
@Autowired
private ISaOrderItemsService saOrderItemsService;
private ISaOrderItemsService iSaOrderItemsService;
@Autowired
private UserTokenService userTokenService;
private IBdProductExtendService iBdProductExtendService;
@Autowired
private IBdProductExtendService productExtendService;
@Autowired
private RabbitTemplate rabbitTemplate;
@Autowired
private IBdWaresSpecsRelationService waresSpecsRelationService;
private IBdWaresSpecsRelationService iBdWaresSpecsRelationService;
@Autowired
private IBdProductService iBdProductService;
@Autowired
private ISaDeliverItemsService saDeliverItemsService;
private ISaDeliverItemsService iSaDeliverItemsService;
@Autowired
private IAcPickService iAcPickService;
@Autowired
private IOrderBusinessService orderBusinessService;
private IOrderBusinessService iOrderBusinessService;
@Autowired
private ISaOrderChargeLogService saOrderChargeLogService;
private ISaOrderChargeLogService iSaOrderChargeLogService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private RedisService redisService;
@Autowired
private RabbitTemplate rabbitTemplate;
@Override
public List<CuMemberExt> queryMemberExtByCondition(CuMember cuMember) {
return memberServiceApi.getMemberInfo(cuMember).getData();
return iMemberServiceApi.getMemberInfo(cuMember).getData();
}
@Override
public List<CuMemberExt> querySponsorOnUmbrella(Long placeParentId, String phone) {
return memberServiceApi.querySponsorOnUmbrella(placeParentId, null, phone).getData();
return iMemberServiceApi.querySponsorOnUmbrella(placeParentId, null, phone).getData();
}
/**
@ -181,7 +174,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
*/
@Override
public List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCondition(Long memberId, List<CuMemberExt> cuMemberExtList) {
return memberServiceApi.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList).getData();
return iMemberServiceApi.selectPlaceSponsorUnderUmbrellaByCondition(memberId, cuMemberExtList).getData();
}
/**
@ -192,7 +185,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
*/
@Override
public List<CuMemberExt> queryPlaceSponsorUnderUmbrella(Long memberId, String placeParent) {
return memberServiceApi.queryPlaceSponsorUnderUmbrella(memberId, placeParent).getData();
return iMemberServiceApi.queryPlaceSponsorUnderUmbrella(memberId, placeParent).getData();
}
/**
@ -203,7 +196,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
*/
@Override
public CuMemberExt queryPlaceSponsorLastLeft(Long memberId, Integer placeDept) {
return memberServiceApi.queryPlaceSponsorLastLeft(memberId, placeDept).getData();
return iMemberServiceApi.queryPlaceSponsorLastLeft(memberId, placeDept).getData();
}
@Override
@ -232,7 +225,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (CollectionUtil.isNotEmpty(itemIdList)) {
orderItemsQueryWrapper.in(SaOrderItems::getPkId, itemIdList);
}
saOrderExt.setOrderItemsList(saOrderItemsService.list(orderItemsQueryWrapper));
saOrderExt.setOrderItemsList(iSaOrderItemsService.list(orderItemsQueryWrapper));
return saOrderExt;
}
@ -270,7 +263,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public Integer queryCuMemberByPkMember(Long pkReference) {
return memberServiceApi.queryCuMemberByPkMember(pkReference).getData();
return iMemberServiceApi.queryCuMemberByPkMember(pkReference).getData();
}
@Override
@ -285,12 +278,12 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public CuMember getCuMemberByKey(Long pkId) {
return memberServiceApi.getMemberById(pkId).getData();
return iMemberServiceApi.getMemberById(pkId).getData();
}
@Override
public CuMember getCuMemberByCode(String code) {
return memberServiceApi.getMemberByCode(code).getData();
return iMemberServiceApi.getMemberByCode(code).getData();
}
@Override
@ -307,7 +300,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMemberAccount.setMemberCode(creator.getMemberCode());
// 查询专区所属币种
List<AreaCurrencyDTO> areaCurrencyDTOListOld = areaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), cuMemberAccount.getPkCountry()).getData();
List<AreaCurrencyDTO> areaCurrencyDTOListOld = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrder.getOrderType(), cuMemberAccount.getPkCountry()).getData();
List<AreaCurrencyDTO> areaCurrencyDTOList = areaCurrencyDTOListOld;
if (cuMemberAccount.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
//休止期的奖金账户(不在白名单内)不允许报单
@ -338,7 +331,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (saOrderItems.getPkSpecialCurrency() != null) {
BigDecimal orderItemPayMoney = ComputeUtil.computeMultiply(saOrderItems.getPrice(), saOrderItems.getQuantity());
payMoney = ComputeUtil.computeSubtract(payMoney, orderItemPayMoney);
List<AreaCurrencyDTO> areaCurrencyDtoList = areaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrderItems.getPkSpecialCurrency()).getData();
List<AreaCurrencyDTO> areaCurrencyDtoList = iAreaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrderItems.getPkSpecialCurrency()).getData();
if (!handleSaOrderAmount(upPolicyCurrency, cuMemberAccount, orderItemPayMoney, BigDecimal.ZERO, areaCurrencyDtoList)) {
return null;
@ -359,7 +352,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public List<CuMemberAccountExt> queryMemberAccountByCondition(CuMemberAccount cuMemberAccount) {
return memberAccountServiceApi.queryMemberAccountByCondition(cuMemberAccount).getData();
return iMemberAccountServiceApi.queryMemberAccountByCondition(cuMemberAccount).getData();
}
private Boolean handleSaOrderAmount(UpPolicyCurrency upPolicyCurrency, CuMemberAccountExt cuMemberAccount,
@ -464,18 +457,19 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Transactional(rollbackFor = Exception.class)
public Boolean confirmRegSaOrderByOrderParam(OrderParam orderParam) {
boolean isToBePay = getIsToBePayByOrderType(orderParam.getPkSettleCountry(), orderParam.getSpecialArea());
CuMember cuMember = saOrderHandle.packageSaveUser(orderParam, memberServiceApi.queryMember(orderParam.getCenterCodeId()).getData());
CuMember cuMember = saOrderHandle.packageSaveUser(orderParam, iMemberServiceApi.queryMember(orderParam.getCenterCodeId()).getData());
// 获取会员编号、会员主键
if (isToBePay) {
cuMember = memberServiceApi.createMemberIdAndCode(cuMember, Boolean.FALSE).getData();
cuMember = iMemberServiceApi.createMemberIdAndCode(cuMember, Boolean.FALSE).getData();
} else if ((CountryConstants.CHINA_COUNTRY.equals(orderParam.getPkSettleCountry())) &&
(EOrderType.REGISTER_ORDER.getValue() == orderParam.getSpecialArea()
|| EOrderType.SPECIAL_REGISTER_ORDER.getValue() == orderParam.getSpecialArea())) {
// 2023.10.16按最新需求，注册订单需要在支付前需要显示会员编号
cuMember = memberServiceApi.createRegisterMemberCode(cuMember).getData();
cuMember = iMemberServiceApi.createRegisterMemberCode(cuMember).getData();
}
SaOrderExt saOrderExt = packageWholeSaOrder(orderParam, cuMember);
// 设置会员等级
if (setLastCuMemberGrade(cuMember, saOrderExt)) {
return false;
}
@ -484,7 +478,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (isToBePay && !orderParam.getIsHaiFun()) {
processOrder(saOrderExt);
// 调用其他服务保存会员信息、会员注册信息
R<Boolean> saveResult = memberServiceApi.saveMember(cuMember);
R<Boolean> saveResult = iMemberServiceApi.saveMember(cuMember);
if (saveResult.isSuccess()) {
if (!saveResult.getData()) {
log.error("confirmRegSaOrderByOrderParam 保存会员失败.");
@ -547,9 +541,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
orderParam.setPlaceParentId(placeMember.getPkId());
}
}
CuMember cuMember = saOrderHandle.packageSaveUser(orderParam, memberServiceApi.queryMember(orderParam.getCenterCodeId()).getData());
CuMember cuMember = saOrderHandle.packageSaveUser(orderParam, iMemberServiceApi.queryMember(orderParam.getCenterCodeId()).getData());
// 获取会员编号、会员主键
cuMember = memberServiceApi.createMemberIdAndCode(cuMember, Boolean.FALSE).getData();
cuMember = iMemberServiceApi.createMemberIdAndCode(cuMember, Boolean.FALSE).getData();
return cuMember;
}
@ -602,6 +596,12 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (null != newGradeDTO) {
cuMember.setPkSettleGrade(newGradeDTO.getPkId());
}
} else if (EGrade.HAI_FAN.getValue() == gradeDTO.getGradeValue()) {
// 2025.07.15 新需求，报 188 给 660 等级
GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.YOU_KE.getValue(), saOrderExt.getPkCountry()).getData();
if (null != newGradeDTO) {
cuMember.setPkSettleGrade(newGradeDTO.getPkId());
}
}
}
@ -650,7 +650,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
List<WaresNumberParam> waresNumberList = waresNumberParamList.stream().filter(DeduplicationUtil.distinctByKey(WaresNumberParam::getPkWares)).collect(Collectors.toList());
waresSalesAccrual(waresNumberList);
// 保存订单明细
saOrderItemsService.saveBatch(saOrderExt.getOrderItemsList());
iSaOrderItemsService.saveBatch(saOrderExt.getOrderItemsList());
}
@Override
@ -782,7 +782,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
newCuMember.setStopDate(DateUtils.addMonths(newCuMember.getExpireDate(), 6));
// 调用其他服务保存会员信息、会员注册信息
R<Boolean> saveResult = memberServiceApi.saveMember(newCuMember, saOrderExt, isToBePay, cuMemberAccountExt);
R<Boolean> saveResult = iMemberServiceApi.saveMember(newCuMember, saOrderExt, isToBePay, cuMemberAccountExt);
if (saveResult.isSuccess()) {
if (!saveResult.getData()) {
log.error("payRegSaOrder 保存会员失败!.");
@ -838,7 +838,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
for (SaOrderItems saOrderItems : saOrderExt.getOrderItemsList()) {
saOrderItems.setPkOrder(saOrderExt.getPkId());
}
saOrderItemsService.saveBatch(saOrderExt.getOrderItemsList());
iSaOrderItemsService.saveBatch(saOrderExt.getOrderItemsList());
} finally {
redisService.unlock(CacheConstants.MEMBER_ORDER + saOrderExt.getOrderCode());
}
@ -848,7 +848,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
redisService.lockKeyMany(CacheConstants.MEMBER_ORDER + saOrderExt.getOrderCode());
try {
updateById(saOrderExt);
saOrderItemsService.updateBatchById(saOrderExt.getOrderItemsList());
iSaOrderItemsService.updateBatchById(saOrderExt.getOrderItemsList());
} finally {
redisService.unlock(CacheConstants.MEMBER_ORDER + saOrderExt.getOrderCode());
}
@ -911,7 +911,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 更新订单信息
updateSaOrder(saOrderExt);
// 处理会员信息，更新会员等级,扣款
R<Boolean> saveResult = memberServiceApi.saveMember(cuMember, saOrderExt, cuMemberAccountExt);
R<Boolean> saveResult = iMemberServiceApi.saveMember(cuMember, saOrderExt, cuMemberAccountExt);
if (saveResult.isSuccess()) {
if (!saveResult.getData()) {
log.error("payUpgradeSaOrder 保存会员失败!!!");
@ -1006,7 +1006,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
cuMember.setStopDate(DateUtils.addMonths(member.getStopDate(), 12));
}
R<Boolean> saveResult = memberServiceApi.saveMember(cuMember, saOrderExt, cuMemberAccountExt);
R<Boolean> saveResult = iMemberServiceApi.saveMember(cuMember, saOrderExt, cuMemberAccountExt);
if (saveResult.isSuccess()) {
if (!saveResult.getData()) {
log.error("payRepurchaseSaOrder 保存订单失败!");
@ -1073,7 +1073,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (productIdList.size() > 0 && saOrderExt.getRecProvince() != null) {
// 根据产品，先查看是否由仓库，有仓库的话修改仓库
List<BdProductStorehouseExt> bdProductStorehouseList = areaServiceApi.queryBdProductStorehouseByCondition(productIdList, saOrderExt.getRecProvince()).getData();
List<BdProductStorehouseExt> bdProductStorehouseList = iAreaServiceApi.queryBdProductStorehouseByCondition(productIdList, saOrderExt.getRecProvince()).getData();
Map<Integer, BdProductStorehouseExt> bdProductStorehouseMap = new HashMap<>();
if (CollectionUtil.isNotEmpty(bdProductStorehouseList)) {
bdProductStorehouseList.forEach(bdProductStorehouse -> bdProductStorehouseMap.put(bdProductStorehouse.getPkProduct(), bdProductStorehouse));
@ -1105,13 +1105,15 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 计算下单后等级
GradeDTO gradeDTO = calculateGradeDTO(orderParam.getSpecialArea(), orderParam.getPkSettleCountry(),
orderParam.getCenterCodeId(), saOrder, orderReturn);
// 注册类型订单直接查询出会员等级
if (orderParam.getSpecialArea().equals(EOrderType.REGISTER_ORDER.getValue())
|| orderParam.getSpecialArea().equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue())) {
// 注册订单直接给足够升级
orderReturn.setIsEnough(Boolean.TRUE);
}
if (orderParam.getIsEnough() != null && orderParam.getIsEnough()) {
// 如果足够升级，查询出等级信息
orderReturn.setIsEnough(Boolean.TRUE);
CuMember member = getCuMemberByKey(orderParam.getCenterCodeId());
GradeDTO grade = iGradeServiceApi.getGrade(member.getPkSettleGrade()).getData();
@ -1230,7 +1232,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
//创建用户
CuMemberExt memberExt = createMember(orderBlankRegParams);
R<CuMember> member = memberServiceApi.createEmptyOrderMember(memberExt);
R<CuMember> member = iMemberServiceApi.createEmptyOrderMember(memberExt);
if (member.getData() == null) {
throw new RuntimeException("保存会员失败");
}
@ -1251,7 +1253,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
.businessCode(code)
.signType(ESignType.getEnumByValue(orderBlankRegParams.getSignType()))
.remark(orderBlankRegParams.getRemark()).pkMemberList(memberSet).build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_PETITION));
@ -1284,7 +1286,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
saOrder.setOrderCode(orderCode);
// 虚拟订单
saOrder.setOrderType(EOrderType.FICTITIOUS_ORDER.getValue());
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(orderBlankRegParams.getPkSettleCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(orderBlankRegParams.getPkSettleCountry());
saOrder.setPkRate(currency.getData().getPkId());
saOrder.setOrderAmount(orderBlankRegParams.getRegisterPrice());
saOrder.setOrderAchieve(orderBlankRegParams.getRegisterPv());
@ -1317,7 +1319,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
for (SaOrderItems orderItem : orderItems) {
orderItem.setPkOrder(saOrder.getPkId());
BdWares wares = iBdWaresService.getWares(orderItem.getPkWares());
BdProductExtendExt productExtend = productExtendService.queryExtendAndProduct(orderItem.getPkProduct());
BdProductExtendExt productExtend = iBdProductExtendService.queryExtendAndProduct(orderItem.getPkProduct());
orderItem.setPkWares(wares.getPkId());
orderItem.setPrice(wares.getWaresPrice().multiply(new BigDecimal(orderItem.getQuantity())));
orderItem.setPkRate(currency.getData().getPkId());
@ -1328,7 +1330,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
orderItem.setOrderStatus(EOrderStatus.PAY.getValue());
orderItem.setCreationTime(DateUtils.currentDateTime());
// 填充冗余产品规格
List<BdWaresSpecsRelationExt> waresSpecsRelationList = waresSpecsRelationService.selectByWaresSpecsSku(orderItem.getPkWaresSpecsSku().intValue());
List<BdWaresSpecsRelationExt> waresSpecsRelationList = iBdWaresSpecsRelationService.selectByWaresSpecsSku(orderItem.getPkWaresSpecsSku().intValue());
// 规格名称
List<String> specsNames = new ArrayList<>();
// 规格id
@ -1343,21 +1345,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
orderItem.setPkCreator(SecurityUtils.getUserId());
orderItem.setSkuCode(CommonUtil.createSkuCode(productExtend.getProductCode(), orderItem.getSpecsNameId()));
}
saOrderItemsService.saveBatch(orderItems);
// 设置用户银行卡信息 国内页面隐藏
if (loginUser.getDataCountry() != 1) {
CuMemberBankParam memberBank = new CuMemberBankParam();
memberBank.setPkMember(member.getPkId());
memberBank.setPkCountry(orderBlankRegParams.getPkSettleCountry());
memberBank.setBankName(orderBlankRegParams.getBankName());
memberBank.setSubBankName(orderBlankRegParams.getOpeningBranch());
memberBank.setCardNumber(orderBlankRegParams.getBankCard());
memberBank.setAccountName(orderBlankRegParams.getOpeningName());
memberBank.setPhone(orderBlankRegParams.getReservedPhone());
memberBank.setIdCard(orderBlankRegParams.getIdCard());
memberBank.setPkMember(member.getPkId());
memberBankServiceApi.addBankInfo(memberBank);
}
iSaOrderItemsService.saveBatch(orderItems);
return saOrder;
}
@ -1421,7 +1409,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (ECancelOrderType.OTHER_CANCEL_PART_ORDER.getValue() == orderCancelParam.getCancelType()) {
approveBusiness = EApprovalBusiness.ORDER_CANCEL_PRODUCT;
}
Map<Long, OrderQueryChargeDTO> queryChargeMap = orderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()),
Map<Long, OrderQueryChargeDTO> queryChargeMap = iOrderBusinessService.queryChargeLog(Collections.singletonList(validateCancelOrderVO.getSaOrderExt()),
approveBusiness, orderCancelParam.getPkCountry());
if (queryChargeMap != null && queryChargeMap.containsKey(saOrderExt.getPkId())) {
List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
@ -1480,13 +1468,13 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 修改订单
Date currentDateTime = DateUtils.currentDateTime();
// 删除发货单
saDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList);
iSaDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), pkOrderItemList);
updateSaOrder(pkApprove, saOrderExt, currentDateTime);
// 删除订单明细
if (!saOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) {
if (!iSaOrderItemsService.updateOrderItemsById(pkOrderItemList, pkApprove, currentDateTime)) {
throw new RuntimeException("更新订单失败");
}
if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, pkOrderItemList, businessCommissionDTO).getData()) {
if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, null, pkOrderItemList, businessCommissionDTO).getData()) {
throw new RuntimeException("撤单失败");
}
} else {
@ -1494,17 +1482,17 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
Date currentDate = DateUtils.currentDateTime();
// 删除发货单
saDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), null);
iSaDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), null);
// 修改订单
updateSaOrder(pkApprove, saOrderExt, currentDate);
// 删除订单明细
if (!saOrderItemsService.updateOrderItems(saOrderExt)) {
if (!iSaOrderItemsService.updateOrderItems(saOrderExt)) {
throw new RuntimeException("更新订单失败");
}
// 撤销注册订单 单点撤单
if (ECancelOrderType.SINGLE_CANCEL_ORDER.getValue() == orderCancelParam.getCancelType()) {
// 单点撤单，变死点
R<Boolean> tmpR = memberServiceApi.singleRevokeMemberByRegisterOrder(pkApprove, saOrderExt, businessCommissionDTO);
R<Boolean> tmpR = iMemberServiceApi.singleRevokeMemberByRegisterOrder(pkApprove, saOrderExt, businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new RuntimeException("撤单失败 " + tmpR.getMsg());
}
@ -1513,12 +1501,12 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
List<Long> memberList = validateCancelOrderVO.getMemberList().stream().map(OrderCancelRegisterMemberVO::getPkMember).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(memberList)) {
// 撤销所有订单明细表
saOrderItemsService.updateOrderItemsByMemberList(memberList, pkApprove, currentDate);
iSaOrderItemsService.updateOrderItemsByMemberList(memberList, pkApprove, currentDate);
// 撤销所有订单主表
baseMapper.updateSaOrderByMember(memberList, pkApprove, currentDate);
}
R<Boolean> tmpR = memberServiceApi.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, validateCancelOrderVO.getSaOrderMap(), businessCommissionDTO);
R<Boolean> tmpR = iMemberServiceApi.mergeRevokeMemberByRegisterOrder(pkApprove, memberList, validateCancelOrderVO.getSaOrderMap(), businessCommissionDTO);
if (!tmpR.isSuccess()) {
throw new RuntimeException("撤单失败 " + tmpR.getMsg());
}
@ -1533,7 +1521,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 获取升级订单
// 空单注册，从cu_member_register中获取
if (updSaOrder == null) {
CuMemberRegister cuMemberRegister = memberServiceApi.queryCuMemberRegister(saOrderExt.getPkMember()).getData();
CuMemberRegister cuMemberRegister = iMemberServiceApi.queryCuMemberRegister(saOrderExt.getPkMember()).getData();
cuMember.setPkRegisterGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setPkSettleGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setConsumeMoney(BigDecimal.ZERO);
@ -1588,7 +1576,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
}
if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, null, businessCommissionDTO).getData()) {
if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, null, businessCommissionDTO).getData()) {
throw new RuntimeException("撤单处理会员失败");
}
}
@ -1673,7 +1661,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (isFirst == null) {
isFirst = validateFirstOrder(cuMember.getPkParent(), cuMember.getPkSettleCountry());
}
cuMember = memberAchieveServiceApi.queryCuMemberAchieveByPkMember(cuMember, isFirst, isFirstAchieve).getData();
cuMember = iMemberAchieveServiceApi.queryCuMemberAchieveByPkMember(cuMember, isFirst, isFirstAchieve).getData();
// 验证是否推荐过人，没有推荐只能放入极左极下
return cuMember;
}
@ -1746,7 +1734,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public String querySystemConfigByKey(Integer pkCountry, String key) {
return systemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData();
return iSystemConfigServiceApi.getBonusSystemConfig(pkCountry, key).getData();
}
@Override
@ -1822,7 +1810,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
updateWrapper.set(SaOrderItems::getOrderStatus, EOrderStatus.RECEIVED.getValue());
updateWrapper.set(SaOrderItems::getPkModified, memberId);
updateWrapper.set(SaOrderItems::getModifiedTime, new Date());
return saOrderItemsService.update(updateWrapper);
return iSaOrderItemsService.update(updateWrapper);
}
@Transactional(rollbackFor = Exception.class)
@ -1835,7 +1823,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
|| EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()
) {
// 注册类订单，需要校验是否推荐过人或者安置过人，如果有则不允许进行取消
if (memberServiceApi.checkLowerMember(saOrder.getPkMember()).getData()) {
if (iMemberServiceApi.checkLowerMember(saOrder.getPkMember()).getData()) {
// 订单所属会员下存在用户不能取消
return TransactionUtils.getContent(MemberMsgConstants.EXIST_MEMBER_NOT_CANCEL);
}
@ -1849,7 +1837,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
updateItemsWrapper.set(SaOrderItems::getDelFlag, EDelFlag.DELETE.getValue());
updateItemsWrapper.set(SaOrderItems::getPkModified, memberId);
updateItemsWrapper.set(SaOrderItems::getModifiedTime, nowDate);
saOrderItemsService.update(updateItemsWrapper);
iSaOrderItemsService.update(updateItemsWrapper);
// 删除订单
LambdaUpdateWrapper<SaOrder> updateOrderWrapper = new LambdaUpdateWrapper<>();
@ -1863,7 +1851,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType()
|| EOrderType.SPECIAL_REGISTER_ORDER.getValue() == saOrder.getOrderType()
) {
if (!memberServiceApi.cancelMember(saOrder.getPkMember()).getData()) {
if (!iMemberServiceApi.cancelMember(saOrder.getPkMember()).getData()) {
throw new RuntimeException("取消订单失败");
}
}
@ -1871,11 +1859,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
return null;
}
@Override
public MyOrderPrintVO orderPrint(String orderCode, Long memberId, Integer pkCountry) {
return baseMapper.orderPrint(orderCode, memberId, pkCountry);
}
@Override
public List<OrderBusinessVO> queryOrderBusinessList(OrderBusinessParam param, Integer pkCountry) {
return baseMapper.queryOrderBusinessList(param, pkCountry);
@ -1906,7 +1889,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
orderItemsUpdateWrapper.set(SaOrderItems::getDelFlag, EDelFlag.DELETE.getValue());
orderItemsUpdateWrapper.set(SaOrderItems::getPkModified, userId);
orderItemsUpdateWrapper.set(SaOrderItems::getModifiedTime, nowDate);
saOrderItemsService.update(orderItemsUpdateWrapper);
iSaOrderItemsService.update(orderItemsUpdateWrapper);
}
/**
@ -1947,7 +1930,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
orderParam.setPhone(cuMemberShare.getPhone());
orderParam.setParentId(cuMemberShare.getPkParent());
orderParam.setCenterCodeId(cuMemberShare.getPkParent());
CuMember parentMember = memberServiceApi.queryMember(cuMemberShare.getPkParent()).getData();
CuMember parentMember = iMemberServiceApi.queryMember(cuMemberShare.getPkParent()).getData();
if (parentMember == null) {
return null;
}
@ -2032,7 +2015,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
@Override
public CuMemberShare queryCuMemberShare(Long pkMember) {
return memberServiceApi.queryCuMemberShare(pkMember).getData();
return iMemberServiceApi.queryCuMemberShare(pkMember).getData();
}
/**
@ -2077,7 +2060,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
newCuMember.setPkPlaceParent(cuMember.getPkPlaceParent());
newCuMember.setPlaceDept(cuMember.getPlaceDept());
// 调用其他服务保存会员信息、会员注册信息
R<Boolean> saveResult = memberServiceApi.saveMember(newCuMember, saOrderExt);
R<Boolean> saveResult = iMemberServiceApi.saveMember(newCuMember, saOrderExt);
if (saveResult.isSuccess()) {
if (!saveResult.getData()) {
log.error("payShareSaOrder 保存会员失败！");
@ -2164,9 +2147,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
*/
@Override
public void closeOrder() {
R<Map<String, String>> configMap = systemConfigServiceApi.getSystemConfig();
R<Map<String, String>> configMap = iSystemConfigServiceApi.getSystemConfig();
Map<String, String> configDate = configMap.getData();
R<Map<Integer, BdCountry>> all = countryServiceApi.getAllCountryMap();
R<Map<Integer, BdCountry>> all = iCountryServiceApi.getAllCountryMap();
Set<Map.Entry<Integer, BdCountry>> entries = all.getData().entrySet();
for (Map.Entry<Integer, BdCountry> entry : entries) {
@ -2196,7 +2179,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
ESpecialAreaTime specialAreaTime = ESpecialAreaTime.getSpecialAreaTime(date);
if (orderType != null && specialAreaTime != null) {
if (baseMapper.closeOrder(country.getPkId(), specialAreaTime.getAttributeValue(), orderType) > 0) {
saOrderItemsService.closeOrder(country.getPkId(), specialAreaTime.getAttributeValue(), orderType);
iSaOrderItemsService.closeOrder(country.getPkId(), specialAreaTime.getAttributeValue(), orderType);
}
}
}
@ -2260,7 +2243,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
public int insertBach(List<SaOrder> orderList, List<SaOrderItems> orderItemsList) {
int i = baseMapper.insertBach(orderList);
if (i > 0 && CollectionUtil.isNotEmpty(orderItemsList)) {
saOrderItemsService.insertBach(orderItemsList);
iSaOrderItemsService.insertBach(orderItemsList);
}
return i;
}
@ -2280,11 +2263,11 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
saOrderExt.setDelFlag(EDelFlag.DELETE.getValue());
Date currentDate = DateUtils.currentDateTime();
// 删除发货单
saDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), null);
iSaDeliverItemsService.deleteSaDeliverItems(saOrderExt.getPkId(), null);
// 修改订单
updateSaOrder(pkApprove, saOrderExt, currentDate);
// 删除订单明细
if (!saOrderItemsService.updateOrderItems(saOrderExt)) {
if (!iSaOrderItemsService.updateOrderItems(saOrderExt)) {
throw new RuntimeException("更新订单失败");
}
@ -2299,13 +2282,13 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
mo.setPkCreator(pkApprove);
saOrderChargeLog.setAfterData(JSONUtil.toJsonStr(mo));
saOrderChargeLog.setSource(ESignSource.MEMBER.getValue());
saOrderChargeLogService.save(saOrderChargeLog);
iSaOrderChargeLogService.save(saOrderChargeLog);
// 撤销注册订单(注册订单,海粉订单,特殊注册订单)
if (myOrderVO.getOrderType() == EOrderType.REGISTER_ORDER.getValue()
|| myOrderVO.getOrderType() == EOrderType.SPECIAL_REGISTER_ORDER.getValue()) {
// 逻辑删除会员
if (!memberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
if (!iMemberServiceApi.singleRevokeMemberBySelfRevokeOrder(pkApprove, saOrderExt, businessCommissionDTO).getData()) {
throw new RuntimeException("撤单失败");
}
} else {
@ -2319,7 +2302,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 获取升级订单
// 空单注册，从cu_member_register中获取
if (updSaOrder == null) {
CuMemberRegister cuMemberRegister = memberServiceApi.queryCuMemberRegister(saOrderExt.getPkMember()).getData();
CuMemberRegister cuMemberRegister = iMemberServiceApi.queryCuMemberRegister(saOrderExt.getPkMember()).getData();
cuMember.setPkRegisterGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setPkSettleGrade(cuMemberRegister.getPkRegisterGrade());
cuMember.setConsumeMoney(BigDecimal.ZERO);
@ -2381,22 +2364,10 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
}
if (!memberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, null, businessCommissionDTO).getData()) {
if (!iMemberServiceApi.normalRevokeOrder(pkApprove, saOrderExt, cuMember, null, businessCommissionDTO).getData()) {
throw new RuntimeException("撤单失败");
}
}
// 在线支付退款，已经迁移到调用member服务处理明细位置
// R<TOnlinePayment> onlinePaymentR = itOnlinePaymentServiceApi.getOnlinePayment(saOrderExt.getOrderCode());
// TOnlinePayment onlinePayment;
// if(ObjectUtil.isNotEmpty(onlinePaymentR)){
// onlinePayment = onlinePaymentR.getData();
// if(ObjectUtil.isNotEmpty(onlinePayment)){
// R result = itOnlinePaymentServiceApi.refund(saOrderExt.getOrderCode(), SecurityUtils.getUserId());
// if(!result.isSuccess()){
// throw new ServiceException(result.getMsg());
// }
// }
// }
try {
// 验证订单是否有仓库，有仓库的可以回退，没有的回退
if (saOrderExt.getPkStorehouse() != null) {

95
bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
View File

@ -146,15 +146,6 @@
</collection>
</resultMap>
<select id="queryTotalOrderAchieve" resultMap="SaOrderVO">
select member_code, sum(order_amount) order_amount, sum(order_achieve) order_achieve
from sa_order
where del_flag = 0
and ORDER_STATUS = 0
and member_code = #{memberCode}
group by member_code
</select>
<select id="querySaOrderByCondition" resultMap="SaOrderVO">
select so.order_code,so.order_type,so.pk_rate,so.order_amount,so.order_achieve,so.postage,
cm.member_code,cm.member_name,par.member_code REFERENCE,par.member_name referenceName,so.rec_name,so.rec_phone,
@ -268,18 +259,6 @@
order by pay_time
</select>
<!-- 批量更新订单发货方式 -->
<update id="updateDeliveryWayBatch">
update SA_ORDER so
set so.DELIVERY_WAY = #{deliveryWay},
so.PK_MODIFIED = #{userId},
so.MODIFIED_TIME = sysdate
where so.PK_ID in
<foreach collection="idList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</update>
<select id="selectSum" resultType="decimal">
select ifnull(sum(ORDER_AMOUNT), 0)
from SA_ORDER
@ -692,39 +671,6 @@
)
</select>
<!-- 订单打印（前台） -->
<select id="orderPrint" resultMap="orderPrintMap">
select cm.member_code,
cm.member_name,
cm.phone,
so.order_code,
so.pay_time,
so.rec_name,
so.rec_phone,
so.rec_province,
so.rec_city,
so.rec_county,
so.rec_address,
bp.product_name,
soi.quantity,
soi.price,
soi.achievement,
soi.ass_achievement
from sa_order so
inner join cu_member cm
on cm.pk_id = so.pk_member
left join sa_order_items soi
on soi.pk_order = so.pk_id
and soi.del_flag = 0
inner join BD_PRODUCT bp
on bp.pk_id = soi.pk_product
where so.del_flag = 0
and so.pk_country = #{pkCountry}
and (so.pk_member = #{memberId} or so.pk_creator = #{memberId})
and so.order_code = #{orderCode}
order by bp.product_name
</select>
<!-- 订单业务列表 -->
<select id="queryOrderBusinessList" resultType="com.hzs.sale.order.vo.OrderBusinessVO">
select so.*,
@ -1184,25 +1130,6 @@
#{item}
</foreach>
</update>
<update id="updateOrderById">
update sa_order
set DEL_FLAG = 1,
PK_MODIFIED = #{pkApprove},
MODIFIED_TIME = #{currentDateTime}
where del_flag = 0
and pk_id = #{pkOrder}
and 0 = (select count(1) from sa_order_items where del_flag = 0 and pk_order = #{pkOrder})
</update>
<select id="selectCancelableOrder" resultMap="SaOrder">
select *
from SA_ORDER
where (select (select sysdate - interval '${data}' hour from dual) from dual) > CREATION_TIME
and ORDER_STATUS = 0
and DEL_FLAG = 0
and PK_COUNTRY = #{pkCountry}
and ORDER_TYPE = #{orderType}
</select>
<!-- 自助服务可申请订单列表 -->
<select id="selfOrderList" resultType="com.hzs.common.domain.sale.ext.SaOrderExt">
@ -1720,28 +1647,6 @@
order by a.show_Time desc
</select>
<!-- 根据订单类型和商品编码查询列表 -->
<select id="listByOrderTypeAndWaresCode" resultType="com.hzs.common.domain.sale.order.SaOrder">
select so.*
from sa_order so
left join sa_order_items soi
on soi.pk_order = so.pk_id
left join bd_wares bw
on bw.pk_id = soi.pk_wares
where so.del_flag = 0
and so.pk_country = 1
and so.order_status = 1
and so.order_type in
<foreach collection="orderTypeList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and bw.del_flag = 0
and bw.wares_code in
<foreach collection="waresCodeList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and so.pk_member = #{pkMember}
</select>
<select id="queryRepeatSaOrderByDay" resultMap="saOrderExtResultMap">
select od.*, bc.in_exchange_rate
from (

9
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java
View File

@ -29,10 +29,11 @@ public enum EGrade {
*/
START_UP(1,20, "一级", 0, EnumsPrefixConstants.GRADE + "20", MemberFrameworkConstants.START_UP),
// /**
// * 海粉
// */
// HAI_FAN(2,30, "二级", 0, EnumsPrefixConstants.GRADE + "30", MemberFrameworkConstants.Hi_Pink),
/**
* V0 -- 顾客
* 2025.07.15 新添加等级
*/
HAI_FAN(2,30, "二级", 0, EnumsPrefixConstants.GRADE + "30", MemberFrameworkConstants.Hi_Pink),
/**
* V1 -- VIP

4
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EStatisticalValue.java
View File

@ -5,9 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @description: 统计类型枚举
* @classname: EStatisticalValue
* @package_name: com.hzs.common.core.enums
* 统计类型枚举
*/
@AllArgsConstructor
@Getter

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EUpgradeWay.java
View File

@ -4,11 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 升级方式
* @Author: sui q
* @Time: 2022/9/24 16:47
* @Classname: EUpgradeWay
* @PackageName: com.hzs.common.core.enums
* 升级方式
*/
@AllArgsConstructor
@Getter

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrder.java
View File

@ -14,9 +14,6 @@ import lombok.experimental.Accessors;
/**
* 销售订单-主表
*
* @author hzs
* @since 2022-08-31
*/
@Data
@ToString(callSuper = true)