会员支付相关

无关风月

昨天 4c07eb5512914ebd38e1c1e4455094577864c9f0

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

@@ -1038,7 +1038,6 @@


                }
                detailsResponse.setIsVipCode(0);
                responses.add(detailsResponse);
            }
            detailsVo.setDetailsResponses(responses);
@@ -1054,11 +1053,10 @@
                detailsResponse.setGoodName(vipDetail.getTicketName());
                detailsResponse.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));
                detailsResponse.setIsVipCode(1);
                detailsResponse.setUseStatus(vipDetail.getStatus());
                detailsResponse.setGoodType(3);
                // 表明是会员赠送的门票
                detailsResponse.setExchangeType(3);
                detailsResponse.setExchangeType(4);
                // 全国通用
            detailsResponse.setRid(Collections.singletonList(0));
            detailsResponse.setSid(Collections.singletonList(0));
@@ -1085,13 +1083,12 @@
                    detailsResponse.setCash(c.getCash());
                }
                if (userCoupon.getIsVipGrant()!=null && userCoupon.getIsVipGrant()==1){
                    detailsResponse.setExchangeType(3);
                    detailsResponse.setExchangeType(4);
                }
                detailsResponse.setStartTime(simpleDateFormat.format(c.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(c.getEndTime()));
                detailsResponse.setUseStatus(userCoupon.getStatus() == 1 ? 2 : 1);
                detailsResponse.setGoodType(4);
                detailsResponse.setIsVipCode(0);
                responses.add(detailsResponse);
            }
            Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();