|
@@ -469,19 +469,26 @@ public class UserController {
|
|
|
.eq(UserPlatSkuDistributeRate::getDistributeId, userDistribute.getId())
|
|
.eq(UserPlatSkuDistributeRate::getDistributeId, userDistribute.getId())
|
|
|
.eq(UserPlatSkuDistributeRate::getGoodsId, e.getGoodsId())
|
|
.eq(UserPlatSkuDistributeRate::getGoodsId, e.getGoodsId())
|
|
|
.ne(UserPlatSkuDistributeRate::getRate, 0)
|
|
.ne(UserPlatSkuDistributeRate::getRate, 0)
|
|
|
|
|
+ //上架
|
|
|
|
|
+ .apply("exists (select 1 from goods_don_sku sku where sku.id = sku_id and sku.status is true limit 1)")
|
|
|
.orderByAsc(UserPlatSkuDistributeRate::getRate)
|
|
.orderByAsc(UserPlatSkuDistributeRate::getRate)
|
|
|
.last("limit 1"));
|
|
.last("limit 1"));
|
|
|
if (userPlatSkuDistributeRate != null) {
|
|
if (userPlatSkuDistributeRate != null) {
|
|
|
e.setRate(userPlatSkuDistributeRate.getRate());
|
|
e.setRate(userPlatSkuDistributeRate.getRate());
|
|
|
|
|
+ GoodsDonSku sku = skuMapper.selectById(userPlatSkuDistributeRate.getSkuId());
|
|
|
|
|
+ e.setPrice(sku.getPrice());
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
DistributeGeneralSkuRate distributeGeneralSkuRate = distributeGeneralSkuRateMapper.selectOne(Wrappers.lambdaQuery(DistributeGeneralSkuRate.class)
|
|
DistributeGeneralSkuRate distributeGeneralSkuRate = distributeGeneralSkuRateMapper.selectOne(Wrappers.lambdaQuery(DistributeGeneralSkuRate.class)
|
|
|
.eq(DistributeGeneralSkuRate::getGoodsId, e.getGoodsId())
|
|
.eq(DistributeGeneralSkuRate::getGoodsId, e.getGoodsId())
|
|
|
|
|
+ .apply("exists (select 1 from goods_don_sku sku where sku.id = sku_id and sku.status is true limit 1)")
|
|
|
.ne(DistributeGeneralSkuRate::getRate, 0)
|
|
.ne(DistributeGeneralSkuRate::getRate, 0)
|
|
|
.orderByAsc(DistributeGeneralSkuRate::getRate)
|
|
.orderByAsc(DistributeGeneralSkuRate::getRate)
|
|
|
.last("limit 1"));
|
|
.last("limit 1"));
|
|
|
if (distributeGeneralSkuRate != null) {
|
|
if (distributeGeneralSkuRate != null) {
|
|
|
e.setRate(distributeGeneralSkuRate.getRate());
|
|
e.setRate(distributeGeneralSkuRate.getRate());
|
|
|
|
|
+ GoodsDonSku sku = skuMapper.selectById(distributeGeneralSkuRate.getSkuId());
|
|
|
|
|
+ e.setPrice(sku.getPrice());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|