Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-21 b4c77c0839258280044cf65a15471fa3c20d465f

 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);

                        }