11.5

nickchange

2023-11-05 be8a63ba1e3f2e26f5cdefe519c37ad4cfd90435

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

@@ -719,9 +719,12 @@
                if (merchandise.getRedemptionMethod() == 1){
                    detailsResponse.setExchangeType(1);
                    detailsResponse.setIntegral(merchandise.getIntegral());
                }else {
                }else if (merchandise.getRedemptionMethod() == 2){
                    detailsResponse.setExchangeType(2);
                    detailsResponse.setIntegral(merchandise.getIntegral());
                    detailsResponse.setCash(merchandise.getCash());
                }else if (merchandise.getRedemptionMethod() == 3){
                    detailsResponse.setExchangeType(3);
                    detailsResponse.setCash(merchandise.getCash());
                }
                detailsResponse.setStartTime(simpleDateFormat.format(merchandise.getStartTime()));
@@ -861,6 +864,7 @@
                if (c==null){
                    continue;
                }

                ExchangeDetailsResponse detailsResponse = new ExchangeDetailsResponse();
                detailsResponse.setDetailsId(Long.valueOf(c.getId()));
                detailsResponse.setGoodName(c.getName());
@@ -1234,6 +1238,15 @@

    }

    //拿到积分商品现金的消费记录
    @ResponseBody
    @PostMapping("/base/pointMerchars/getConsumeDetails")
    public List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo){
       return   upmseService.getConsumeDetails(requestVo);



    }


    public int dealTimeStatus(String startTime, String endTime){