BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 65205144269ef5310460e9dcb77b30e0547a7ceb

Authored by YunaiV
1 parent 5bb29a3f

fix：【system】增加 node 的 parentId 为空下的兼容性，对应 https://t.zsxq.com/ktTUO

Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @6520514
... ... @@ -265,8 +265,7 @@ public interface TradeOrderConvert {
265 265 ProductSpuRespDTO spu, ProductSkuRespDTO sku) {
266 266 BrokerageAddReqBO bo = new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())).setSourceUserId(item.getUserId())
267 267 .setBasePrice(item.getPayPrice())
268   - .setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName()))
269   - .setFirstFixedPrice(0).setSecondFixedPrice(0);
  268 + .setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName()));
270 269 if (BooleanUtil.isTrue(spu.getSubCommissionType())) {
271 270 // 特殊：单独设置的佣金需要乘以购买数量。关联 https://gitee.com/yudaocode/yudao-mall-uniapp/issues/ICY7SJ
272 271 bo.setFirstFixedPrice(sku.getFirstBrokeragePrice() * item.getCount())
... ...
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
  View file @6520514
... ... @@ -142,7 +142,7 @@ public class BrokerageRecordServiceImpl implements BrokerageRecordService {
142 142 */
143 143 int calculatePrice(Integer basePrice, Integer percent, Integer fixedPrice) {
144 144 // 1. 优先使用固定佣金
145   - if (fixedPrice != null && fixedPrice > 0) {
  145 + if (fixedPrice != null && fixedPrice >= 0) {
146 146 return ObjectUtil.defaultIfNull(fixedPrice, 0);
147 147 }
148 148 // 2. 根据比例计算佣金
... ...
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
  View file @6520514
1 1 package cn.iocoder.yudao.module.system.convert.auth;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.ObjUtil;
4 5 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
5 6 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
6 7 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
... ... @@ -61,7 +62,7 @@ public interface AuthConvert {
61 62 Map<Long, AuthPermissionInfoRespVO.MenuVO> treeNodeMap = new LinkedHashMap<>();
62 63 menuList.forEach(menu -> treeNodeMap.put(menu.getId(), AuthConvert.INSTANCE.convertTreeNode(menu)));
63 64 // 处理父子关系
64   - treeNodeMap.values().stream().filter(node -> !node.getParentId().equals(ID_ROOT)).forEach(childNode -> {
  65 + treeNodeMap.values().stream().filter(node -> ObjUtil.notEqual(node.getParentId(), ID_ROOT)).forEach(childNode -> {
65 66 // 获得父节点
66 67 AuthPermissionInfoRespVO.MenuVO parentNode = treeNodeMap.get(childNode.getParentId());
67 68 if (parentNode == null) {
... ...