11.11

liujie

2023-11-20 12e9e6b431d821ebeb91b4ddeaecfc5198deb523

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

@@ -108,7 +108,9 @@
    @ResponseBody
    @PostMapping("/coupon/queryCouponByUser/{userId}")
    public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
        List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2).eq("userPopulation",2)

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

@@ -305,6 +307,7 @@
    @PostMapping("/base/coupon/queryCouponListSearch")
    public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
        List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);

        List<Map<String, Object>> mapList = new ArrayList<>();
        if (ofSearch.getStoreIds()==null){
            ArrayList<Integer> list = new ArrayList<>();
@@ -646,6 +649,7 @@
            if (dataVo.getUserType() == 2){
                coupon.setPublisherType(1);
                coupon.setAuditStatus(1);
                coupon.setCityManagerId(dataVo.getCityManagerId());
            }
            if (dataVo.getUserType() == 3){
                coupon.setPublisherType(3);