行家话题积分

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

@@ -83,4 +83,13 @@ public class WgFillInfoEntity implements Serializable {
 	 * 终身价格
 	 */
 	private BigDecimal lifelongPrice;
+	/**
+	 * 充一年会员赠送的积分
+	 */
+	private BigDecimal yearlyBonusPoints;
+
+	/**
+	 * 充终身会员赠送的积分
+	 */
+	private BigDecimal lifelongBonusPoints;
 }

renren-admin/src/main/java/io/renren/modules/qyh/api/ApiExpertController.java

@@ -36,6 +36,8 @@ public class ApiExpertController {
         @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
         @ApiImplicitParam(name = "startTopicPrice", value = "价格开始值", paramType = "query", dataType = "int"),
         @ApiImplicitParam(name = "endTopicPrice", value = "价格结束值", paramType = "query", dataType = "int"),
+        @ApiImplicitParam(name = "startTopicPoints", value = "积分开始值", paramType = "query", dataType = "int"),
+        @ApiImplicitParam(name = "endTopicPoints", value = "积分结束值", paramType = "query", dataType = "int"),
         @ApiImplicitParam(name = "city", value = "市", paramType = "query", dataType = "Long"),
         @ApiImplicitParam(name = "goodLabelsId", value = "擅长标签Id", paramType = "query", dataType = "Long"),})
     public R greatGodGangPage(@RequestParam Map<String, Object> params) {

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

@@ -70,4 +70,9 @@ public class ExpertTopicEntity implements Serializable {
 	 */
 	private String isDelete;
 
+	/**
+	 * 话题积分
+	 */
+	private BigDecimal topicPoints;
+
 }

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

@@ -45,12 +45,20 @@ public class ExpertTopicDTO implements Serializable {
     @ApiModelProperty(value = "话题描述")
     private String topicDescribe;
 
-    @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 topicPrice;
 
+    /**
+     * 话题积分
+     */
+    @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;
+
     @NotNull(message = "状态不能为空", groups = {AddGroup.class, UpdateGroup.class})
     @ApiModelProperty(value = "状态 1启用 0禁用")
     private Integer status;

renren-admin/src/main/java/io/renren/modules/qyh/model/query/GreatGodGangQuery.java

@@ -33,6 +33,10 @@ public class GreatGodGangQuery implements Serializable {
     private Integer startTopicPrice;
     @ApiModelProperty(value = "截至价格")
     private Integer endTopicPrice;
+    @ApiModelProperty(value = "起始积分")
+    private Integer startTopicPoints;
+    @ApiModelProperty(value = "截至积分")
+    private Integer endTopicPoints;
     @ApiModelProperty(value = "约见方式（保留字段）")
     private Integer howToMakeAnAppointment;
     @ApiModelProperty(value = "城市")

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

@@ -84,6 +84,7 @@ public class ExpertVO implements Serializable {
     private String openid;
     @ApiModelProperty(value = "话题价格")
     private BigDecimal topicPrice;
-
+    @ApiModelProperty(value = "话题积分")
+    private BigDecimal topicPoints;
 
 }

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

@@ -54,6 +54,8 @@ public class GreatGodGangVO implements Serializable {
 
     @ApiModelProperty(value = "话题价格")
     private BigDecimal topicPrice;
+    @ApiModelProperty(value = "话题积分")
+    private BigDecimal topicPoints;
     @ApiModelProperty(value = "擅长标签")
     private String goodLabels;
     @ApiModelProperty(value = "擅长标签")

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -33,4 +34,6 @@ public class MyServicePageVO implements Serializable {
     private Integer process;
     @ApiModelProperty(value = "话题价格")
     private Integer topicPrice;
+    @ApiModelProperty(value = "话题积分")
+    private BigDecimal topicPoints;
 }

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

@@ -119,6 +119,7 @@ public class ExpertServiceImpl extends ServiceImpl<ExpertMapper, ExpertEntity> i
                         expertTopicEntities.stream().map(ExpertTopicEntity::getTopicName).collect(Collectors.toList());
                     ExpertTopicEntity entity = expertTopicEntities.get(0);
                     record.setTopicPrice(entity.getTopicPrice());
+                    record.setTopicPoints(entity.getTopicPoints());
 
                 }
                 record.setTopicList(topicNameList);
@@ -194,6 +195,7 @@ public class ExpertServiceImpl extends ServiceImpl<ExpertMapper, ExpertEntity> i
         if (CollectionUtil.isNotEmpty(listByExpertId)) {
             ExpertTopicEntity entity = listByExpertId.get(0);
             info.setTopicPrice(entity.getTopicPrice());
+            info.setTopicPoints(entity.getTopicPoints());
         }
         MemberInfoEntity memberInfoEntity = memberInfoService.memberById(info.getMemberId());
         if (ObjectUtil.isNotNull(memberInfoEntity)) {

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

@@ -124,7 +124,7 @@ public class ExpertTopicServiceImpl extends ServiceImpl<ExpertTopicMapper, Exper
     public List<ExpertTopicEntity> getListByExpertId(Long expertId) {
         return baseMapper.selectList(
             new LambdaQueryWrapper<ExpertTopicEntity>().eq(ExpertTopicEntity::getIsDelete, IsDeleteEnum.NORMAL.value())
-                .eq(ExpertTopicEntity::getExpertId, expertId).orderByAsc(ExpertTopicEntity::getTopicPrice)
+                .eq(ExpertTopicEntity::getExpertId, expertId).orderByAsc(ExpertTopicEntity::getTopicPoints)
                 .orderByDesc(ExpertTopicEntity::getCreateTime));
     }
 

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

@@ -18,6 +18,8 @@
         <result property="workFlowImg" column="work_flow_img"/>
         <result property="perYearPrice" column="per_year_price"/>
         <result property="lifelongPrice" column="lifelong_price"/>
+        <result property="yearlyBonusPoints" column="yearly_bonus_points"/>
+        <result property="lifelongBonusPoints" column="lifelong_bonus_points"/>
     </resultMap>
 
     <!--查询所有补缺内容  【全部案例库列表】-->

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

@@ -97,6 +97,12 @@
                     AND wet.topic_price <= #{params.endTopicPrice}
                 ]]>
             </if>
+            <if test="params.startTopicPoints != null and params.endTopicPoints != null">
+                <![CDATA[
+                    AND wet.topic_points >= #{params.startTopicPoints}
+                    AND wet.topic_points <= #{params.endTopicPoints}
+                ]]>
+            </if>
             <if test="params.city != null and params.city != ''">
                 AND we.city = #{params.city}
             </if>

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

@@ -9,6 +9,7 @@
         <result property="topicName" column="topic_name"/>
         <result property="topicDescribe" column="topic_describe"/>
         <result property="topicPrice" column="topic_price"/>
+        <result property="topicPoints" column="topic_points"/>
         <result property="status" column="status"/>
         <result property="createId" column="create_id"/>
         <result property="createTime" column="create_time"/>

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

@@ -114,12 +114,18 @@
                 <div class="col-sm-4">
                     <input type="text" class="form-control" v-model="wgFillInfo.perYearPrice" placeholder="请输入会员价格" oninput="num(this)"/>
                 </div>
+                <div class="col-sm-4">
+                    <input type="text" class="form-control" v-model="wgFillInfo.yearlyBonusPoints" placeholder="请输入赠送积分" oninput="intnum(this)"/>
+                </div>
             </div>
             <div class="form-group">
                 <div class="col-sm-2 control-label">青创生长（终身）</div>
                 <div class="col-sm-4">
                     <input type="text" class="form-control" v-model="wgFillInfo.lifelongPrice" placeholder="请输入会员价格" oninput="num(this)"/>
                 </div>
+                <div class="col-sm-4">
+                    <input type="text" class="form-control" v-model="wgFillInfo.lifelongBonusPoints" placeholder="请输入赠送积分" oninput="intnum(this)"/>
+                </div>
             </div>
             <div class="form-group">
                 <div class="col-sm-2 control-label"></div>