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

## 区域收益处理；

This commit is contained in:
cabbage 2025-07-25 11:30:51 +08:00
parent bdecc555f0
commit 0695e5bf45
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
View File

@ -860,7 +860,8 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
Map<String, Long> memberRegionMap) { Map<String, Long> memberRegionMap) {
List<CuMemberBonusRange> cuMemberBonusRangeList = new ArrayList<>(); List<CuMemberBonusRange> cuMemberBonusRangeList = new ArrayList<>();
if (purchaseOrderList.size() > 0) { if (purchaseOrderList.size() > 0 && memberRegionMap.size() > 0) {
// 有订单数据 并且 有选择的区域，处理区域收益
// 获取区域会员数据 // 获取区域会员数据
Set<Long> memberIdSet = new HashSet<>(memberRegionMap.values()); Set<Long> memberIdSet = new HashSet<>(memberRegionMap.values());
memberIdSet.addAll(purchaseOrderList.stream().map(SaOrderExt::getPkMember).collect(Collectors.toSet())); memberIdSet.addAll(purchaseOrderList.stream().map(SaOrderExt::getPkMember).collect(Collectors.toSet()));
@ -870,7 +871,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
Map<Integer, BigDecimal> regionAreaConfigMap = bonusConfigDTO.getRegionAreaConfigMap(); Map<Integer, BigDecimal> regionAreaConfigMap = bonusConfigDTO.getRegionAreaConfigMap();
for (SaOrderExt saOrderExt : purchaseOrderList) { for (SaOrderExt saOrderExt : purchaseOrderList) {
if (validatePkBonusItems(bonusConfigDTO, saOrderExt.getPkSettleCountry(), EBonusItems.REPURCHASE_AREA_INCOME.getValue())) { if (validatePkBonusItems(bonusConfigDTO, saOrderExt.getPkCountry(), EBonusItems.REPURCHASE_AREA_INCOME.getValue())) {
// 校验当前国家是否有该奖项（区域收益） // 校验当前国家是否有该奖项（区域收益）
continue; continue;
} }
@ -958,7 +959,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cmMemberAreaBonusRange, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate(), true); BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cmMemberAreaBonusRange, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate(), true);
if (EBonusIncomeStatus.NORMAL.getValue() == cmMemberAreaBonusRange.getIncomeStatus()) { if (EBonusIncomeStatus.NORMAL.getValue() == cmMemberAreaBonusRange.getIncomeStatus()) {
// 收益状态正常，扣除 // 收益状态正常，扣除
cuMemberBonus.setRepurRangeIncome(ComputeUtil.computeAdd(cuMemberBonus.getRepurRangeIncome(), cmMemberAreaBonusRange.getPretaxIncome())); cuMemberBonus.setStoreIncome(ComputeUtil.computeAdd(cuMemberBonus.getStoreIncome(), cmMemberAreaBonusRange.getPretaxIncome()));
setPurchaseTotal(bdBonusDeduct, cuMemberBonus, cmMemberAreaBonusRange); setPurchaseTotal(bdBonusDeduct, cuMemberBonus, cmMemberAreaBonusRange);
} }
cuMemberBonusRangeList.add(cmMemberAreaBonusRange); cuMemberBonusRangeList.add(cmMemberAreaBonusRange);

3
bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
View File

@ -112,6 +112,9 @@
so.pk_creator, so.pk_creator,
so.consume_amount, so.consume_amount,
so.box_num, so.box_num,
so.rec_province,
so.rec_city,
so.rec_county,
st.pk_id items_id, st.pk_id items_id,
st.pk_order, st.pk_order,
st.pk_product, st.pk_product,

7
bd-common/bd-common-security/src/main/java/com/hzs/common/security/utils/SecurityUtils.java
View File

@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.MagicNumberConstants;
import com.hzs.common.core.enums.ESystemType;
import com.hzs.common.core.exception.auth.NotPermissionException; import com.hzs.common.core.exception.auth.NotPermissionException;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import com.hzs.common.core.constant.SecurityConstants; import com.hzs.common.core.constant.SecurityConstants;
@ -14,8 +15,6 @@ import com.hzs.common.core.utils.StringUtils;
/** /**
* 权限获取工具类 * 权限获取工具类
*
* @author hzs
*/ */
public class SecurityUtils { public class SecurityUtils {
@ -137,8 +136,8 @@ public class SecurityUtils {
* @return * @return
*/ */
public static Integer getSystemType() { public static Integer getSystemType() {
if(ObjectUtil.isEmpty(SecurityContextHolder.getSystemType())){ if (ObjectUtil.isEmpty(SecurityContextHolder.getSystemType())) {
return 1; return ESystemType.DEFAULT.getValue();
} }
return SecurityContextHolder.getSystemType(); return SecurityContextHolder.getSystemType();
} }