Compare commits
No commits in common. "fd2d1d62ef14b14047257d370d16b03fb67e8750" and "c951baedd57de3c5878228eca0344b0d4114bca3" have entirely different histories.
fd2d1d62ef
...
c951baedd5
|
@ -166,19 +166,15 @@ public class MallProductController extends BaseController {
|
||||||
R<ModelProduct> modelProductR = modelService.selectModelById(id);
|
R<ModelProduct> modelProductR = modelService.selectModelById(id);
|
||||||
ModelProduct data = modelProductR.getData();
|
ModelProduct data = modelProductR.getData();
|
||||||
if (Objects.nonNull(data)) {
|
if (Objects.nonNull(data)) {
|
||||||
Long userIdMax = SecurityUtils.getUserIdMax();
|
LambdaQueryWrapper<ModelPurchaseRecord> wrapper = new LambdaQueryWrapper<>();
|
||||||
if (userIdMax != 0){
|
wrapper.eq(ModelPurchaseRecord::getUserId, SecurityUtils.getUserId())
|
||||||
LambdaQueryWrapper<ModelPurchaseRecord> wrapper = new LambdaQueryWrapper<>();
|
.eq(ModelPurchaseRecord::getProductId, id)
|
||||||
wrapper.eq(ModelPurchaseRecord::getUserId, userIdMax)
|
.eq(ModelPurchaseRecord::getProductType, 0);
|
||||||
.eq(ModelPurchaseRecord::getProductId, id)
|
ModelPurchaseRecord modelPurchaseRecord = modelPurchaseRecordMapper.selectOne(wrapper);
|
||||||
.eq(ModelPurchaseRecord::getProductType, 0);
|
data.setIsBuy(1);
|
||||||
ModelPurchaseRecord modelPurchaseRecord = modelPurchaseRecordMapper.selectOne(wrapper);
|
if (Objects.isNull(modelPurchaseRecord)) {
|
||||||
data.setIsBuy(1);
|
data.setIsBuy(0);
|
||||||
if (Objects.isNull(modelPurchaseRecord)) {
|
|
||||||
data.setIsBuy(0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
data.setIsBuy(0);
|
|
||||||
modelProductR.setData(data);
|
modelProductR.setData(data);
|
||||||
}
|
}
|
||||||
return modelProductR;
|
return modelProductR;
|
||||||
|
|
|
@ -124,11 +124,6 @@ public class PersonHomeVo {
|
||||||
@ApiModelProperty(value = "付费金额 当提问类型为付费时必填")
|
@ApiModelProperty(value = "付费金额 当提问类型为付费时必填")
|
||||||
private Double amount;
|
private Double amount;
|
||||||
|
|
||||||
/**
|
|
||||||
* 状态 0未解决 1已解决
|
|
||||||
*/
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建时间
|
* 创建时间
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -92,12 +92,6 @@ public class QuestionVo {
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
|
|
||||||
/**
|
|
||||||
* 状态 0未解决 1已解决
|
|
||||||
*/
|
|
||||||
@ApiModelProperty(value = "状态 0未解决 1已解决")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue