11.11

liujie

2023-11-20 12e9e6b431d821ebeb91b4ddeaecfc5198deb523

11.11

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

@@ -108,6 +108,8 @@
    @ResponseBody
    @PostMapping("/coupon/queryCouponByUser/{userId}")
    public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){

        System.err.println("到达了赠送优惠价");
        List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2)
                .le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
                .eq("state", 1));

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

@@ -295,11 +295,11 @@
            cIds.add(pointsMerchandiseCity.getPointsMerchandiseId());
        }

        if (cIds.size()>0) {
//        if (cIds.size()>0) {

            List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
                    .eq("state", 1)
                    .eq("shelves", 1).in("id", cIds)
                    .eq("shelves", 1)
                    .gt("endTime", new Date()));
            if (merchandises.size() > 0){
                for (PointsMerchandise merchandise : merchandises) {
@@ -311,7 +311,7 @@
                    integralCommodity.setGoodsType(merchandise.getType());
                    commodity.add(integralCommodity);
                }
            }
//            }
        }

        System.out.println(commodity);
@@ -881,10 +881,10 @@

                        // Print the result
                        if (isSameDate) {

                        } else {
                            System.out.println("The two dates do not have the same date.");
                            detailsResponse.setUseStatus(3);

                        }



 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java

@@ -89,7 +89,7 @@


            LocalDateTime currentTime = LocalDateTime.now();
            LocalDateTime oneMinuteAgo = currentTime.minusSeconds(120);
            LocalDateTime oneMinuteAgo = currentTime.minusSeconds(6000);




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

@@ -198,17 +198,19 @@
            participant.add(participantVo);
        }


        for (Integer i : collect) {
            TStudent tStudent = studentClient.queryById(i);
            ParticipantVo participantVo = new ParticipantVo();
            participantVo.setId(tStudent.getId());
            participantVo.setName(tStudent.getName());
            participantVo.setIdcard(tStudent.getIdCard());
            Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
            participantVo.setAge(age);
            participantVo.setPhone(tStudent.getPhone());
            participant.add(participantVo);

            if (tStudent!=null) {
                ParticipantVo participantVo = new ParticipantVo();
                participantVo.setId(tStudent.getId());
                participantVo.setName(tStudent.getName());
                participantVo.setIdcard(tStudent.getIdCard());
                Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(tStudent.getBirthday()));
                participantVo.setAge(age);
                participantVo.setPhone(tStudent.getPhone());
                participant.add(participantVo);
            }

        }


 cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java

@@ -289,6 +289,7 @@
                    for (TCoursePackagePayment coursePackagePayment : list) {
                        coursePackagePayment.setPayStatus(2);
                        coursePackagePayment.setOrderNumber(trade_no);
                        coursePackagePayment.setAppUserId(null);
                    }
                    coursePackagePaymentService.updateBatchById(list);
                }

 cloud-server-course/src/main/java/com/dsh/course/entity/CourseCounsum.java

@@ -27,6 +27,4 @@
    @TableField("insertTime")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
    Date insertTime;
    @TableField("appUserId")
    Integer appUserId;
}