重写课包支付和排课逻辑

puzhibing

2023-11-25 53e7558400dcacecdce70e39ebfe1727740f9296

 cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java

@@ -55,23 +55,23 @@
    @ApiOperation(value = "福利主页", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "lat",value = "经度",dataType = "string"),
            @ApiImplicitParam(name = "lon",value = "纬度",dataType = "string")
            @ApiImplicitParam(name = "lat", value = "经度", dataType = "string"),
            @ApiImplicitParam(name = "lon", value = "纬度", dataType = "string")
    })
    public ResultUtil<IndexOfUserBenefirVo> queryAppUserUser(String lon,String lat){
    public ResultUtil<IndexOfUserBenefirVo> queryAppUserUser(String lon, String lat) {
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
            IndexOfUserBenefirVo indexOfUserBenefirVo = tauService.queryBenefitDetails(appUserId,lon,lat);
            IndexOfUserBenefirVo indexOfUserBenefirVo = tauService.queryBenefitDetails(appUserId, lon, lat);
            List<IntegralCommodity> commodities = indexOfUserBenefirVo.getCommodities();
            if (commodities.size() > 5) {
                commodities = commodities.subList(0, 5);
            }
            indexOfUserBenefirVo.setCommodities(commodities);
            return ResultUtil.success(indexOfUserBenefirVo);
        }catch (Exception e){
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
@@ -83,52 +83,53 @@
    @ApiOperation(value = "用户个人信息", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "lat",value = "经度",dataType = "string"),
            @ApiImplicitParam(name = "lon",value = "纬度",dataType = "string")
            @ApiImplicitParam(name = "lat", value = "经度", dataType = "string"),
            @ApiImplicitParam(name = "lon", value = "纬度", dataType = "string")

    })
    public ResultUtil<AppUserDetailsVo> queryAppUserDetails(){
    public ResultUtil<AppUserDetailsVo> queryAppUserDetails() {
        try {
            AppUserDetailsVo detailsVo = new AppUserDetailsVo();
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
            TAppUser tAppUser = tauService.getBaseMapper().selectById(appUserId);
            if (tAppUser.getCode()==null){
            if (tAppUser.getCode() == null) {
                detailsVo.setNeedChange(1);
            }else {
            } else {
                detailsVo.setNeedChange(0);
            }


            if (null != tAppUser){
            if (null != tAppUser) {
                detailsVo.setUserId(appUserId);
                if (tAppUser.getHeadImg()!=null){
                detailsVo.setUserImage(tAppUser.getHeadImg());}
                else {
                    detailsVo.setUserImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/630864764d3c4e98822ff976a2389559.jpg");}
                if (tAppUser.getHeadImg() != null) {
                    detailsVo.setUserImage(tAppUser.getHeadImg());
                } else {
                    detailsVo.setUserImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/630864764d3c4e98822ff976a2389559.jpg");
                }


                detailsVo.setUserName(tAppUser.getName());
                detailsVo.setUserPhone(tAppUser.getPhone());
                detailsVo.setIsVip(tAppUser.getIsVip());
                if(tAppUser.getGender()!=null){
                if (tAppUser.getGender() != null) {
                    detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
                }
                System.out.println("============="+tAppUser);
                System.out.println("=============" + tAppUser);

                if (tAppUser.getBirthday()!=null){
                detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));
                if (tAppUser.getBirthday() != null) {
                    detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));
                }
                detailsVo.setAddress(tAppUser.getProvince()+tAppUser.getCity());
                if(tAppUser.getVipEndTime()!=null){
                detailsVo.setAddress(tAppUser.getProvince() + tAppUser.getCity());
                if (tAppUser.getVipEndTime() != null) {

                    detailsVo.setMemberLifespan(format1.format(tAppUser.getVipEndTime()));
                }
            }
            return ResultUtil.success(detailsVo);
        }catch (Exception e){
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }
@@ -139,27 +140,26 @@
    @ApiOperation(value = "上传用户头像", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "userImage",value = "用户头像连接",dataType = "string")
            @ApiImplicitParam(name = "userImage", value = "用户头像连接", dataType = "string")
    })
    public ResultUtil uploadAppUserProfile(String userImage){
    public ResultUtil uploadAppUserProfile(String userImage) {
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
            TAppUser byId = tauService.getById(appUserId);
            if (ToolUtil.isNotEmpty(userImage)){
            if (ToolUtil.isNotEmpty(userImage)) {
                byId.setHeadImg(userImage);
                tauService.updateById(byId);
            }else {
            } else {
                ResultUtil.error("头像不能为空！");
            }
            return ResultUtil.success();
        }catch (Exception e){
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
@@ -168,10 +168,10 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public ResultUtil cancellationAccount(){
    public ResultUtil cancellationAccount() {
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
//            变更账号的状态为删除
@@ -181,11 +181,10 @@
//            删除redis中用户key
            tokenUtil.logout();
            return ResultUtil.success();
        }catch (Exception e){
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
@@ -194,10 +193,10 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public ResultUtil logOutAccount(){
    public ResultUtil logOutAccount() {
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
            //            增加一条退出账号的日志
@@ -205,11 +204,10 @@
            //            删除redis中用户key
            tokenUtil.logout();
            return ResultUtil.success();
        }catch (Exception e){
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
@@ -220,14 +218,14 @@
            @ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
            @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"),
    })
    public ResultUtil<List<ConsumeDetail>> getUserBillingDetails(String yearMonth,Integer recordId){
    public ResultUtil<List<ConsumeDetail>> getUserBillingDetails(String yearMonth, Integer recordId) {
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(tauService.queryUserBillingDetails(yearMonth,recordId,appUserId));
        }catch (Exception e){
            return ResultUtil.success(tauService.queryUserBillingDetails(yearMonth, recordId, appUserId));
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }
@@ -243,14 +241,14 @@
            @ApiImplicitParam(value = "每页数量", name = "pageSize", required = true, dataType = "int"),
            @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"),
    })
    public ResultUtil<List<RechargesDetail>> wpGoldRechargeRecord(String yearMonth, Integer recordId,Integer pageNum,Integer pageSize){
    public ResultUtil<List<RechargesDetail>> wpGoldRechargeRecord(String yearMonth, Integer recordId, Integer pageNum, Integer pageSize) {
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId,pageNum,pageSize));
        }catch (Exception e){
            return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth, recordId, appUserId, pageNum, pageSize));
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
@@ -263,14 +261,14 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public ResultUtil<List<RechargeCentVo>> rechargeCenterConfig(){
    public ResultUtil<List<RechargeCentVo>> rechargeCenterConfig() {
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(tauService.getSysRechargeConfig(appUserId));
        }catch (Exception e){
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }
@@ -284,14 +282,14 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public ResultUtil rechargeCenPayment(RechargePayRequest request){
    public ResultUtil rechargeCenPayment(RechargePayRequest request) {
        try {
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if(null == userIdFormRedis){
            if (null == userIdFormRedis) {
                return ResultUtil.tokenErr();
            }
            return rechargeRService.rechargeCenPayment(userIdFormRedis,request);
        }catch (Exception e){
            return rechargeRService.rechargeCenPayment(userIdFormRedis, request);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
@@ -308,10 +306,10 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public ResultUtil<List<Goods>> pointsMallList(MallRequest request){
    public ResultUtil<List<Goods>> pointsMallList(MallRequest request) {
//        try {
        System.out.println("======request========"+request);
            return ResultUtil.success(tauService.queryAppUserIntegral(request));
        System.out.println("======request========" + request);
        return ResultUtil.success(tauService.queryAppUserIntegral(request));
//        }catch (Exception e){
//            return ResultUtil.runErr();
//        }
@@ -329,14 +327,13 @@
            @ApiImplicitParam(value = "商品id", name = "goodId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodsType", required = true, dataType = "int"),
    })
    public ResultUtil<ProductDetailsVo> productDetails(Integer goodId, Integer goodsType){
    public ResultUtil<ProductDetailsVo> productDetails(Integer goodId, Integer goodsType) {
        try {
            return ResultUtil.success(tauService.productDetails(goodId,goodsType));
        }catch (Exception e){
            return ResultUtil.success(tauService.productDetails(goodId, goodsType));
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }



    @ResponseBody
@@ -346,14 +343,13 @@
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(value = "商品id", name = "goodId", required = true, dataType = "int"),
    })
    public ResultUtil<ProductDetailsVo> goodsDetailsOne(Integer goodId){
    public ResultUtil<ProductDetailsVo> goodsDetailsOne(Integer goodId) {
        try {
            return ResultUtil.success(tauService.goodsDetailsOne(goodId));
        }catch (Exception e){
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }



    /**
@@ -369,14 +365,14 @@
            @ApiImplicitParam(value = "是否为课包商品（1=是 2=否）", name = "isCourse", required = true, dataType = "int"),
            @ApiImplicitParam(value = "商品id", name = "pointsMerId", required = true, dataType = "int"),
    })
    public ResultUtil<StuAndStoreResponse> goodsOfCourseStore(String lat, String lon,Integer isCourse,Integer pointsMerId){
    public ResultUtil<StuAndStoreResponse> goodsOfCourseStore(String lat, String lon, Integer isCourse, Integer pointsMerId) {
        try {
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if(null == userIdFormRedis){
            if (null == userIdFormRedis) {
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(tauService.queryAppUserDefaultStuAndStore(userIdFormRedis,pointsMerId,lat,lon,isCourse));
        }catch (Exception e){
            return ResultUtil.success(tauService.queryAppUserDefaultStuAndStore(userIdFormRedis, pointsMerId, lat, lon, isCourse));
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }
@@ -393,14 +389,13 @@
            @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodsType", required = true, dataType = "String"),
            @ApiImplicitParam(value = "商品id", name = "pointsMerId", required = true, dataType = "int"),
    })
    public ResultUtil<List<StoreResponse>> getExchangeStoreIds( Integer goodsType,Integer pointsMerId){
    public ResultUtil<List<StoreResponse>> getExchangeStoreIds(Integer goodsType, Integer pointsMerId) {
        try {
            return ResultUtil.success(tauService.queryStoresOfExchange(goodsType,pointsMerId));
        }catch (Exception e){
            return ResultUtil.success(tauService.queryStoresOfExchange(goodsType, pointsMerId));
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }



    /**
@@ -412,14 +407,14 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public synchronized ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType){
    public synchronized ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType) {
        try {
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if(null == userIdFormRedis){
            if (null == userIdFormRedis) {
                return ResultUtil.tokenErr();
            }
            return tauService.productRedemptionOperation(userIdFormRedis,exchangeType);
        }catch (Exception e){
            return tauService.productRedemptionOperation(userIdFormRedis, exchangeType);
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }
@@ -436,14 +431,14 @@
            @ApiImplicitParam(value = "年月", name = "yearMonth", required = false, dataType = "string"),
            @ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = false, dataType = "int"),
    })
    public ResultUtil<List<IntegralsData>> pointDetails(String yearMonth, Integer recordId){
    public ResultUtil<List<IntegralsData>> pointDetails(String yearMonth, Integer recordId) {
        try {
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if(null == userIdFormRedis){
            if (null == userIdFormRedis) {
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(uicService.queryUserPointsDetails(yearMonth,recordId,userIdFormRedis));
        }catch (Exception e){
            return ResultUtil.success(uicService.queryUserPointsDetails(yearMonth, recordId, userIdFormRedis));
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }
@@ -462,18 +457,18 @@
            @ApiImplicitParam(value = "page", name = "页数", required = true, dataType = "int"),
            @ApiImplicitParam(value = "size", name = "size", required = true, dataType = "int"),
    })
    public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType,Integer page,Integer size){
    public ResultUtil<List<ExchangeDetailsResponse>> exchangeRecordsDetails(Integer useType, Integer goodType, Integer page, Integer size) {
        try {
            if(page==null || size==null){
                page=1;
                size=10;
            if (page == null || size == null) {
                page = 1;
                size = 10;
            }
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if(null == userIdFormRedis){
            if (null == userIdFormRedis) {
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(uicService.queryExchangeGoodsdetails1(userIdFormRedis,useType,goodType,page,size));
        }catch (Exception e){
            return ResultUtil.success(uicService.queryExchangeGoodsdetails1(userIdFormRedis, useType, goodType, page, size));
        } catch (Exception e) {
            return ResultUtil.runErr();
        }
    }
@@ -489,16 +484,15 @@
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(value = "记录id", name = "detailsId", required = true, dataType = "string"),
    })
    public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId){
    public ResultUtil<PointDetailsVo> redemptionDetails(Long detailsId) {
//        try {
            PointDetailsVo pointDetailsVo = uicService.queryRedemptionDetails(detailsId);
            pointDetailsVo.getPics().remove(0);
            return ResultUtil.success(pointDetailsVo);
        PointDetailsVo pointDetailsVo = uicService.queryRedemptionDetails(detailsId);
        pointDetailsVo.getPics().remove(0);
        return ResultUtil.success(pointDetailsVo);
//        }catch (Exception e){
//            return ResultUtil.runErr();
//        }
    }



}