update

liujie

2026-07-02 055bb95f76e7e15cb1cbd5f9b7fe79b41eb30e5e

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

@@ -284,8 +284,8 @@
     */
    @ResponseBody
    @RequestMapping("/base/pointMerchars/getAmount")
    public List<PointMerchandiseIncomeVo> getAmount() {
        return userPointsMerchandiseService.getAmount();
    public List<PointMerchandiseIncomeVo> getAmount(@RequestBody List<Integer> storeIds) {
        return userPointsMerchandiseService.getAmount(storeIds);
    }


@@ -912,7 +912,7 @@
                detailsResponse.setGoodType(merchandise.getType());
                if (merchandise.getType() == 3) {
                    detailsResponse.setCodeType(3);
                    detailsResponse.setDataId(pointsMerchandise.getPointsMerchandiseId());
                    detailsResponse.setDataId(pointsMerchandise.getId()+"");
                    detailsResponse.setCardType(merchandise.getCardType());
                    List<Integer> sids = new ArrayList<>();
                    detailsResponse.setUserId(appUserId);
@@ -1033,7 +1033,7 @@
                        String format = simpleDateFormat1.format(pointsMerchandise.getInsertTime());
                        detailsResponse.setStartTime(format + " " + startTime + ":00");
                        detailsResponse.setEndTime(format + " " + endTime + ":00");
                        if (simpleDateFormat.parse(format + " " + endTime + ":00").before(new Date())) {
                        if (simpleDateFormat.parse(format + " " + endTime + ":00").before(new Date()) &&detailsResponse.getUseStatus()==2) {
                            System.err.println("过期了，当前门店中最晚营业时间为" + format + " " + endTime + ":00");
                            detailsResponse.setUseStatus(3);
                        }
@@ -1049,15 +1049,22 @@
                        detailsResponse.setEndTime(endDate);

                        Date now = new Date();
                        if (now.after(end)) {
                        if (now.after(end)&&detailsResponse.getUseStatus()==2) {
                            detailsResponse.setUseStatus(3);
                        }
//                        if (detailsResponse.getUseStatus()!=3){
//                            if (detailsResponse.getUseStatus()==1 &&now.after(end)){
//                                detailsResponse.setUseStatus(2);
//                            }else{
//                                detailsResponse.setUseStatus(2);
//                            }
//                        }

                    } else if (merchandise.getCardType() == 3) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pointsMerchandise.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 93);
                        calendar.add(Calendar.DAY_OF_MONTH, 90);
                        Date end = calendar.getTime();
                        String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
                        String endDate = dateFormat.format(end);
@@ -1065,15 +1072,22 @@
                        detailsResponse.setEndTime(endDate);

                        Date now = new Date();
                        if (now.after(end)) {
                        if (now.after(end)&&detailsResponse.getUseStatus()==2) {
                            detailsResponse.setUseStatus(3);
                        }
//                        if (detailsResponse.getUseStatus()!=3){
//                            if (detailsResponse.getUseStatus()==1 &&now.after(end)){
//                                detailsResponse.setUseStatus(2);
//                            }else{
//                                detailsResponse.setUseStatus(2);
//                            }
//                        }

                    } else if (merchandise.getCardType() == 4) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(pointsMerchandise.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 372);
                        calendar.add(Calendar.DAY_OF_MONTH, 365);
                        Date end = calendar.getTime();
                        String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
                        String endDate = dateFormat.format(end);
@@ -1081,9 +1095,16 @@
                        detailsResponse.setEndTime(endDate);

                        Date now = new Date();
                        if (now.after(end)) {
                        if (now.after(end)&&detailsResponse.getUseStatus()==2) {
                            detailsResponse.setUseStatus(3);
                        }
//                        if (detailsResponse.getUseStatus()!=3){
//                            if (detailsResponse.getUseStatus()==1 &&now.after(end)){
//                                detailsResponse.setUseStatus(2);
//                            }else{
//                                detailsResponse.setUseStatus(2);
//                            }
//                        }

                    }

@@ -1107,12 +1128,16 @@
            detailsResponse.setUseStatus(vipDetail.getStatus() == 1 ? 2 : 1);
            detailsResponse.setGoodType(3);
            detailsResponse.setCardType(3);
            detailsResponse.setDataId(vipDetail.getId()+"");
            // 表明是会员赠送的门票
            detailsResponse.setExchangeType(4);
            // 全国通用
            detailsResponse.setRid(Collections.singletonList(0));
            detailsResponse.setSid(Collections.singletonList(0));

            Date now = new Date();
            if (now.after(vipDetail.getEndTime())&&detailsResponse.getUseStatus()==2) {
                detailsResponse.setUseStatus(3);
            }
            responses.add(detailsResponse);
        }
        if (userCoupons.size() > 0) {
@@ -1141,6 +1166,10 @@
                detailsResponse.setEndTime(simpleDateFormat.format(c.getEndTime()));
                detailsResponse.setUseStatus(userCoupon.getStatus() == 1 ? 2 : 1);
                detailsResponse.setGoodType(4);
                Date now = new Date();
                if (now.after(c.getEndTime())&&detailsResponse.getUseStatus()==2) {
                    detailsResponse.setUseStatus(3);
                }
                responses.add(detailsResponse);
            }
            Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();
@@ -1751,6 +1780,7 @@
                map.put("userId", pointsMerchandise.getUserId());
                map.put("status", pointsMerchandise.getStatus());
                map.put("payTime", sdf.format(pointsMerchandise.getPaymentTime()));
                map.put("orderNumber", pointsMerchandise.getOrderNumber());
                mapList.add(map);
            }
        }