10.31.8

nickchange

2023-11-02 6af0c7434178ca41e727c700af8174201a865de9

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

@@ -44,6 +44,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

@@ -90,7 +91,42 @@
    @Autowired
    private AppUserClient appUserClient;

    /**
     * 查询注册赠送优惠券 判断当前优惠券限领数量
     */
    @ResponseBody
    @PostMapping("/coupon/queryCouponByUser/{userId}")
    public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
        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));

        for (Coupon coupon : list) {
            // 发放数量
            Integer quantityIssued = coupon.getQuantityIssued();
            // 限领数量
            Integer pickUpQuantity = coupon.getPickUpQuantity();
            // 优惠券已领取数量
            int couponId = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
            // 用户已领取该优惠券数量
            int count = ucService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()
            ).eq("userId", userId));
            if (couponId>=quantityIssued){
                continue;
            }
            if (count>=pickUpQuantity){
                continue;
            }
            // 条件满足 将优惠券送给用户
            UserCoupon userCoupon = new UserCoupon();
            userCoupon.setCouponId(coupon.getId());
            userCoupon.setUserId(userId);
            userCoupon.setStatus(1);
            userCoupon.setInsertTime(new Date());
            ucService.save(userCoupon);
        }
        return null;
    }

    @ResponseBody
    @PostMapping("/api/coupon/queryCouponList")
@@ -176,10 +212,14 @@
            e.printStackTrace();
        }
        try {
            LocalDateTime currentDate = LocalDateTime.now();

            couponList = couponService.list(new QueryWrapper<Coupon>()
                    .eq("auditStatus",2)
                    .eq("distributionMethod",1)
                    .eq("state",1)
                    .eq("status",2));
                    .eq("status",1)
                     .le("startTime", currentDate)
                    .ge("endTime", currentDate));
            if (couponList.size() > 0 ){
                Iterator<Coupon> iterator = couponList.iterator();
                while (iterator.hasNext()) {
@@ -223,7 +263,28 @@
    @ResponseBody
    @PostMapping("/base/coupon/queryCouponListSearch")
    public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
        List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch(ofSearch);
        List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);
        List<Map<String, Object>> mapList = new ArrayList<>();

        if(ofSearch.getStoreId()!=null){
            for (Map<String, Object> map : mapList1) {
                List<CouponStore> id = couStoreService.list(new LambdaQueryWrapper<CouponStore>().eq(CouponStore::getCouponId, map.get("id").toString()));
                List<Integer> collect = id.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
                if(collect.size()==0){
                    collect.add(-1);
                }
                if(collect.contains(ofSearch.getStoreId())){
                    if(collect.size()>1){
                        map.put("size",1);
                    }else {
                        map.put("size",0);
                    }
                    mapList.add(map);
                }
            }
        }else {
            mapList = mapList1;
        }
        if (mapList.size() > 0){
            for (Map<String, Object> stringObjectMap : mapList) {
                Integer o = (Integer) stringObjectMap.get("id");
@@ -238,6 +299,40 @@
        return mapList;
    }


    @ResponseBody
    @PostMapping("/base/coupon/queryCouponListSearch1")
    public List<Map<String,Object>> getCouponListOfSearch1(@RequestBody CouponListOfSearch ofSearch){
        List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch1(ofSearch);

        Date currentDate = new Date();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        String currentDateStr = sdf.format(currentDate);

        // Iterate over the mapList and remove entries where endTime is less than the current date
        Iterator<Map<String, Object>> iterator = mapList.iterator();
        while (iterator.hasNext()) {
            Map<String, Object> map = iterator.next();
            String endTime = (String) map.get("endTime");
            if (endTime.compareTo(currentDateStr) < 0) {
                iterator.remove();
            }
        }


        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){
@@ -248,11 +343,14 @@
                Object endTime = stringObjectMap.get("endTime");
                stringObjectMap.put("timeValue",startTime + "至"+endTime);
                Integer publisherType = (Integer) stringObjectMap.get("publisherType");
                if ( publisherType == 1) {
                    Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
                    TCityManager byId = citClient.getById(cityManagerId);
                    stringObjectMap.put("province", byId.getProvince());
                    stringObjectMap.put("city", byId.getCity());
                if (publisherType!=null) {
                    if (publisherType == 1) {
                        Integer cityManagerId = (Integer) stringObjectMap.get("cityManagerId");
                        TCityManager byId = citClient.getById(cityManagerId);
                        stringObjectMap.put("province", byId.getProvince());

                        stringObjectMap.put("city", byId.getCity());
                    }
                }
            }
        }
@@ -441,7 +539,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();
@@ -460,6 +558,18 @@
                coupon.setPublisherType(1);
                coupon.setCityManagerId(dataVo.getCityManagerId());
            }
            if(dataVo.getObjType()!=1){
                coupon.setAuditStatus(1);
            }
            if (dataVo.getUserType()==1){
                coupon.setAuditStatus(2);
            }else{
                coupon.setAuditStatus(1);
            }
            if(dataVo.getObjType()!=1){
                coupon.setAuditStatus(1);
            }

            boolean save = couponService.save(coupon);
            if (save){
                if (dataVo.getCompany() == 3){