10.13bug2

nickchange

2023-10-13 edf83149d0f26fb99eb6548d9e68bcc81a8cc893

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

@@ -238,6 +238,24 @@
        return mapList;
    }


    @ResponseBody
    @PostMapping("/base/coupon/queryCouponListSearch1")
    public List<Map<String,Object>> getCouponListOfSearch1(@RequestBody CouponListOfSearch ofSearch){
        List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch1(ofSearch);
        if (mapList.size() > 0){
            for (Map<String, Object> stringObjectMap : mapList) {
                Integer o = (Integer) stringObjectMap.get("id");
                Object startTime = stringObjectMap.get("startTime");
                Object endTime = stringObjectMap.get("endTime");
                stringObjectMap.put("timeValue",startTime + "至"+endTime);
                int count = ucService.count(new LambdaQueryWrapper<UserCoupon>()
                        .eq(UserCoupon::getCouponId, o));
                stringObjectMap.put("hasPickQty",count);
            }
        }
        return mapList;
    }
    @ResponseBody
    @PostMapping("/base/coupon/couponExamineListSearch")
    public List<Map<String,Object>> getCouponExamineListOfSearch(@RequestBody CouponExamineListSearch ofSearch){
@@ -441,7 +459,7 @@
            }
            coupon.setAuditStatus(1);
            coupon.setStatus(1);
            coupon.setState(2);
            coupon.setState(1);
            coupon.setInsertTime(new Date());
            coupon.setCover(dataVo.getGoodImg());
            String goodImgs = dataVo.getGoodImgs();