后台bug修改

44323

2023-11-07 082b7025e5654be2d38a7caccfe714937217410b

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

@@ -100,7 +100,7 @@
    @ResponseBody
    @PostMapping("/coupon/queryCouponByUser/{userId}")
    public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId){
        List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2)
        List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().eq("distributionMethod", 2).eq("userPopulation",2)
                .le("startTime", new Date()).ge("endTime", new Date()).eq("auditStatus", 2)
                .eq("state", 1));

@@ -202,18 +202,18 @@
    @PostMapping("/base/coupon/getAllCoupons")
    public List<Coupon> getAllCoupons(@RequestBody CommodityRequest request){
        List<Coupon> couponList = new ArrayList<>();
//        String provinceCode = "";
//        String cityCode = "";
//        if (ToolUtil.isEmpty(request.getLat()) && ToolUtil.isEmpty(request.getLon())){
//            return couponList;
//        }
//        try {
//            Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
//            provinceCode = geocode.get("provinceCode");
//            cityCode = geocode.get("cityCode");
//        }catch (Exception e){
//            e.printStackTrace();
//        }
        String provinceCode = "";
        String cityCode = "";
        if (ToolUtil.isEmpty(request.getLat()) && ToolUtil.isEmpty(request.getLon())){
            return couponList;
        }
        try {
            Map<String, String> geocode = gdMapGeocodingUtil.geocode(request.getLon(), request.getLat());
            provinceCode = geocode.get("provinceCode");
            cityCode = geocode.get("cityCode");
        }catch (Exception e){
            e.printStackTrace();
        }
        try {
            LocalDateTime currentDate = LocalDateTime.now();

@@ -223,24 +223,24 @@
                    .eq("status",1)
                     .le("startTime", currentDate)
                    .ge("endTime", currentDate));
//            if (couponList.size() > 0 ){
//                Iterator<Coupon> iterator = couponList.iterator();
//                while (iterator.hasNext()) {
//                    Coupon merchandise = iterator.next();
//                    if (merchandise.getUseScope() == 2){
//                        List<CouponCity> couponCities = cityService.list(new LambdaQueryWrapper<CouponCity>()
//                                .eq(CouponCity::getCouponId,merchandise.getId()));
//                        if (couponCities.size() > 0){
//                            for (CouponCity couponCity : couponCities) {
//                                if (!Objects.equals(couponCity.getCityCode(), cityCode) && !Objects.equals(couponCity.getProvinceCode(), provinceCode)){
//                                    iterator.remove(); // 移除符合条件的商品
//                                    break;
//                                }
//                            }
//                        }
//                    }
//                }
//            }
            if (couponList.size() > 0 ){
                Iterator<Coupon> iterator = couponList.iterator();
                while (iterator.hasNext()) {
                    Coupon merchandise = iterator.next();
                    if (merchandise.getUseScope() == 2){
                        List<CouponCity> couponCities = cityService.list(new LambdaQueryWrapper<CouponCity>()
                                .eq(CouponCity::getCouponId,merchandise.getId()));
                        if (couponCities.size() > 0){
                            for (CouponCity couponCity : couponCities) {
                                if (!Objects.equals(couponCity.getCityCode(), cityCode) && !Objects.equals(couponCity.getProvinceCode(), provinceCode)){
                                    iterator.remove(); // 移除符合条件的商品
                                    break;
                                }
                            }
                        }
                    }
                }
            }
            return couponList;
        } catch (Exception e) {
            throw new RuntimeException(e);
@@ -569,20 +569,23 @@
            coupon.setIllustrate(dataVo.getIllustrate());
            coupon.setDistributionMethod(dataVo.getDistributionMethod());
            coupon.setRedemptionMethod(dataVo.getExchangeMethod());
            switch (dataVo.getExchangeMethod()){
                case 1:
                    coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                    break;
                case 2:
                    coupon.setCash(dataVo.getRequiredCash());
                    coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                    break;
                case 3:
                    coupon.setCash(dataVo.getRequiredCash());
                    break;
                default:
                    break;
            if (dataVo.getExchangeMethod()!=null){
                switch (dataVo.getExchangeMethod()){
                    case 1:
                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                        break;
                    case 2:
                        coupon.setCash(dataVo.getRequiredCash());
                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                        break;
                    case 3:
                        coupon.setCash(dataVo.getRequiredCash());
                        break;
                    default:
                        break;
                }
            }

            coupon.setQuantityIssued(dataVo.getQuantityIssued());
            coupon.setPickUpQuantity(dataVo.getPickUpQuantity());
            coupon.setUseScope(dataVo.getCompany());
@@ -627,6 +630,21 @@
            }

            boolean save = couponService.save(coupon);
            // 自动发券
            if (dataVo.getDistributionMethod() == 3){
                // 判断用户人群 再判断限领数量
                switch (dataVo.getUserGroup()){
                    case 1:

                        break;
                    case 2:

                        break;
                    case 3:

                        break;
                }
            }
            if (save){
                if (dataVo.getCompany() == 3){
                    String[] split = dataVo.getStoreIds().split(",");