update

liujie

2023-10-17 083bed1be51dc21792a245b035b50dfef0a24db3

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -447,6 +447,16 @@
                detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime()));
                detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
                detailsResponse.setGoodType(merchandise.getType());
                if(merchandise.getType()==3){
                    detailsResponse.setUserId(appUserId);
                    if(merchandise.getUseScope()==1){
                        detailsResponse.setSid(0);
                    }else if(merchandise.getUseScope()==2){

                    }else if(merchandise.getUseScope()==3){

                    }
                }
                responses.add(detailsResponse);
            }
            detailsVo.setDetailsResponses(responses);
@@ -712,6 +722,8 @@
            vo.setSort(byId.getSort());
            vo.setContent(byId.getRedemptionInstructions());
        }
        int count = userPointsMerchandiseService.count(new LambdaQueryWrapper<UserPointsMerchandise>().eq(UserPointsMerchandise::getPointsMerchandiseId, pointMercharsId));
        vo.setNum(count);
        return vo;
    }