Merge branch 'feature/admin' into preview

feature/admin
Diyu0904 2025-04-26 17:48:36 +08:00
commit 87f259cd6f
1 changed files with 12 additions and 8 deletions

View File

@ -166,8 +166,10 @@ public class MallProductController extends BaseController {
R<ModelProduct> modelProductR = modelService.selectModelById(id);
ModelProduct data = modelProductR.getData();
if (Objects.nonNull(data)) {
Long userIdMax = SecurityUtils.getUserIdMax();
if (userIdMax != 0){
LambdaQueryWrapper<ModelPurchaseRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ModelPurchaseRecord::getUserId, SecurityUtils.getUserId())
wrapper.eq(ModelPurchaseRecord::getUserId, userIdMax)
.eq(ModelPurchaseRecord::getProductId, id)
.eq(ModelPurchaseRecord::getProductType, 0);
ModelPurchaseRecord modelPurchaseRecord = modelPurchaseRecordMapper.selectOne(wrapper);
@ -175,6 +177,8 @@ public class MallProductController extends BaseController {
if (Objects.isNull(modelPurchaseRecord)) {
data.setIsBuy(0);
}
}
data.setIsBuy(0);
modelProductR.setData(data);
}
return modelProductR;