11.12

liujie

2023-11-02 5a4122bb91377a8015d4286a33bb3758b8089deb

11.12

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

@@ -891,13 +891,13 @@
                    if (pmdsServiceById.getCardType()==1){
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pmdsServiceById.getInsertTime());
                        calendar.setTime(byId.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 1);
                        Date end = calendar.getTime();
                        String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
                        String startDate = dateFormat.format(byId.getInsertTime());
                        String endDate = dateFormat.format(end);
                        pmdsServiceById.setStartTime(pmdsServiceById.getInsertTime());
                        pmdsServiceById.setEndTime(pmdsServiceById.getInsertTime());
                        detailsVo.setStartTime(startDate);
                        detailsVo.setEndTime(startDate);

                        Date now = new Date();
                        Calendar cal1 = Calendar.getInstance();
@@ -913,19 +913,19 @@

                        // Print the result
                        if (isSameDate) {
                            detailsVo.setUseType(3);
                        } else {
                            System.out.println("The two dates do not have the same date.");
                            detailsVo.setUseType(3);
                        }


                    } else if (pmdsServiceById.getCardType()==2) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pmdsServiceById.getInsertTime());
                        calendar.setTime(byId.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 31);
                        Date end = calendar.getTime();
                        String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
                        String startDate = dateFormat.format(byId.getInsertTime());
                        String endDate = dateFormat.format(end);
                        detailsVo.setStartTime(startDate);
                        detailsVo.setEndTime(endDate);
@@ -938,10 +938,10 @@
                    } else if (pmdsServiceById.getCardType()==3) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pmdsServiceById.getInsertTime());
                        calendar.setTime(byId.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 93);
                        Date end = calendar.getTime();
                        String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
                        String startDate = dateFormat.format(byId.getInsertTime());
                        String endDate = dateFormat.format(end);
                        detailsVo.setStartTime(startDate);
                        detailsVo.setEndTime(endDate);
@@ -954,10 +954,10 @@
                    } else if (pmdsServiceById.getCardType()==4) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pmdsServiceById.getInsertTime());
                        calendar.setTime(byId.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 372);
                        Date end = calendar.getTime();
                        String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
                        String startDate = dateFormat.format(byId.getInsertTime());
                        String endDate = dateFormat.format(end);
                        detailsVo.setStartTime(startDate);
                        detailsVo.setEndTime(endDate);
@@ -1014,9 +1014,12 @@

            detailsVo.setGoodName(pmdsServiceById.getName());
            // 2.0
            detailsVo.setStartTime(simpleDateFormat.format(byId.getInsertTime()));
            detailsVo.setEndTime(simpleDateFormat.format(pmdsServiceById.getEndTime()));
            detailsVo.setOrderTime(simpleDateFormat.format(byId.getInsertTime()));
            if (detailsVo.getStartTime()==null) {
                detailsVo.setStartTime(simpleDateFormat.format(byId.getInsertTime()));
                detailsVo.setEndTime(simpleDateFormat.format(pmdsServiceById.getEndTime()));
                detailsVo.setOrderTime(simpleDateFormat.format(byId.getInsertTime()));

            }
            if (byId.getStatus() == 1){
                detailsVo.setUseType(2);
            }else {

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java

@@ -161,8 +161,8 @@
        competitionInfo.setStartTime(sdf.format(competition.getStartTime()));
        competitionInfo.setEndTime(sdf.format(competition.getEndTime()));
        competitionInfo.setAge(competition.getStartAge() + "-" + competition.getEndAge());
        competitionInfo.setProvince(competition.getEntryProvince());
        competitionInfo.setCity(competition.getEntryCity());
        competitionInfo.setProvince(competition.getProvince());
        competitionInfo.setCity(competition.getCity());
        String str = competition.getAddress();
        str = str.substring(str.indexOf("省") + 1);