活动积分

renren-admin/src/main/java/io/renren/modules/qmjz/api/ApiGoodsApplyController.java

@@ -3,7 +3,9 @@ package io.renren.modules.qmjz.api;
 //import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.renren.common.utils.R;
+import io.renren.modules.qmjz.entity.GoodsApplyEntity;
 import io.renren.modules.qmjz.entity.bo.GoodsApplyBo;
 import io.renren.modules.qmjz.service.GoodsApplyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,4 +38,20 @@ public class ApiGoodsApplyController {
         return R.ok();
     }
 
+    /**
+     * 查是否报名
+     */
+    @PostMapping("/isRegistration")
+    public R isRegistration(@Validated @RequestBody GoodsApplyBo bo) {
+        Integer count = goodsApplyService.count(
+                new LambdaQueryWrapper<GoodsApplyEntity>()
+                        .eq(GoodsApplyEntity::getUserId, bo.getUserId())
+                        .eq(GoodsApplyEntity::getGoodsId, bo.getGoodsId())
+        );
+        if (count > 0) {
+            return R.ok().put("data", true);
+        }
+        return R.ok().put("data", false);
+    }
+
 }

renren-admin/src/main/java/io/renren/modules/qmjz/service/impl/GoodsApplyServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.renren.common.exception.RRException;
 import io.renren.common.utils.PageUtils;
 import io.renren.modules.qmjz.entity.GoodsApplyEntity;
 import io.renren.modules.qmjz.entity.GoodsEntity;
@@ -58,6 +59,10 @@ public class GoodsApplyServiceImpl extends ServiceImpl<GoodsApplyMapper, GoodsAp
         }
         GoodsEntity goodsEntity = goodsService.loadById(bo.getGoodsId(), true);
         BigDecimal points = goodsEntity.getPoints();
+        Integer totalScore = scoreStuService.getTotalScore(bo.getUserId());
+        if (BigDecimal.valueOf(totalScore).compareTo(points) < 0) {
+            throw new RRException("积分不够报名!");
+        }
         //扣积分
         ScoreStu add = new ScoreStu();
         add.setDay(DateForStr.getInfoDateStr(new Date()));

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

@@ -594,9 +594,9 @@ $(function () {
             { label: 'id', name: 'id', index: 'id', width: 50, key: true, hidden: true },
             { label: '姓名', name: 'userName', index: 'user_name', width: 80, sortable:false },
             { label: '电话', name: 'phone', width: 80, sortable:false },
-            { label: '学校', name: 'college', width: 80, sortable:false
+            { label: '学校', name: 'collegeName', width: 80, sortable:false
                 , formatter: function (cellvalue, options, rowObject) {
-                    return rowObject.schoolName || rowObject.collegeName
+                    return rowObject.schoolName || rowObject.collegeName || ''
                 }
             },
             { label: '商品名称', name: 'goodsName', index: 'goods_name', width: 80, sortable:false },

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

@@ -13,7 +13,7 @@ $(function () {
             { label: '请教方式', name: 'type', index: 'type', width: 80,formatter: function (cellvalue, options, rowdata) {
                         return '线下请教'
                 } },
-            { label: '请教价格', name: 'payPrice', index: 'payPrice', width: 80 },
+            { label: '请教积分', name: 'pointsDeduction', index: 'pointsDeduction', width: 80 },
             { label: '预约时间', name: 'appointmentTime', index: 'appointmentTime', width: 80 },
             { label: '预约话题', name: 'topicName', index: 'topicName', width: 80 },
 			{ label: '拼团方式', name: 'groupWay', index: 'group_way', width: 80,formatter: function (cellvalue, options, rowdata) {

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

@@ -43,36 +43,18 @@
                             <input type="text" readonly="readonly" class="form-control" v-model="wjxyStudentStatus.realName" />
                         </div>
                     </div>
-                    <div class="form-group">
-                        <div class="col-sm-2 control-label">身份证号</div>
-                        <div class="col-sm-10">
-                            <input type="text" readonly="readonly" class="form-control" v-model="wjxyStudentStatus.identityNumber" />
-                        </div>
-                    </div>
             <div class="form-group">
                 <div class="col-sm-2 control-label">联系电话</div>
                 <div class="col-sm-10">
                     <input type="number" class="form-control" readonly="readonly" v-model="wjxyStudentStatus.phoneMember" />
                 </div>
             </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label">所属地区</div>
-                <div class="col-sm-10">
-                    <input type="text" readonly="readonly" class="form-control" v-model="address" />
-                </div>
-            </div>
             <div class="form-group">
                 <div class="col-sm-2 control-label">学校名称</div>
                 <div class="col-sm-10">
                     <input type="text" readonly="readonly" class="form-control" v-model="wjxyStudentStatus.schoolName" />
                 </div>
             </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label">所属院系</div>
-                <div class="col-sm-10">
-                    <input type="text" readonly="readonly" class="form-control" v-model="wjxyStudentStatus.faculty" />
-                </div>
-            </div>
             <div class="form-group">
                 <div class="col-sm-2 control-label">所属专业</div>
                 <div class="col-sm-10">
@@ -103,12 +85,6 @@
                     <input type="text" readonly="readonly" class="form-control" v-model="wjxyStudentStatus.consultingTeacher" />
                 </div>
             </div>
-            <div class="form-group">
-                <div class="col-sm-2 control-label">指导老师</div>
-                <div class="col-sm-10">
-                    <input type="text" readonly="readonly" class="form-control" v-model="wjxyStudentStatus.inviteTeacher" />
-                </div>
-            </div>
             <div class="form-group">
                         <div class="col-sm-2 control-label">申请时间</div>
                         <div class="col-sm-10">