Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-04 624c9eec90d59297800f03276f8518daa1bd9f94

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

@@ -147,8 +147,12 @@

    @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");
@@ -157,10 +161,7 @@
            e.printStackTrace();
        }
        try {
            Integer userAppId = tokenUtil.getUserIdFormRedis();
            List<UserCoupon> list = ucService.list(new QueryWrapper<UserCoupon>()
                    .eq("userId",userAppId ));
            List<Coupon> couponList = couponService.list(new QueryWrapper<Coupon>()
            couponList = couponService.list(new QueryWrapper<Coupon>()
                    .eq("auditStatus",2)
                    .eq("state",1)
                    .eq("status",2));
@@ -243,6 +244,7 @@
    }


    @ResponseBody
    @PostMapping("/base/coupon/couponExamineDetail")
    Map<String, Object> queryCouponExamineDetail(@RequestBody Integer id){
        Map<String, Object> couponInfo = new HashMap<>();
@@ -352,4 +354,16 @@
        return couponInfo;
    }



    @ResponseBody
    @PostMapping("/base/coupon/updateCouponExamine")
    public boolean updateCouponData(@RequestBody Coupon coupon){
        try {
            return couponService.updateById(coupon);
        }catch (Exception e){
            return false;
        }
    }

}