puzhibing
2023-07-26 709a4a10be56952ead6340e4822fce41a66e47cd
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java
@@ -185,12 +185,14 @@
            // 已发放优惠券
            tBranchOfficeResp.setTotalCount(totalCount);
            BigDecimal orderPriceCount = new BigDecimal("0");
            BigDecimal orderPriceCount = BigDecimal.ZERO;
            // 累计优惠券金额
            for (TUserToCoupon tUserToCoupon : tUserToCoupons) {
                TCoupon tCoupon = tCouponMapper.selectById(tUserToCoupon.getCouponId());
                BigDecimal price = tCoupon.getCouponPreferentialAmount().multiply(new BigDecimal(tUserToCoupon.getCouponTotal()));
                orderPriceCount = orderPriceCount.add(price);
                if(Objects.nonNull(tCoupon)){
                    BigDecimal price = tCoupon.getCouponPreferentialAmount().multiply(new BigDecimal(tUserToCoupon.getCouponTotal()));
                    orderPriceCount = orderPriceCount.add(price);
                }
            }
            tBranchOfficeResp.setOrderPriceCount(orderPriceCount);
@@ -226,10 +228,11 @@
            }
            tBranchOffice.setDistrictName(area.getName());
            tBranchOffice.setDistrictCode(area.getCode());
        }else {
        }
        /*else {
            tBranchOffice.setDistrictName(city.getName());
            tBranchOffice.setDistrictCode(city.getCode());
        }
        }*/
        // 通过省市查询代理商
        List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())