活动积分

renren-admin/src/main/java/io/renren/modules/listener/ActivityIssuePointsListener.java

@@ -1,163 +0,0 @@
-package io.renren.modules.listener;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import io.renren.modules.qmgj.dao.ActivityStuPayinfoDao;
-import io.renren.modules.qmgj.entity.ActivityStuPayinfoEntity;
-import org.springframework.amqp.core.Message;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.rabbitmq.client.Channel;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import io.renren.common.enums.TaskConfigEnum;
-import io.renren.common.enums.YnEnum;
-import io.renren.modules.qmgj.dao.ActivityDao;
-import io.renren.modules.qmgj.dao.ActivityStuDao;
-import io.renren.modules.qmgj.entity.ActivityEntity;
-import io.renren.modules.qmgj.entity.MemberInfoEntity;
-import io.renren.modules.qmgj.service.MemberInfoService;
-import io.renren.modules.qyh.entity.OrderEntity;
-import io.renren.modules.qyh.entity.TaskConfigEntity;
-import io.renren.modules.qyh.mapper.OrderMapper;
-import io.renren.modules.qyh.model.dto.PointsRecordDTO;
-import io.renren.modules.qyh.service.PointsRecordService;
-import io.renren.modules.qyh.service.TaskConfigService;
-import lombok.extern.slf4j.Slf4j;
-
-@RestController
-@Component
-@Slf4j
-public class ActivityIssuePointsListener {
-
-    @Resource
-    private ActivityDao activityDao;
-    @Resource
-    private ActivityStuDao activityStuDao;
-    @Resource
-    private ActivityStuPayinfoDao activityStuPayinfoDao;
-    @Autowired
-    private PointsRecordService pointsRecordService;
-    @Autowired
-    private TaskConfigService taskConfigService;
-    @Autowired
-    private MemberInfoService memberInfoService;
-    @Resource
-    private OrderMapper orderMapper;
-
-//    @RabbitListener(queues = QueueConstant.ACTIVITY_ISSUE_POINTS_DEAD_QUEUE)
-    public void handlerDeadMsg(Message message, Channel channel) {
-        try {
-            log.info("活动结束发放积分开始");
-            String s = new String(message.getBody());
-            JSONObject jsonObject = JSONObject.parseObject(s);
-            Long activityId = Long.parseLong(jsonObject.get("activityId").toString());
-            ActivityEntity activityEntity = activityDao.selectById(activityId);
-            if (ObjectUtil.isNull(activityEntity)) {
-                log.info("该活动不存在");
-                channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-                return;
-            }
-            if (StrUtil.equals(activityEntity.getIsDelete(), "1")) {
-                log.info("活动Id:{}已被删除", activityId);
-                channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-                return;
-            }
-
-            activityDao.update(null, new LambdaUpdateWrapper<ActivityEntity>().set(ActivityEntity::getStatus, 6)
-                .eq(ActivityEntity::getId, activityEntity.getId()));
-
-            List<ActivityStuPayinfoEntity> activityStuEntities = activityStuPayinfoDao.selectList(
-                new LambdaQueryWrapper<ActivityStuPayinfoEntity>().eq(ActivityStuPayinfoEntity::getActivityId, activityEntity.getId()));
-            if (CollectionUtil.isNotEmpty(activityStuEntities)) {
-                TaskConfigEntity taskConfigEntity = taskConfigService.loadByCode(TaskConfigEnum.ACTIVITY.code(), false);
-                TaskConfigEntity activitySuperior =
-                    taskConfigService.loadByCode(TaskConfigEnum.ACTIVITY_SUPERIOR.code(), false);
-                for (ActivityStuPayinfoEntity activityStuPayinfoEntity : activityStuEntities) {
-                    Long stuId = activityStuPayinfoEntity.getStuId();
-
-                    OrderEntity orderEntity = orderMapper.selectOne(new LambdaQueryWrapper<OrderEntity>()
-                        .eq(OrderEntity::getMemberId, stuId).eq(OrderEntity::getBusinessId, activityId)
-                        .eq(OrderEntity::getCode, TaskConfigEnum.ACTIVITY.code()).eq(OrderEntity::getPayStatus, 1)
-                        .orderByDesc(OrderEntity::getPayTime).last("limit 1"));
-                    if (ObjectUtil.isNotNull(orderEntity)) {
-                        BigDecimal payMoney = orderEntity.getActuallyPaid();
-                        // 本人积分
-                        if (ObjectUtil.isNotNull(taskConfigEntity)) {
-                            Integer status = taskConfigEntity.getStatus();
-                            if (NumberUtil.equals(status, YnEnum.YES.value())) {
-                                Long taskId = taskConfigEntity.getId();
-                                String taskName = taskConfigEntity.getName();
-                                int no = YnEnum.NO.value();
-                                int scoreValue = NumberUtil.div(payMoney,
-                                    NumberUtil.toBigDecimal(taskConfigEntity.getIntegralValue()), 0, RoundingMode.FLOOR)
-                                    .intValue();
-                                this.setPointsRecord(activityId, scoreValue, taskId, taskName, payMoney, stuId, no);
-                            }
-                        }
-
-                        // 上级积分
-                        if (ObjectUtil.isNotNull(activitySuperior)) {
-                            Integer status = activitySuperior.getStatus();
-                            if (NumberUtil.equals(status, YnEnum.YES.value())) {
-                                Long taskId = activitySuperior.getId();
-                                String taskName = activitySuperior.getName();
-                                int scoreValue = NumberUtil.div(payMoney,
-                                    NumberUtil.toBigDecimal(activitySuperior.getIntegralValue()), 0, RoundingMode.FLOOR)
-                                    .intValue();
-                                MemberInfoEntity memberInfoEntity = memberInfoService.memberById(stuId);
-                                if (ObjectUtil.isNotNull(memberInfoEntity)) {
-                                    String pInviteCode = memberInfoEntity.getPInviteCode();
-                                    if (StrUtil.isNotBlank(pInviteCode)) {
-                                        MemberInfoEntity pMemberInfo =
-                                            memberInfoService.loadByInviteCode(pInviteCode, false);
-                                        if (ObjectUtil.isNotNull(pMemberInfo)) {
-                                            Long memberInfoId = pMemberInfo.getId();
-                                            int yes = YnEnum.YES.value();
-                                            this.setPointsRecord(activityId, scoreValue, taskId, taskName, payMoney,
-                                                memberInfoId, yes);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        log.info("没有该用户的支付信息 {}", stuId);
-                    }
-                }
-            }
-            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-            log.info("活动结束发放积分结束");
-        } catch (IOException e) {
-            e.printStackTrace();
-            log.error("活动结束发放积分报错 {}", e.getMessage(), e);
-        }
-    }
-
-    private void setPointsRecord(Long activityId, int scoreValue, Long taskId, String taskName, BigDecimal payMoney,
-        Long memberInfoId, int status) {
-        PointsRecordDTO dto = new PointsRecordDTO();
-        dto.setMemberId(memberInfoId);
-        dto.setTaskId(taskId);
-        dto.setTaskName(taskName);
-        dto.setBusinessId(activityId);
-        dto.setScoreValue(scoreValue);
-        dto.setActualPrice(payMoney);
-        dto.setIsLowerLevel(status);
-        pointsRecordService.savePointsPercentageRecord(dto);
-    }
-
-}

renren-admin/src/main/java/io/renren/modules/qmgj/entity/ActivityEntity.java

@@ -179,9 +179,11 @@ public class ActivityEntity implements Serializable {
 	/**
 	 * 报名费
 	 */
-	@NotNull(message = "报名费不能为空", groups = {AddGroup.class, UpdateGroup.class})
-	@Digits(integer = 4, fraction=0, message = "报名费金额格式不正确", groups = {AddGroup.class, UpdateGroup.class})
 	private BigDecimal money;
+	/**
+	 * 积分
+	 */
+	private BigDecimal points;
 
 	/**
 	 * 排序字段(0-999)

renren-admin/src/main/java/io/renren/modules/qmgj/service/impl/ActivityServiceImpl.java

@@ -663,39 +663,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
         if (ObjectUtil.isNull(activityEntity)) {
             return R.error("该活动已删除不可报名！");
         }
-        if (NumberUtil.equals(NumberUtil.toBigDecimal(activityEntity.getIsNeedVip()), BigDecimal.ONE)) {
-            // if (!"1".equals(member.getCardtype()) && !"4".equals(member.getCardtype()) &&
-            // !"5".equals(member.getCardtype())) {
-            // return R.error(504, "会员级别权限不足!需缴费报名!");
-            // }
-
-            /*if ("5".equals(member.getCardtype())){
-            //判断潮玩会员是否还有免费次数
-            String actFree = member.getActFree();
-            if ("0".equals(actFree)){
-                return R.error(510,"当前用户免费次数已用完");
-            } else {
-                member.setActFree("0");
-                memberInfoDao.updateById(member);
-            }
-            }*/
-            // if (!member.getCardtype().equals("1")) {
-            // return R.error("您没有开通会员!无法报名!");
-            // }
-            // if (StringUtils.isNotBlank(member.getEndtime())) {
-            // try {
-            // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            // Date date = sdf.parse(member.getEndtime());
-            // if (date.getTime() < now.getTime()) {
-            // return R.error(521, "会员已到期!无法报名!");
-            // }
-            // } catch (ParseException e) {
-            // e.printStackTrace();
-            // return R.error(521, "会员到期时间格式设置不正确!请联系管理员!");
-            // }
-            // }
-        }
-
         R r = MemberUtils.isYF(member);
         if ((Integer) r.get("code") != 0) {
             return R.error(503, "请完善资料后进行报名操作");
@@ -717,30 +684,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
             }
         }
 
-        /****************/
-
-        // 当天
-        /*Calendar calendar = Calendar.getInstance();
-        calendar.setTime(now);
-        int now_year = calendar.get(Calendar.YEAR);
-        int now_month = calendar.get(Calendar.MONTH) + 1;
-        int now_day = calendar.get(Calendar.DAY_OF_MONTH);
-        calendar.add(Calendar.DATE,1);
-        int tom_year = calendar.get(Calendar.YEAR);
-        int tom_month = calendar.get(Calendar.MONTH) + 1;
-        int tom_day = calendar.get(Calendar.DAY_OF_MONTH);
-        int c1 = activityStuDao.selectCount(
-                new QueryWrapper<ActivityStuEntity>()
-                        .eq("is_delete", 0)
-                        .eq("status", "01")
-                        .eq("stu_id", stuId)
-                        .ge("create_time", now_year + "-" + (now_month < 10 ? "0" + now_month : now_month) + "-" + (now_day < 10 ? "0" + now_day : now_day) + " 00:00:00")
-                        .lt("create_time", tom_year + "-" + (tom_month < 10 ? "0" + tom_month : tom_month) + "-" + (tom_day < 10 ? "0" + tom_day : tom_day) + " 00:00:00")
-        );
-        if (c1>0){
-            return R.error(510,"当天只可报名一个活动!");
-        }*/
-
         // 时间段
         ActivityEntity activity = this.getById(actId);
         if (activity == null) {
@@ -763,74 +706,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
         if (one != null) {
             return R.error(505, "请勿重复报名!");
         }
-        /****** if冻结 ******/
-        /*if (StringUtils.isNotBlank(member.getFreezeTime())){
-            //查询超时时间
-            WgFillInfoEntity wgFill = wgFillInfoDao.selectById(1);
-            int time = 0;
-            if (wgFill.getFreezeTime() != null){
-                time = wgFill.getFreezeTime();
-            }
-
-            long history;
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                history = sdf.parse(member.getFreezeTime()).getTime();
-            } catch (ParseException e) {
-                e.printStackTrace();
-                history = now.getTime();
-            }
-            long sub = now.getTime()-history;
-            if (sub < time*3600*1000){
-                sub = time*3600*1000 - sub;
-                long hour = sub/(60*60*1000);
-                long minute = (sub - hour*60*60*1000)/(60*1000);
-                long second = (sub - hour*60*60*1000 - minute*60*1000)/1000;
-                return R.error(507,"您还有"+(hour<10?"0"+hour:hour)+":"+(minute<10?"0"+minute:minute)+":"+(second<10?"0"+second:second)+"才可再次报名当前活动!");
-            } else {
-                member.setFreezeTime("");
-                memberInfoDao.updateById(member);
-            }
-        }*/
-        /****** else冻结 ******/
-        /*ActivityStuEntity two = activityStuDao.selectOne(
-                new QueryWrapper<ActivityStuEntity>()
-                        .eq("activity_id", actId)
-                        .eq("stu_id", stuId)
-                        .eq("status","02")
-                        .eq("is_delete", 0)
-                        .orderByDesc("create_time")
-                        .last("limit 1")
-        );
-        if (two != null){
-            //查询超时时间
-            WgFillInfoEntity wgFill = wgFillInfoDao.selectById(1);
-            int time = 0;
-            if (wgFill.getFreezeTime() != null){
-                time = wgFill.getFreezeTime();
-            }
-            if (StringUtils.isBlank(two.getCancelTime())){
-                return R.error(506,"数据传输错误-002");
-            }
-            long history;
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                history = sdf.parse(two.getCancelTime()).getTime();
-            } catch (ParseException e) {
-                e.printStackTrace();
-                history = now.getTime();
-            }
-            long sub = now.getTime()-history;
-            if (sub < time*3600*1000 && sub >10*60*1000){
-                *//*sub = time*3600*1000 - sub;
-                                    long hour = sub/(60*60*1000);
-                                    long minute = (sub - hour*60*60*1000)/(60*1000);
-                                    long second = (sub - hour*60*60*1000 - minute*60*1000)/1000;
-                                    return R.error(507,"您还有"+(hour<10?"0"+hour:hour)+":"+(minute<10?"0"+minute:minute)+":"+(second<10?"0"+second:second)+"才可再次报名当前活动!");*//*
-                                                                                                                                                                                            return R.error(507,"账户处在冻结阶段,请在"+time+"小时后，再回到此页面报名活动");
-                                                                                                                                                                                            }
-                                                                                                                                                                                            }*/
-        /****************/
         // 检查人数
         Integer count = activityStuDao.selectCount(
                 new QueryWrapper<ActivityStuEntity>().eq("activity_id", actId).eq("is_delete", 0).eq("status", "01"));
@@ -866,14 +741,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
                 activityService.updateById(activity);
             }
         }
-
-       // Date date = DateUtils.stringToDate(activity.getEndTime(), "yyyy-MM-dd HH:mm");
-       // String expirationTime = String.valueOf(date.getTime() - System.currentTimeMillis());
-       // rabbitTemplate.convertAndSend(QueueConstant.ACT_MS_QUEUE, activityStu.getId().toString(), message -> {
-       //     message.getMessageProperties().setExpiration(expirationTime);
-       //     return message;
-       // });
-
         //TODO 更新用户活动次数
         memberInfoDao.updateActivityFrequency(activityStu.getStuId(), 1, true);
 
@@ -902,22 +769,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
                 && !"5".equals(member.getCardtype())) {
             return R.error(504, "会员级别权限接口调取错误!");
         }
-
-        // if ("5".equals(member.getCardtype())) {
-        // //判断潮玩会员是否还有免费次数,有免费次数
-        // String actFree = member.getActFree();
-        // if ("1".equals(actFree)) {
-        // //直接走免费报名接口
-        // R register = register(params);
-        // Integer code = (Integer) register.get("code");
-        // if (0 == code) {
-        // member.setActFree("0");
-        // memberInfoDao.updateById(member);
-        // }
-        // return register;
-        // }
-        // }
-
         if (StringUtils.isNotBlank(member.getEndtime())) {
             try {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -950,31 +801,6 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
                 return R.error(507, "账户处在冻结阶段,请等待解冻后，再回到此页面报名");
             }
         }
-
-        /****************/
-
-        // 当天
-        /*Calendar calendar = Calendar.getInstance();
-        calendar.setTime(now);
-        int now_year = calendar.get(Calendar.YEAR);
-        int now_month = calendar.get(Calendar.MONTH) + 1;
-        int now_day = calendar.get(Calendar.DAY_OF_MONTH);
-        calendar.add(Calendar.DATE,1);
-        int tom_year = calendar.get(Calendar.YEAR);
-        int tom_month = calendar.get(Calendar.MONTH) + 1;
-        int tom_day = calendar.get(Calendar.DAY_OF_MONTH);
-        int c1 = activityStuDao.selectCount(
-                new QueryWrapper<ActivityStuEntity>()
-                        .eq("is_delete", 0)
-                        .eq("status", "01")
-                        .eq("stu_id", stuId)
-                        .ge("create_time", now_year + "-" + (now_month < 10 ? "0" + now_month : now_month) + "-" + (now_day < 10 ? "0" + now_day : now_day) + " 00:00:00")
-                        .lt("create_time", tom_year + "-" + (tom_month < 10 ? "0" + tom_month : tom_month) + "-" + (tom_day < 10 ? "0" + tom_day : tom_day) + " 00:00:00")
-        );
-        if (c1>0){
-            return R.error(510,"当天只可报名一个活动!");
-        }*/
-
         // 时间段
         ActivityEntity activity = this.getById(actId);
         if (activity == null) {
@@ -983,78 +809,31 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
         if (StringUtils.isBlank(activity.getStartTime()) || StringUtils.isBlank(activity.getStartTime())) {
             return R.error(512, "活动时间信息不全!无法报名!");
         }
-        /*Integer c2 = activityStuDao.checkActivityRegister(stuId,DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"),activity.getStartTime(),activity.getEndTime());
-        if (c2>0){
-            return R.error(513,"当前时间段已参加其他活动!无法报名!");
-        }*/
 
         //TODO 学生在一个时间只能去做一个工作或活动
         this.verifyExistRepeat(stuId, activity);
         member.setWorkFrequency(null);
         member.setActivityFrequency(null);
 
+        ActivityStuEntity one = activityStuDao.selectOne(new QueryWrapper<ActivityStuEntity>().eq("activity_id", actId)
+                .eq("stu_id", stuId).eq("`status`", "01").eq("is_delete", 0));
+        if (one != null) {
+            return R.error(505, "请勿重复报名!");
+        }
+        // 检查人数
+        Integer count = activityStuDao.selectCount(
+                new QueryWrapper<ActivityStuEntity>().eq("activity_id", actId).eq("is_delete", 0).eq("status", "01"));
+        if (count >= activity.getWillnum()) {
+            return R.error(508, "当前活动已报满!");
+        }
+
         Integer isNeedVip = activity.getIsNeedVip();
         BigDecimal money = activity.getMoney();
-        //qyh_points_config
-        PointsConfigEntity pointsConfig = pointsConfigService.getOne();
-        if (pointsConfig == null){
-            try {
-                // 支付信息
-                ActivityStuPayinfoEntity activityStuPayinfoEntity = new ActivityStuPayinfoEntity();
-                activityStuPayinfoEntity.setActivityId(actId);
-                activityStuPayinfoEntity.setStuId(stuId);
-                activityStuPayinfoEntity.setCreateTime(DateFormatUtils.format(now, "yyyy-MM-dd HH:mm:ss"));
-                activityStuPayinfoEntity.setPayStatus(0);
-                activityStuPayinfoEntity.setPayMoney(money);
-                activityStuPayinfoEntity.setPayNo(MD5Util.getUUID16());
-                activityStuPayinfoService.save(activityStuPayinfoEntity);
+        BigDecimal points = activity.getPoints();
 
-                // 允许报名 ，调起微信
-                String notifyUrl = PropertiesParameter.PROP.getProperty("pay.notify.activity.url");
-                String openid = member.getOpenid();
-                OrderBusinessTypeEnum typeEnum = OrderBusinessTypeEnum.PURCHASE_ACTIVITY;
-                PayForBO bo = new PayForBO();
-                bo.setNotifyUrl(notifyUrl);
-                bo.setOpenid(openid);
-                bo.setMemberId(stuId);
-                bo.setBusinessId(actId);
-                bo.setBusinessType(typeEnum.value());
-                bo.setBuyContent(activity.getTitle());
-                bo.setPayTime(LocalDateTime.now());
-                bo.setPrice(money);
-                bo.setActuallyPaid(money);
-                bo.setUsePoints(0);
-                bo.setPointsDeduction(BigDecimal.ZERO);
-                bo.setCode(TaskConfigEnum.ACTIVITY.code());
-                return R.ok().put("map", orderService.payFor(bo));
-            } catch (Exception e) {
-                e.printStackTrace();
-                return R.error("微信支付异常！");
-            }
-        }
         //获取会员总积分
         Integer totalScore = scoreStuService.getTotalScore(stuId);
-        Integer pointsDeduction = pointsConfig.getPointsDeduction();
-        BigDecimal actualPayment = BigDecimal.ZERO;
-        int usePoints = 0;
-        // 当前价格所需要的积分
-        Integer priceIntegral =
-                NumberUtil.mul(money, NumberUtil.toBigDecimal(pointsDeduction)).intValue();
-        if (NumberUtil.isGreater(NumberUtil.toBigDecimal(totalScore),
-                NumberUtil.toBigDecimal(priceIntegral))) {
-            usePoints = priceIntegral;
-            //BigDecimal deductiblePrice =
-            //        NumberUtil.div(priceIntegral, pointsDeduction, 0, RoundingMode.FLOOR);
-            //actualPayment = NumberUtil.sub(money, deductiblePrice);
-        } else {
-            BigDecimal deductiblePrice =
-                    NumberUtil.div(totalScore, pointsDeduction, 0, RoundingMode.FLOOR);
-            usePoints = NumberUtil.mul(deductiblePrice, pointsDeduction).intValue();
-            //actualPayment = NumberUtil.sub(money, deductiblePrice);
-        }
-        Integer isDeductiblePrice = MapUtil.getInt(params, "isDeductiblePrice");
-        // params.put("usePoints", usePoints);
-        if (NumberUtil.isLessOrEqual(money, BigDecimal.ZERO)) {
+        if (NumberUtil.isLessOrEqual(points, BigDecimal.ZERO)) {
             // 直接走免费报名接口
             R register = register(params);
             Integer code = (Integer) register.get("code");
@@ -1078,14 +857,14 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
                 return register;
             }
         }
-        //积分够扣且小于扣除上限走免费报名接口
-        if (isDeductiblePrice == 1 && BigDecimal.valueOf(totalScore).compareTo(BigDecimal.valueOf(priceIntegral)) >= 0
-                &&  BigDecimal.valueOf(priceIntegral).compareTo(BigDecimal.valueOf(pointsConfig.getDeductionLimit())) <= 0){
-            // 直接走免费报名接口
-            R register = register(params);
-            //插入一条积分记录
-            BigDecimal usePointsDecimal = BigDecimal.valueOf((usePoints));
-            if (usePointsDecimal.compareTo(BigDecimal.ZERO) > 0){
+        try {
+            // 走积分
+            if (money.compareTo(BigDecimal.ZERO) == 0 && points.compareTo(BigDecimal.ZERO) > 0){
+                if (BigDecimal.valueOf(totalScore).compareTo(points) < 0) {
+                    return R.error(522, "积分不够报名!");
+                }
+                // 直接走免费报名接口
+                R register = register(params);
                 ScoreStu add = new ScoreStu();
                 add.setDay(DateForStr.getInfoDateStr(new Date()));
                 add.setStuId(stuId);
@@ -1093,205 +872,45 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
                 add.setTaskId(TaskType.ACTIVITY_APPLY_DEDUCT.getCode());
                 add.setBusinessId(actId);
                 add.setScoreEvent(TaskType.ACTIVITY_APPLY_DEDUCT.getInfo());
-                add.setScoreValue(NumberUtil.sub(BigDecimal.ZERO, usePoints).intValue());
+                add.setScoreValue(NumberUtil.sub(BigDecimal.ZERO, points).intValue());
                 add.setCreateTime(new Date());
-                add.setSurplusScore(NumberUtil.sub(BigDecimal.ZERO, usePoints).intValue() + this.scoreStuService.getTotalScore(stuId));
+                add.setSurplusScore(NumberUtil.sub(BigDecimal.ZERO, points).intValue() + this.scoreStuService.getTotalScore(stuId));
                 scoreStuMapper.insert(add);
-            }
-            Integer code = (Integer) register.get("code");
-            if (0 == code) {
-                member.setActFree("0");
-                memberInfoDao.updateById(member);
-            }
-            return register;
-        }
-
-        ActivityStuEntity one = activityStuDao.selectOne(new QueryWrapper<ActivityStuEntity>().eq("activity_id", actId)
-                .eq("stu_id", stuId).eq("`status`", "01").eq("is_delete", 0));
-        if (one != null) {
-            return R.error(505, "请勿重复报名!");
-        }
-        /****** if冻结 ******/
-        /*if (StringUtils.isNotBlank(member.getFreezeTime())){
-            //查询超时时间
-            WgFillInfoEntity wgFill = wgFillInfoDao.selectById(1);
-            int time = 0;
-            if (wgFill.getFreezeTime() != null){
-                time = wgFill.getFreezeTime();
-            }
-
-            long history;
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                history = sdf.parse(member.getFreezeTime()).getTime();
-            } catch (ParseException e) {
-                e.printStackTrace();
-                history = now.getTime();
-            }
-            long sub = now.getTime()-history;
-            if (sub < time*3600*1000){
-                sub = time*3600*1000 - sub;
-                long hour = sub/(60*60*1000);
-                long minute = (sub - hour*60*60*1000)/(60*1000);
-                long second = (sub - hour*60*60*1000 - minute*60*1000)/1000;
-                return R.error(507,"您还有"+(hour<10?"0"+hour:hour)+":"+(minute<10?"0"+minute:minute)+":"+(second<10?"0"+second:second)+"才可再次报名当前活动!");
-            } else {
-                member.setFreezeTime("");
-                memberInfoDao.updateById(member);
-            }
-        }*/
-        /****** else冻结 ******/
-        /*ActivityStuEntity two = activityStuDao.selectOne(
-                new QueryWrapper<ActivityStuEntity>()
-                        .eq("activity_id", actId)
-                        .eq("stu_id", stuId)
-                        .eq("status","02")
-                        .eq("is_delete", 0)
-                        .orderByDesc("create_time")
-                        .last("limit 1")
-        );
-        if (two != null){
-            //查询超时时间
-            WgFillInfoEntity wgFill = wgFillInfoDao.selectById(1);
-            int time = 0;
-            if (wgFill.getFreezeTime() != null){
-                time = wgFill.getFreezeTime();
-            }
-            if (StringUtils.isBlank(two.getCancelTime())){
-                return R.error(506,"数据传输错误-002");
-            }
-            long history;
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                history = sdf.parse(two.getCancelTime()).getTime();
-            } catch (ParseException e) {
-                e.printStackTrace();
-                history = now.getTime();
-            }
-            long sub = now.getTime()-history;
-            if (sub < time*3600*1000 && sub >10*60*1000){
-                *//*sub = time*3600*1000 - sub;
-                                long hour = sub/(60*60*1000);
-                                long minute = (sub - hour*60*60*1000)/(60*1000);
-                                long second = (sub - hour*60*60*1000 - minute*60*1000)/1000;
-                                return R.error(507,"您还有"+(hour<10?"0"+hour:hour)+":"+(minute<10?"0"+minute:minute)+":"+(second<10?"0"+second:second)+"才可再次报名当前活动!");*//*
-                                                                                                                                                                                    return R.error(507,"账户处在冻结阶段,请在"+time+"小时后，再回到此页面报名活动");
-                                                                                                                                                                                    }
-                                                                                                                                                                                    }*/
-        /****************/
-        // 检查人数
-        Integer count = activityStuDao.selectCount(
-                new QueryWrapper<ActivityStuEntity>().eq("activity_id", actId).eq("is_delete", 0).eq("status", "01"));
-        if (count >= activity.getWillnum()) {
-            return R.error(508, "当前活动已报满!");
-        }
-
-        //BigDecimal actualPayment = BigDecimal.ZERO;
-        //int usePoints = 0;
-        Long id = member.getId();
-        Integer totalPoints = scoreStuMapper.getTotalPointsByMemberId(id);
-        if (ObjectUtil.isNotNull(totalPoints)
-                && NumberUtil.isGreater(NumberUtil.toBigDecimal(totalPoints), BigDecimal.ZERO)) {
-            if (ObjectUtil.isNotNull(isDeductiblePrice)) {
-                PointsConfigEntity info = pointsConfigService.info();
-                Integer pointsConfigStatus = info.getStatus();
-                if (NumberUtil.equals(pointsConfigStatus, YnEnum.YES.value())) {
-                    if (NumberUtil.equals(isDeductiblePrice, YnEnum.YES.value())) {
-                        Integer deductionLimit = info.getDeductionLimit();
-                        if (NumberUtil.isGreater(NumberUtil.toBigDecimal(totalPoints),
-                                NumberUtil.toBigDecimal(deductionLimit))) {
-                            totalPoints = deductionLimit;
-                        }
-                       //Integer pointsDeduction = info.getPointsDeduction();
-                       //// 当前价格所需要的积分
-                       //Integer priceIntegral =
-                       //        NumberUtil.mul(money, NumberUtil.toBigDecimal(pointsDeduction)).intValue();
-                        if (NumberUtil.isGreater(NumberUtil.toBigDecimal(totalPoints),
-                                NumberUtil.toBigDecimal(priceIntegral))) {
-                            usePoints = priceIntegral;
-                            BigDecimal deductiblePrice =
-                                    NumberUtil.div(priceIntegral, pointsDeduction, 0, RoundingMode.FLOOR);
-                            actualPayment = NumberUtil.sub(money, deductiblePrice);
-                        } else {
-                            BigDecimal deductiblePrice =
-                                    NumberUtil.div(totalPoints, pointsDeduction, 0, RoundingMode.FLOOR);
-                            usePoints = NumberUtil.mul(deductiblePrice, pointsDeduction).intValue();
-                            actualPayment = NumberUtil.sub(money, deductiblePrice);
-                        }
-                        if (NumberUtil.equals(actualPayment, BigDecimal.ZERO)) {
-                            // 新增积分数据
-                            //PointsRecordDTO dto = new PointsRecordDTO();
-                            //dto.setMemberId(stuId);
-                            //dto.setBusinessId(actId);
-                            //dto.setScoreValue(NumberUtil.sub(BigDecimal.ZERO, usePoints).intValue());
-                            //dto.setActualPrice(actualPayment);
-                            //dto.setIsLowerLevel(YnEnum.NO.value());
-                            //dto.setTaskId(Constant.ACTIVITY_APPLY_DEDUCT);
-                            //dto.setTaskName("活动报名抵扣的积分");
-                            //pointsRecordService.savePointsRecord(dto);
-                            //插入一条积分记录
-                           // ScoreStu add = new ScoreStu();
-                           // add.setDay(DateForStr.getInfoDateStr(new Date()));
-                           // add.setStuId(stuId);
-                           // add.setScoreType(ScoreType.STORE_SCORE.getCode());
-                           // add.setTaskId(TaskType.ACTIVITY_APPLY_DEDUCT.getCode());
-                           // add.setBusinessId(TaskType.ACTIVITY_APPLY_DEDUCT.getCode());
-                           // add.setScoreEvent(TaskType.ACTIVITY_APPLY_DEDUCT.getInfo());
-                           // add.setScoreValue(NumberUtil.sub(BigDecimal.ZERO, usePoints).intValue());
-                           // add.setCreateTime(new Date());
-                           // add.setSurplusScore(NumberUtil.sub(BigDecimal.ZERO, usePoints).intValue() + this.scoreStuService.getTotalScore(stuId));
-                           // scoreStuMapper.insert(add);
-                            // 直接走免费报名接口
-                            R register = register(params);
-                            Integer code = (Integer) register.get("code");
-                            if (0 == code) {
-                                member.setActFree("0");
-                                memberInfoDao.updateById(member);
-                            }
-                            return register;
-                        }
-                    } else {
-                        actualPayment = money;
-                    }
-                } else {
-                    actualPayment = money;
+                Integer code = (Integer) register.get("code");
+                if (0 == code) {
+                    member.setActFree("0");
+                    memberInfoDao.updateById(member);
                 }
+                return register;
             } else {
-                actualPayment = money;
-            }
-        } else {
-            actualPayment = money;
-        }
+                // 支付信息
+                ActivityStuPayinfoEntity activityStuPayinfoEntity = new ActivityStuPayinfoEntity();
+                activityStuPayinfoEntity.setActivityId(actId);
+                activityStuPayinfoEntity.setStuId(stuId);
+                activityStuPayinfoEntity.setCreateTime(DateFormatUtils.format(now, "yyyy-MM-dd HH:mm:ss"));
+                activityStuPayinfoEntity.setPayStatus(0);
+                activityStuPayinfoEntity.setPayMoney(money);
+                activityStuPayinfoEntity.setPayNo(MD5Util.getUUID16());
+                activityStuPayinfoService.save(activityStuPayinfoEntity);
 
-        try {
-            // 支付信息
-            ActivityStuPayinfoEntity activityStuPayinfoEntity = new ActivityStuPayinfoEntity();
-            activityStuPayinfoEntity.setActivityId(actId);
-            activityStuPayinfoEntity.setStuId(stuId);
-            activityStuPayinfoEntity.setCreateTime(DateFormatUtils.format(now, "yyyy-MM-dd HH:mm:ss"));
-            activityStuPayinfoEntity.setPayStatus(0);
-            activityStuPayinfoEntity.setPayMoney(actualPayment);
-            activityStuPayinfoEntity.setPayNo(MD5Util.getUUID16());
-            activityStuPayinfoService.save(activityStuPayinfoEntity);
-
-            // 允许报名 ，调起微信
-            String notifyUrl = PropertiesParameter.PROP.getProperty("pay.notify.activity.url");
-            String openid = member.getOpenid();
-            OrderBusinessTypeEnum typeEnum = OrderBusinessTypeEnum.PURCHASE_ACTIVITY;
-            PayForBO bo = new PayForBO();
-            bo.setNotifyUrl(notifyUrl);
-            bo.setOpenid(openid);
-            bo.setMemberId(id);
-            bo.setBusinessId(actId);
-            bo.setBusinessType(typeEnum.value());
-            bo.setBuyContent(activity.getTitle());
-            bo.setPayTime(LocalDateTime.now());
-            bo.setPrice(money);
-            bo.setActuallyPaid(actualPayment);
-            bo.setUsePoints(usePoints);
-            bo.setPointsDeduction(BigDecimal.ZERO);
-            bo.setCode(TaskConfigEnum.ACTIVITY.code());
-            return R.ok().put("map", orderService.payFor(bo));
+                // 允许报名 ，调起微信
+                String notifyUrl = PropertiesParameter.PROP.getProperty("pay.notify.activity.url");
+                String openid = member.getOpenid();
+                OrderBusinessTypeEnum typeEnum = OrderBusinessTypeEnum.PURCHASE_ACTIVITY;
+                PayForBO bo = new PayForBO();
+                bo.setNotifyUrl(notifyUrl);
+                bo.setOpenid(openid);
+                bo.setMemberId(stuId);
+                bo.setBusinessId(actId);
+                bo.setBusinessType(typeEnum.value());
+                bo.setBuyContent(activity.getTitle());
+                bo.setPayTime(LocalDateTime.now());
+                bo.setPrice(money);
+                bo.setActuallyPaid(money);
+                bo.setPointsDeduction(BigDecimal.ZERO);
+                bo.setCode(TaskConfigEnum.ACTIVITY.code());
+                return R.ok().put("map", orderService.payFor(bo));
+            }
         } catch (Exception e) {
             e.printStackTrace();
             return R.error("微信支付异常！");
@@ -1699,62 +1318,14 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, ActivityEntity
         MemberInfoEntity memberInfoEntity = loginVerificationService.verificationMemberId(id);
         Integer totalPoints = memberInfoEntity.getTotalPoints();
         ActivityEntity activityEntity = this.loadById(activityId, true);
-        PointsConfigEntity info = pointsConfigService.info();
-        Integer status = info.getStatus();
 
         EventRegistrationPayPriceVO eventRegistrationPayPriceVO = new EventRegistrationPayPriceVO();
-        Integer pointsDeduction = info.getPointsDeduction();
-        if (NumberUtil.equals(NumberUtil.toBigDecimal(pointsDeduction), BigDecimal.ZERO)) {
-            eventRegistrationPayPriceVO.setIsDeductiblePrice(YnEnum.NO.value());
-            eventRegistrationPayPriceVO.setDeductiblePrice(BigDecimal.ZERO);
-            return eventRegistrationPayPriceVO;
-        }
-
         eventRegistrationPayPriceVO.setBusinessId(id);
         eventRegistrationPayPriceVO.setRemainingPoints(ObjectUtil.isNull(totalPoints) ? 0 : totalPoints);
         BigDecimal money = activityEntity.getMoney();
-        if (NumberUtil.isLessOrEqual(money, BigDecimal.ZERO)) {
-            eventRegistrationPayPriceVO.setActualPrice(ObjectUtil.isNull(money) ? BigDecimal.ZERO : money);
-            eventRegistrationPayPriceVO.setIsDeductiblePrice(YnEnum.NO.value());
-            eventRegistrationPayPriceVO.setDeductiblePrice(BigDecimal.ZERO);
-        } else {
-            eventRegistrationPayPriceVO.setMoney(money);
-            if (NumberUtil.equals(status, YnEnum.NO.value())) {
-                eventRegistrationPayPriceVO.setActualPrice(money);
-                eventRegistrationPayPriceVO.setIsDeductiblePrice(YnEnum.NO.value());
-                eventRegistrationPayPriceVO.setDeductiblePrice(BigDecimal.ZERO);
-            } else {
-                eventRegistrationPayPriceVO.setIsDeductiblePrice(YnEnum.YES.value());
-                Integer deductionLimit = info.getDeductionLimit();
-                if (NumberUtil.isGreater(NumberUtil.toBigDecimal(totalPoints),
-                        NumberUtil.toBigDecimal(deductionLimit))) {
-                    totalPoints = deductionLimit;
-                }
-
-                // 当前价格所需要的积分
-                Integer priceIntegral = NumberUtil.mul(money, NumberUtil.toBigDecimal(pointsDeduction)).intValue();
-                if (NumberUtil.isGreater(NumberUtil.toBigDecimal(totalPoints),
-                        NumberUtil.toBigDecimal(priceIntegral))) {
-                    eventRegistrationPayPriceVO.setUsePoints(priceIntegral);
-                    BigDecimal deductiblePrice = NumberUtil.div(priceIntegral, pointsDeduction, 0, RoundingMode.FLOOR);
-                    eventRegistrationPayPriceVO.setDeductiblePrice(deductiblePrice);
-                    eventRegistrationPayPriceVO.setActualPrice(NumberUtil.sub(money, deductiblePrice));
-                } else {
-                    if (!NumberUtil.equals(NumberUtil.toBigDecimal(totalPoints), BigDecimal.ZERO)) {
-                        BigDecimal deductiblePrice =
-                                NumberUtil.div(totalPoints, pointsDeduction, 0, RoundingMode.FLOOR);
-                        int usePoints = NumberUtil.mul(deductiblePrice, pointsDeduction).intValue();
-                        eventRegistrationPayPriceVO.setUsePoints(usePoints);
-                        eventRegistrationPayPriceVO.setDeductiblePrice(deductiblePrice);
-                        eventRegistrationPayPriceVO.setActualPrice(NumberUtil.sub(money, deductiblePrice));
-                    } else {
-                        eventRegistrationPayPriceVO.setUsePoints(0);
-                        eventRegistrationPayPriceVO.setDeductiblePrice(BigDecimal.ZERO);
-                        eventRegistrationPayPriceVO.setActualPrice(money);
-                    }
-                }
-            }
-        }
+        eventRegistrationPayPriceVO.setMoney(money);
+        eventRegistrationPayPriceVO.setActualPrice(money);
+        eventRegistrationPayPriceVO.setActualPoints(activityEntity.getPoints());
         return eventRegistrationPayPriceVO;
     }
 

renren-admin/src/main/java/io/renren/modules/qmjz/entity/GoodsEntity.java

@@ -1,12 +1,12 @@
 package io.renren.modules.qmjz.entity;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.renren.modules.qmjz.model.BasicsEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -47,6 +47,10 @@ public class GoodsEntity extends BasicsEntity {
      * 价格
      */
     private String price;
+    /**
+     * 积分
+     */
+    private BigDecimal points;
     /**
      * 数量
      */

renren-admin/src/main/java/io/renren/modules/qmjz/entity/bo/GoodsBo.java

@@ -1,16 +1,15 @@
 package io.renren.modules.qmjz.entity.bo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.renren.common.validator.group.AddGroup;
 import io.renren.common.validator.group.UpdateGroup;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 商品
@@ -54,9 +53,13 @@ public class GoodsBo implements Serializable {
     /**
      * 价格
      */
-    @NotBlank(message = "价格不能为空", groups = {AddGroup.class, UpdateGroup.class})
     @Length(max = 20, message = "价格不能超过20个字", groups = {AddGroup.class, UpdateGroup.class})
     private String price;
+    /**
+     * 积分
+     */
+    @NotNull(message = "积分不能为空", groups = {AddGroup.class, UpdateGroup.class})
+    private BigDecimal points;
     /**
      * 数量
      */

renren-admin/src/main/java/io/renren/modules/qmjz/entity/vo/GoodsExcel.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -28,6 +29,10 @@ public class GoodsExcel implements Serializable {
      * 价格
      */
     private String price;
+    /**
+     * 积分
+     */
+    private BigDecimal points;
     /**
      * 数量
      */

renren-admin/src/main/java/io/renren/modules/qmjz/entity/vo/GoodsVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -41,6 +42,10 @@ public class GoodsVo extends BasicsEntity {
      * 价格
      */
     private String price;
+    /**
+     * 积分
+     */
+    private BigDecimal points;
     /**
      * 数量
      */

renren-admin/src/main/java/io/renren/modules/qyh/entity/OrderEntity.java

@@ -69,10 +69,6 @@ public class OrderEntity implements Serializable {
      * 实付
      */
     private BigDecimal actuallyPaid;
-    /**
-     * 积分
-     */
-    private BigDecimal points;
     /**
      * 积分抵扣
      */

renren-admin/src/main/java/io/renren/modules/qyh/model/bo/PayForBO.java

@@ -54,10 +54,6 @@ public class PayForBO implements Serializable {
      * 实付
      */
     private BigDecimal actuallyPaid;
-    /**
-     * 积分
-     */
-    private BigDecimal points;
     /**
      * 积分抵扣
      */

renren-admin/src/main/java/io/renren/modules/qyh/model/dto/ActivityDTO.java

@@ -123,11 +123,12 @@ public class ActivityDTO implements Serializable {
 	@ApiModelProperty(value = "是否需要vip  1需要 0不需要")
 	private Integer isNeedVip;
 
-	@NotNull(message = "报名费不能为空", groups = {AddGroup.class, UpdateGroup.class})
-	@Digits(integer = 4, fraction=0, message = "报名费金额格式不正确", groups = {AddGroup.class, UpdateGroup.class})
 	@ApiModelProperty(value = "报名费")
 	private BigDecimal money;
 
+	@NotNull(message = "积分不能为空", groups = {AddGroup.class, UpdateGroup.class})
+	private BigDecimal points;
+
 	@ApiModelProperty(value = "排序字段(0-999)")
 	private Integer orderIndex;
 

renren-admin/src/main/java/io/renren/modules/qyh/model/dto/ExpertTopicDTO.java

@@ -45,8 +45,6 @@ public class ExpertTopicDTO implements Serializable {
     @ApiModelProperty(value = "话题描述")
     private String topicDescribe;
 
-    @Max(value = 300, message = "最大价格值是300", groups = {AddGroup.class, UpdateGroup.class})
-    @Min(value = 0, message = "最小价格值是0", groups = {AddGroup.class, UpdateGroup.class})
     @ApiModelProperty(value = "话题价格")
     private BigDecimal topicPrice;
 
@@ -54,8 +52,6 @@ public class ExpertTopicDTO implements Serializable {
      * 话题积分
      */
     @NotNull(message = "话题积分不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    @Max(value = 300, message = "最大价格值是300", groups = {AddGroup.class, UpdateGroup.class})
-    @Min(value = 0, message = "最小价格值是0", groups = {AddGroup.class, UpdateGroup.class})
     @ApiModelProperty(value = "话题积分")
     private BigDecimal topicPoints;
 

renren-admin/src/main/java/io/renren/modules/qyh/model/dto/MeetDTO.java

@@ -1,6 +1,7 @@
 package io.renren.modules.qyh.model.dto;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import javax.validation.constraints.NotNull;
@@ -35,6 +36,12 @@ public class MeetDTO implements Serializable {
     @ApiModelProperty(value = "请教价格")
     private Integer meetPrice;
 
+    /**
+     * 请教积分
+     */
+    @ApiModelProperty(value = "请教积分")
+    private BigDecimal meetPoints;
+
     @NotNull(message = "拼团方式不能为空", groups = {AddGroup.class, UpdateGroup.class})
     @ApiModelProperty(value = "拼团方式 0 一对一 1拼团")
     private Integer groupWay;

renren-admin/src/main/java/io/renren/modules/qyh/model/vo/EventRegistrationPayPriceVO.java

@@ -30,6 +30,8 @@ public class EventRegistrationPayPriceVO implements Serializable {
     private BigDecimal deductiblePrice;
     @ApiModelProperty(value = "实付价格")
     private BigDecimal actualPrice;
+    @ApiModelProperty(value = "实付积分")
+    private BigDecimal actualPoints;
     @ApiModelProperty(value = "是否可用积分抵扣 1是 0否")
     private Integer isDeductiblePrice;
 
@@ -39,5 +41,6 @@ public class EventRegistrationPayPriceVO implements Serializable {
         this.money = BigDecimal.ZERO;
         this.deductiblePrice = BigDecimal.ZERO;
         this.actualPrice = BigDecimal.ZERO;
+        this.actualPoints = BigDecimal.ZERO;
     }
 }

renren-admin/src/main/java/io/renren/modules/qyh/model/vo/MyAppointmentInfoVO.java

@@ -52,6 +52,8 @@ public class MyAppointmentInfoVO implements Serializable {
     private String topicName;
     @ApiModelProperty(value = "请教价格")
     private BigDecimal meetPrice;
+    @ApiModelProperty(value = "请教积分")
+    private BigDecimal meetPoints;
     @ApiModelProperty(value = "支付价格")
     private BigDecimal payPrice;
     @ApiModelProperty(value = "积分抵扣（价格）")

renren-admin/src/main/java/io/renren/modules/qyh/service/MeetService.java

@@ -54,6 +54,4 @@ public interface MeetService extends IService<MeetEntity> {
     void deleteByIds(Long[] ids);
 
     Integer myServiceStatistics(Long expertId, List<Integer> newArrayList);
-
-    MemberInfoEntity payCallback(OrderEntity orderEntity);
 }

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/MeetServiceImpl.java

@@ -55,10 +55,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -176,25 +173,17 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
                 throw new RRException("拼团人数不能为空");
             }
             BigDecimal payPrice = NumberUtil.div(topicPrice, groupNumberPeople, 0, RoundingMode.FLOOR);
-            BigDecimal pointsDeduction = NumberUtil.div(topicPoints, groupNumberPeople, 0, RoundingMode.FLOOR);
+            BigDecimal usePoints = NumberUtil.div(topicPoints, groupNumberPeople, 0, RoundingMode.FLOOR);
             actualPrice = payPrice;
-            actualPoints = pointsDeduction;
+            actualPoints = usePoints;
             peopleEntity.setPayPrice(payPrice);
-            peopleEntity.setPointsDeduction(pointsDeduction);
+            peopleEntity.setPointsDeduction(usePoints);
             LocalDateTime groupWayEndTime = LocalDateTime.now().plusHours(48);
             meetEntity.setGroupWayEndTime(groupWayEndTime);
             meetEntity.setMeetType(MeetTypeEnum.IN_A_GROUP.value());
             baseMapper.insert(meetEntity);
         }
-
-        Map<String, String> payFor = null;
-        try {
-            payFor = getPayFor(memberInfoEntity, userId, meetEntity.getId(), expertTopicEntity, topicPrice, actualPrice,
-                now, topicPoints, actualPoints);
-        } catch (Exception e) {
-            throw new RRException("支付失败", e);
-        }
-        return payFor;
+        return pay(memberInfoEntity, actualPoints, meetEntity);
     }
 
     @Override
@@ -275,16 +264,9 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
         BigDecimal topicPoints = expertTopicEntity.getTopicPoints();
 
         BigDecimal payPrice = NumberUtil.div(topicPrice, groupNumberPeople, 0, RoundingMode.FLOOR);
-        BigDecimal pointsDeduction = NumberUtil.div(topicPoints, groupNumberPeople, 0, RoundingMode.FLOOR);
+        BigDecimal usePoints = NumberUtil.div(topicPoints, groupNumberPeople, 0, RoundingMode.FLOOR);
         LocalDateTime now = LocalDateTime.now();
-
-        Map<String, String> payFor = null;
-        try {
-            payFor = getPayFor(memberInfoEntity, userId, meetId, expertTopicEntity, topicPrice, payPrice, now, topicPoints, pointsDeduction);
-        } catch (Exception e) {
-            throw new RRException("支付失败", e);
-        }
-        return payFor;
+        return pay(memberInfoEntity, usePoints, meetEntity);
     }
 
     /**
@@ -307,7 +289,7 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
      * @return
      */
     private Map<String, String> getPayFor(MemberInfoEntity memberInfoEntity, Long userId, Long meetId,
-        ExpertTopicEntity expertTopicEntity, BigDecimal price, BigDecimal actuallyPaid, LocalDateTime payTime, BigDecimal points, BigDecimal pointsDeduction)
+        ExpertTopicEntity expertTopicEntity, BigDecimal price, BigDecimal actuallyPaid, LocalDateTime payTime)
         throws Exception {
         String openid = memberInfoEntity.getOpenid();
         OrderBusinessTypeEnum typeEnum = OrderBusinessTypeEnum.ASK_EXPERTS;
@@ -324,58 +306,32 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
         bo.setPayTime(payTime);
         bo.setPrice(price);
         bo.setActuallyPaid(actuallyPaid);
-        bo.setPoints(points);
-        bo.setPointsDeduction(pointsDeduction);
+        bo.setPointsDeduction(BigDecimal.ZERO);
         bo.setCode(TaskConfigEnum.MEET.code());
-        Map<String, String> returnMap = orderService.payFor(bo);
-        if (actuallyPaid.compareTo(BigDecimal.ZERO) == 0 && pointsDeduction.compareTo(BigDecimal.ZERO) > 0) {
-            // 积分抵扣
-            Integer totalPoints = scoreStuMapper.getTotalPointsByMemberId(memberInfoEntity.getId());
-            if (NumberUtil.isGreater(pointsDeduction, BigDecimal.valueOf(totalPoints))) {
-                throw new RRException("积分不足");
-            }
-            ScoreStu add = new ScoreStu();
-            add.setDay(DateForStr.getInfoDateStr(new Date()));
-            add.setStuId(memberInfoEntity.getId());
-            add.setScoreType(ScoreType.STORE_SCORE.getCode());
-            add.setTaskId(TaskType.WORK_APPLY_DEDUCT.getCode());
-            add.setBusinessId(TaskType.WORK_APPLY_DEDUCT.getCode());
-            add.setScoreEvent(TaskType.WORK_APPLY_DEDUCT.getInfo());
-            add.setScoreValue(NumberUtil.sub(BigDecimal.ZERO, pointsDeduction).intValue());
-            add.setCreateTime(new Date());
-            add.setSurplusScore(NumberUtil.sub(BigDecimal.ZERO, pointsDeduction).intValue() + this.scoreStuService.getTotalScore(memberInfoEntity.getId()));
-            scoreStuMapper.insert(add);
-            String orderNo = returnMap.getOrDefault("orderNo", "");
-            if (StringUtils.isEmpty(orderNo)) {
-                throw new RRException("支付失败");
-            }
-            OrderEntity orderEntity = orderService.loadByPayNo(orderNo, false);
-            if (orderEntity == null) {
-                throw new RRException("支付失败");
-            }
-            payCallback(orderEntity);
-        }
-        return returnMap;
+        return orderService.payFor(bo);
     }
 
-    @Override
-    public MemberInfoEntity payCallback(OrderEntity orderEntity) {
-        BigDecimal money = orderEntity.getActuallyPaid();
-        // if(!NumberUtil.equals(money, NumberUtil.toBigDecimal(totalFee))) {
-        // // 支付失败
-        // returnData.put("return_code", "FAIL");
-        // returnData.put("return_msg", "订单金额不符合");
-        // return StringUtil.GetMapToXML(returnData);
-        // }
-
-        Long businessId = orderEntity.getBusinessId();
-        BigDecimal pointsDeduction = orderEntity.getPointsDeduction();
-        MemberInfoEntity memberInfoEntity = memberInfoService.getById(orderEntity.getMemberId());
-        Long memberId = memberInfoEntity.getId();
+    private Map<String, String> pay(MemberInfoEntity memberInfoEntity, BigDecimal usePoints, MeetEntity meetEntity) {
+        // 积分抵扣
+        Integer totalPoints = scoreStuMapper.getTotalPointsByMemberId(memberInfoEntity.getId());
+        if (NumberUtil.isGreater(usePoints, BigDecimal.valueOf(totalPoints))) {
+            throw new RRException("积分不足");
+        }
+        ScoreStu add = new ScoreStu();
+        add.setDay(DateForStr.getInfoDateStr(new Date()));
+        add.setStuId(memberInfoEntity.getId());
+        add.setScoreType(ScoreType.STORE_SCORE.getCode());
+        add.setTaskId(TaskType.WORK_APPLY_DEDUCT.getCode());
+        add.setBusinessId(TaskType.WORK_APPLY_DEDUCT.getCode());
+        add.setScoreEvent(TaskType.WORK_APPLY_DEDUCT.getInfo());
+        add.setScoreValue(NumberUtil.sub(BigDecimal.ZERO, usePoints).intValue());
+        add.setCreateTime(new Date());
+        add.setSurplusScore(NumberUtil.sub(BigDecimal.ZERO, usePoints).intValue() + this.scoreStuService.getTotalScore(memberInfoEntity.getId()));
+        scoreStuMapper.insert(add);
 
-        MeetEntity meetEntity = getById(businessId);
         Integer groupWay = meetEntity.getGroupWay();
 
+        Long memberId = memberInfoEntity.getId();
         Long expertId = meetEntity.getExpertId();
         LocalDateTime now = LocalDateTime.now();
         Long meetId = meetEntity.getId();
@@ -386,8 +342,7 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
             peopleEntity.setMemberId(memberId);
             peopleEntity.setIsRegimentalCommander(YnEnum.YES.value());
             peopleEntity.setIsMeetFinish(YnEnum.NO.value());
-            peopleEntity.setPayPrice(money);
-            peopleEntity.setPointsDeduction(pointsDeduction);
+            peopleEntity.setPointsDeduction(usePoints);
             peopleEntity.setIsCancelMeet(YnEnum.NO.value());
             peopleEntity.setCreateId(memberId);
             peopleEntity.setUpdateId(memberId);
@@ -408,7 +363,7 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
                         return message;
                     });
 
-            Integer count = meetPeopleService.selectCountByMeetId(businessId);
+            Integer count = meetPeopleService.selectCountByMeetId(meetEntity.getId());
             Integer groupNumberPeople = meetEntity.getGroupNumberPeople();
             if (NumberUtil.equals(groupNumberPeople, count)) {
                 meetEntity.setProcess(MeetProcessEnum.PAYMENT_SUCCESSFUL.value());
@@ -429,7 +384,7 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
         meetEntity.setUpdateTime(now);
         meetEntity.setIsDelete(IsDeleteEnum.NORMAL.value());
         updateById(meetEntity);
-        return memberInfoEntity;
+        return new HashMap<>();
     }
 
     @Override
@@ -458,6 +413,7 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
         ExpertTopicEntity entity = expertTopicService.getById(meetEntity.getTopicId());
         myAppointmentInfoVO.setTopicName(entity.getTopicName());
         myAppointmentInfoVO.setMeetPrice(meetEntity.getMeetPrice());
+        myAppointmentInfoVO.setMeetPoints(meetEntity.getMeetPoints());
 
         MeetPeopleEntity meetPeopleEntity = meetPeopleService.getBaseMapper()
             .selectOne(new LambdaQueryWrapper<MeetPeopleEntity>().eq(MeetPeopleEntity::getMeetId, meetId)
@@ -510,6 +466,7 @@ public class MeetServiceImpl extends ServiceImpl<MeetMapper, MeetEntity> impleme
         ExpertTopicEntity entity = expertTopicService.getById(meetEntity.getTopicId());
         myAppointmentInfoVO.setTopicName(entity.getTopicName());
         myAppointmentInfoVO.setMeetPrice(meetEntity.getMeetPrice());
+        myAppointmentInfoVO.setMeetPoints(meetEntity.getMeetPoints());
         SysUserEntity sysUserEntity = (SysUserEntity)SecurityUtils.getSubject().getPrincipal();
 
         MeetPeopleEntity meetPeopleEntity = meetPeopleService.getByMeetIdAndMemberId(meetId, sysUserEntity.getUserId());

renren-admin/src/main/java/io/renren/modules/qyh/service/impl/OrderServiceImpl.java

@@ -134,17 +134,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderEntity> impl
                 break;
             }
         }
-        Map<String, String> map = new HashMap<>();
-        if (bo.getActuallyPaid().compareTo(BigDecimal.ZERO) > 0) {
-            PayInfo payInfo = new PayInfo();
-            payInfo.setOpenId(bo.getOpenid());
-            payInfo.setNotifyUrl(bo.getNotifyUrl());
-            payInfo.setOrderNo(orderNo);
-            payInfo.setMoney(bo.getActuallyPaid().multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString());
-            String value = getIsOneCentPay();
-            payInfo.setIsOneCentPay(BooleanUtil.toBoolean(value));
-            map = WxController.wxPayFunction(payInfo);
-        }
+        PayInfo payInfo = new PayInfo();
+        payInfo.setOpenId(bo.getOpenid());
+        payInfo.setNotifyUrl(bo.getNotifyUrl());
+        payInfo.setOrderNo(orderNo);
+        payInfo.setMoney(bo.getActuallyPaid().multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString());
+        String value = getIsOneCentPay();
+        payInfo.setIsOneCentPay(BooleanUtil.toBoolean(value));
+        Map<String, String> map = WxController.wxPayFunction(payInfo);
         OrderEntity orderEntity = new OrderEntity();
         BeanCopyUtils.copyPropertiesIgnoreNull(bo, orderEntity);
         orderEntity.setPayNo(orderNo);
@@ -259,9 +256,77 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderEntity> impl
                 returnData.put("return_msg", "return_code不正确");
                 return StringUtil.GetMapToXML(returnData);
             } else {
+                BigDecimal money = orderEntity.getActuallyPaid();
+                // if(!NumberUtil.equals(money, NumberUtil.toBigDecimal(totalFee))) {
+                // // 支付失败
+                // returnData.put("return_code", "FAIL");
+                // returnData.put("return_msg", "订单金额不符合");
+                // return StringUtil.GetMapToXML(returnData);
+                // }
+
+                Long businessId = orderEntity.getBusinessId();
+                BigDecimal pointsDeduction = orderEntity.getPointsDeduction();
+                MemberInfoEntity memberInfoEntity = memberInfoService.getById(orderEntity.getMemberId());
+                Long memberId = memberInfoEntity.getId();
+
+                MeetEntity meetEntity = meetService.getById(businessId);
+                Integer groupWay = meetEntity.getGroupWay();
+
+                Long expertId = meetEntity.getExpertId();
+                LocalDateTime now = LocalDateTime.now();
+                Long meetId = meetEntity.getId();
+                if (NumberUtil.equals(groupWay, YnEnum.YES.value())) {
+                    MeetPeopleEntity peopleEntity = new MeetPeopleEntity();
+                    peopleEntity.setMeetId(meetId);
+                    peopleEntity.setExpertId(expertId);
+                    peopleEntity.setMemberId(memberId);
+                    peopleEntity.setIsRegimentalCommander(YnEnum.YES.value());
+                    peopleEntity.setIsMeetFinish(YnEnum.NO.value());
+                    peopleEntity.setPayPrice(money);
+                    peopleEntity.setPointsDeduction(pointsDeduction);
+                    peopleEntity.setIsCancelMeet(YnEnum.NO.value());
+                    peopleEntity.setCreateId(memberId);
+                    peopleEntity.setUpdateId(memberId);
+                    peopleEntity.setCreateTime(now);
+                    peopleEntity.setUpdateTime(now);
+                    peopleEntity.setIsDelete(IsDeleteEnum.NORMAL.value());
+                    meetPeopleService.save(peopleEntity);
+                    meetEntity.setProcess(MeetProcessEnum.RESERVE.value());
+                    meetEntity.setMeetType(MeetTypeEnum.IN_A_GROUP.value());
+
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("meetId", meetId);
+                    rabbitTemplate.convertAndSend(QueueConstant.MEET_EXPIRATION_MS_QUEUE, jsonObject.toString(),
+                        message -> {
+                            MessageProperties messageProperties = message.getMessageProperties();
+                            long millis = LocalDateTimeUtil.between(now, now.plusDays(2)).toMillis();
+                            messageProperties.setExpiration(String.valueOf(millis));
+                            return message;
+                        });
+
+                    Integer count = meetPeopleService.selectCountByMeetId(businessId);
+                    Integer groupNumberPeople = meetEntity.getGroupNumberPeople();
+                    if (NumberUtil.equals(groupNumberPeople, count)) {
+                        meetEntity.setProcess(MeetProcessEnum.PAYMENT_SUCCESSFUL.value());
+                        meetEntity.setMeetType(MeetTypeEnum.RESERVATION.value());
+
+                    }
+                } else if (NumberUtil.equals(groupWay, YnEnum.NO.value())) {
+                    meetEntity.setProcess(MeetProcessEnum.PAYMENT_SUCCESSFUL.value());
+                    meetEntity.setMeetType(MeetTypeEnum.RESERVATION.value());
+                    MeetPeopleEntity meetPeopleEntity = meetPeopleService.getBaseMapper()
+                        .selectOne(new LambdaQueryWrapper<MeetPeopleEntity>().eq(MeetPeopleEntity::getMeetId, meetId)
+                            .orderByDesc(MeetPeopleEntity::getCreateTime).last("limit 1"));
+                    if(ObjectUtil.isNotNull(meetPeopleEntity)) {
+                        meetPeopleEntity.setIsDelete(IsDeleteEnum.NORMAL.value());
+                        meetPeopleService.save(meetPeopleEntity);
+                    }
+                }
+                meetEntity.setUpdateTime(now);
+                meetEntity.setIsDelete(IsDeleteEnum.NORMAL.value());
+                meetService.updateById(meetEntity);
                 returnData.put("return_code", "SUCCESS");
                 returnData.put("return_msg", "OK");
-                MemberInfoEntity memberInfoEntity = meetService.payCallback(orderEntity);
                 String bussNo = new Snowflake().nextIdStr();
 
                 orderEntity.setPayStatus(YnEnum.YES.value());
@@ -278,9 +343,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderEntity> impl
                 wxConsumeInfoEntity.setInputime(new Date());
                 wxConsumeInfoEntity.setIsread("0");
                 wxConsumeInfoEntity.setIsdelete("0");
-                wxConsumeInfoEntity.setBusinessId(orderEntity.getBusinessId());
+                wxConsumeInfoEntity.setBusinessId(meetId);
                 wxConsumeInfoEntity.setCode(TaskConfigEnum.MEET.code());
                 wxConsumeInfoService.save(wxConsumeInfoEntity);
+
             }
             // 支付成功 把订单号插入到redis里面，前端请求接口查看支付状态,有效期七天
             redisUtils.set("orderNo:" + payNo, "会员订单编号", 7 * 60 * 60 * 24);

renren-admin/src/main/resources/mapper/qmgj/ActivityDao.xml

@@ -110,6 +110,7 @@
         a.city,
         a.is_need_vip,
         a.money,
+        a.points,
         a.create_time,
         a.address,
         a.is_publish,
@@ -155,6 +156,7 @@
         a.city,
         a.is_need_vip,
         a.money,
+        a.points,
         a.create_time,
         a.address
         FROM
@@ -215,6 +217,7 @@
         a.city,
         a.is_need_vip,
         a.money,
+        a.points,
         a.create_time,
         a.address,
         a.is_publish,

renren-admin/src/main/resources/mapper/qmgj/FavoriteInfoDao.xml

@@ -47,6 +47,7 @@
             <result property="startTime" column="start_time"/>
             <result property="thumbnailImg" column="thumbnail_img"/>
             <result property="money" column="money"/>
+            <result property="points" column="points"/>
         </association>
     </resultMap>
 
@@ -90,7 +91,8 @@
             a.willnum,
             a.start_time,
             a.thumbnail_img,
-	        a.money
+	        a.money,
+	        a.points
         FROM
           favorite_info AS f
         LEFT JOIN tb_activity AS a ON f.sid = a.id

renren-admin/src/main/resources/mapper/qmjz/GoodsMapper.xml

@@ -24,6 +24,7 @@
         <result property="createId" column="create_id"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateId" column="update_id"/>
+        <result property="points" column="points"/>
     </resultMap>
 
     <sql id="selectGoodsVo">

renren-admin/src/main/resources/mapper/qyh/MeetDao.xml

@@ -25,6 +25,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="isDelete" column="is_delete"/>
         <result property="verifyTime" column="verify_time"/>
+        <result property="meetPoints" column="meet_points"/>
     </resultMap>
     <select id="selectGroupList" resultType="io.renren.modules.qyh.model.vo.GroupListVO">
         SELECT

renren-admin/src/main/resources/statics/js/modules/qmgj/assess.js

@@ -407,10 +407,10 @@ layui.use([ 'layer', 'form'],function() {
 			return false;
 		} else {
 			if (vm.activity.isNeedVip != 1) {
-				vm.activity.money = 0;
+				vm.activity.points = 0;
 			} else {
-				if (vm.activity.money <=0){
-					layer.msg('[缴费金额]需大于0',{icon:5});
+				if (vm.activity.points <=0){
+					layer.msg('[缴费积分]需大于0',{icon:5});
 					return false;
 				}
 			}

renren-admin/src/main/resources/statics/js/modules/qyh/goods.js

@@ -338,7 +338,7 @@ var vm = new Vue({
             vm.work.categoryId = '';
             vm.work.thumbnail = '';
             vm.work.bannerImg = '';
-            vm.work.price = '';
+            vm.work.points = '';
             vm.work.quantity = '';
             vm.work.details = '';
             vm.work.descriptions = '';
@@ -545,8 +545,8 @@ layui.use([ 'layer', 'form'],function() {
                 return false;
             }
         }
-        if (vm.work.price == '' || vm.work.price == undefined){
-            layer.msg('[商品价格]不能为空',{icon:5});
+        if (vm.work.points == '' || vm.work.points == undefined){
+            layer.msg('[商品积分]不能为空',{icon:5});
             return false;
         }
         if (vm.work.quantity == '' || vm.work.quantity == undefined){

renren-admin/src/main/resources/templates/modules/qmgj/activity.html

@@ -190,9 +190,9 @@
                 </div>
             </div>
             <div class="form-group">
-                <div class="col-sm-2 control-label"><span style="color: red">*</span>缴费金额</div>
+                <div class="col-sm-2 control-label"><span style="color: red">*</span>缴费积分</div>
                 <div class="col-sm-4">
-                    <input type="text" class="form-control" v-model="activity.money" placeholder="若不需要交费，请填0；否则，请填大于0的金额" oninput="num(this)" lay-verify="required"/>
+                    <input type="text" class="form-control" v-model="activity.points" placeholder="若不需要交费，请填0；否则，请填大于0的金额" oninput="num(this)" lay-verify="required"/>
                 </div>
             </div>
             <div class="form-group">

renren-admin/src/main/resources/templates/modules/qyh/goods.html

@@ -121,9 +121,9 @@
                 </div>
             </div>
             <div class="form-group">
-                <div class="col-sm-2 control-label"><span style="color: #ff0000">*</span>商品价格</div>
+                <div class="col-sm-2 control-label"><span style="color: #ff0000">*</span>商品积分</div>
                 <div class="col-sm-4">
-                    <input type="text" class="form-control"  v-model="work.price" placeholder="商品价格" lay-verify="required"/>
+                    <input type="text" class="form-control"  v-model="work.points" placeholder="商品积分" lay-verify="required" oninput="num(this)"/>
                 </div>
             </div>
             <div class="form-group">

renren-admin/src/main/resources/templates/modules/qyh/meet.html

@@ -130,8 +130,8 @@
             <div class="content">{{ wjxyMeet.topicName }}</div>
         </div>
         <div class="item">
-            <div class="name">请教价:</div>
-            <div class="content">{{wjxyMeet.meetPrice}}元</div>
+            <div class="name">请教积分:</div>
+            <div class="content">{{wjxyMeet.meetPoints}}积分</div>
         </div>
         <div class="item">
             <div class="name">请教方式:</div>