玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
44323
2023-09-16 a99684a9a4ecbdd71d1c93ef824f7741ff52c5d9 
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java


@@ -142,6 +142,7 @@


        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");


        ProductDetailsVo detailsVo = new ProductDetailsVo();


        PointsMerchandise merchandise = pmdsService.getById(detailRequest.getGoodId());


        detailsVo.setCardType(merchandise.getCardTye());


        switch (detailRequest.getGoodsType()){


            case 2:


//                课包


@@ -364,8 +365,11 @@


        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");


        PointDetailsVo detailsVo = new PointDetailsVo();


        UserPointsMerchandise byId = upmseService.getById(speMercharsId);




        if (ToolUtil.isNotEmpty(byId)){


            PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());


            // 2.0


            detailsVo.setCardType(pmdsServiceById.getCardTye());


            detailsVo.setExchangeType(pmdsServiceById.getRedemptionMethod());


            detailsVo.setGoodType(pmdsServiceById.getType());


            if (pmdsServiceById.getRedemptionMethod() == 1){


@@ -428,7 +432,8 @@


            }




            detailsVo.setGoodName(pmdsServiceById.getName());


            detailsVo.setStartTime(simpleDateFormat.format(pmdsServiceById.getStartTime()));


            // 2.0


            detailsVo.setStartTime(simpleDateFormat.format(byId.getInsertTime()));


            detailsVo.setEndTime(simpleDateFormat.format(pmdsServiceById.getEndTime()));


            detailsVo.setOrderTime(simpleDateFormat.format(byId.getInsertTime()));


            if (byId.getStatus() == 1){