Commit 290d1671a29460ccff015dda1a35b71f651b3bc9
1 parent
dffdd471
trade: 分销业务后台功能:推广订单列表
Showing
2 changed files
with
7 additions
and
0 deletions
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/service/serviceImpl.vm
| @@ -15,6 +15,9 @@ import ${basePackage}.module.${table.moduleName}.dal.mysql.${table.businessName} | @@ -15,6 +15,9 @@ import ${basePackage}.module.${table.moduleName}.dal.mysql.${table.businessName} | ||
| 15 | import static ${ServiceExceptionUtilClassName}.exception; | 15 | import static ${ServiceExceptionUtilClassName}.exception; |
| 16 | import static ${basePackage}.module.${table.moduleName}.enums.ErrorCodeConstants.*; | 16 | import static ${basePackage}.module.${table.moduleName}.enums.ErrorCodeConstants.*; |
| 17 | 17 | ||
| 18 | +import cn.hutool.core.collection.CollUtil; | ||
| 19 | +import cn.hutool.core.collection.ListUtil; | ||
| 20 | + | ||
| 18 | /** | 21 | /** |
| 19 | * ${table.classComment} Service 实现类 | 22 | * ${table.classComment} Service 实现类 |
| 20 | * | 23 | * |
| @@ -61,6 +64,9 @@ public class ${table.className}ServiceImpl implements ${table.className}Service | @@ -61,6 +64,9 @@ public class ${table.className}ServiceImpl implements ${table.className}Service | ||
| 61 | 64 | ||
| 62 | @Override | 65 | @Override |
| 63 | public ${table.className}DO get${simpleClassName}(${primaryColumn.javaType} id) { | 66 | public ${table.className}DO get${simpleClassName}(${primaryColumn.javaType} id) { |
| 67 | + if (CollUtil.isEmpty(ids)) { | ||
| 68 | + return ListUtil.empty(); | ||
| 69 | + } | ||
| 64 | return ${classNameVar}Mapper.selectById(id); | 70 | return ${classNameVar}Mapper.selectById(id); |
| 65 | } | 71 | } |
| 66 | 72 |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
| @@ -277,6 +277,7 @@ public interface TradeOrderConvert { | @@ -277,6 +277,7 @@ public interface TradeOrderConvert { | ||
| 277 | 277 | ||
| 278 | default BrokerageAddReqBO convert(TradeOrderItemDO item, ProductSkuRespDTO sku) { | 278 | default BrokerageAddReqBO convert(TradeOrderItemDO item, ProductSkuRespDTO sku) { |
| 279 | return new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())) | 279 | return new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())) |
| 280 | + .setSourceUserId(item.getUserId()) | ||
| 280 | .setBasePrice(item.getPayPrice() * item.getCount()) | 281 | .setBasePrice(item.getPayPrice() * item.getCount()) |
| 281 | .setFirstFixedPrice(sku.getSubCommissionFirstPrice()) | 282 | .setFirstFixedPrice(sku.getSubCommissionFirstPrice()) |
| 282 | .setSecondFixedPrice(sku.getSubCommissionSecondPrice()); | 283 | .setSecondFixedPrice(sku.getSubCommissionSecondPrice()); |