11.21

nickchange

2023-11-21 41b60f3df5f3054aad44307c13a26b14f3b32ac0

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

                        }


@@ -1186,8 +1186,10 @@
            }else {
                detailsVo.setUseType(1);
                detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
                StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
                detailsVo.setWriteOffName(courseOfStore.getStoreName());
                if (byId.getStoreId()!=null) {
                    StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
                    detailsVo.setWriteOffName(courseOfStore.getStoreName());
                }
            }
            switch (pmdsServiceById.getUseScope()){
                case 1: