diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index c42691c3..5189d9d7 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -860,7 +860,8 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { Map memberRegionMap) { List cuMemberBonusRangeList = new ArrayList<>(); - if (purchaseOrderList.size() > 0) { + if (purchaseOrderList.size() > 0 && memberRegionMap.size() > 0) { + // 有订单数据 并且 有选择的区域,处理区域收益 // 获取区域会员数据 Set memberIdSet = new HashSet<>(memberRegionMap.values()); memberIdSet.addAll(purchaseOrderList.stream().map(SaOrderExt::getPkMember).collect(Collectors.toSet())); @@ -870,7 +871,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { Map regionAreaConfigMap = bonusConfigDTO.getRegionAreaConfigMap(); 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; } @@ -958,7 +959,7 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cmMemberAreaBonusRange, saOrderExt.getOrderAmount(), saOrderExt.getInExchangeRate(), true); 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); } cuMemberBonusRangeList.add(cmMemberAreaBonusRange); diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml index 4b058ede..cf7cc247 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml @@ -112,6 +112,9 @@ so.pk_creator, so.consume_amount, so.box_num, + so.rec_province, + so.rec_city, + so.rec_county, st.pk_id items_id, st.pk_order, st.pk_product, diff --git a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/utils/SecurityUtils.java b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/utils/SecurityUtils.java index 9ce136f1..9daeae78 100644 --- a/bd-common/bd-common-security/src/main/java/com/hzs/common/security/utils/SecurityUtils.java +++ b/bd-common/bd-common-security/src/main/java/com/hzs/common/security/utils/SecurityUtils.java @@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest; import cn.hutool.core.util.ObjectUtil; import com.hzs.common.core.constant.MagicNumberConstants; +import com.hzs.common.core.enums.ESystemType; import com.hzs.common.core.exception.auth.NotPermissionException; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import com.hzs.common.core.constant.SecurityConstants; @@ -14,8 +15,6 @@ import com.hzs.common.core.utils.StringUtils; /** * 权限获取工具类 - * - * @author hzs */ public class SecurityUtils { @@ -137,8 +136,8 @@ public class SecurityUtils { * @return */ public static Integer getSystemType() { - if(ObjectUtil.isEmpty(SecurityContextHolder.getSystemType())){ - return 1; + if (ObjectUtil.isEmpty(SecurityContextHolder.getSystemType())) { + return ESystemType.DEFAULT.getValue(); } return SecurityContextHolder.getSystemType(); }