Merge remote-tracking branch 'origin/master'

nickchange

2023-10-18 062fb1ed6efcaac5d75bbe184524c4929dff7fcd

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -556,6 +556,9 @@
            return ResultUtil.error("验证码无效");
        }
        TAppUser tAppUser = this.baseMapper.selectOne(new QueryWrapper<TAppUser>().eq("phone", phone).ne("state", 3));
        if(tAppUser==null){
            return ResultUtil.error("该账号未注册", "");
        }
        if(tAppUser.getState() == 2){
            return ResultUtil.error("您的账号已被冻结", "");
        }
@@ -616,7 +619,7 @@
            for (Store store : stores) {
                Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());
                Double wgs84 = distance.get("WGS84");
                if(s == null || d.compareTo(wgs84) < 0){
                if(s == null || d>wgs84){
                    s = store;
                    d = wgs84;
                }
@@ -835,7 +838,7 @@
                        if (vicinityGood.getRedemptionMethod() == 1) {
                            commodity.setIntegral(vicinityGood.getIntegral().intValue());
                        } else {
                            commodity.setIntegral(vicinityGood.getIntegral().intValue());
                            commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
                            commodity.setAmount(vicinityGood.getCash());
                        }
                        commodity.setBelongsType(vicinityGood.getUserPopulation());
@@ -869,7 +872,7 @@
                        if (vicinityGood.getRedemptionMethod() == 1) {
                            commodity.setIntegral(vicinityGood.getIntegral().intValue());
                        } else {
                            commodity.setIntegral(vicinityGood.getIntegral().intValue());
                            commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());
                            commodity.setAmount(vicinityGood.getCash());
                        }
                        commodity.setBelongsType(vicinityGood.getUserPopulation());
@@ -1032,7 +1035,27 @@
        if (ToolUtil.isEmpty(merchandise)){
            return ResultUtil.error("商品不存在");
        }


        TAppUser tAppUser = this.baseMapper.selectById(userIdFormRedis);


        if(merchandise.getUserPopulation()==2){
            if(tAppUser.getIsVip()==0){
                return ResultUtil.error("该商品只能年度会员购买");
            }
        }



        if(merchandise.getUserPopulation()==3){
            List<TStudent> students = tsmapper.selectList(new LambdaQueryWrapper<TStudent>().eq(TStudent::getAppUserId, userIdFormRedis));
            if(students.size()==0){
                return ResultUtil.error("该商品只能已有学员用户购买");
            }
        }


        if (ToolUtil.isEmpty(tAppUser)){
            return ResultUtil.error("用户不存在");
        }