企业认证加下架

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

@@ -72,6 +72,7 @@ public class ApiEnterpriseController {
     })
     public R page(@RequestParam Map<String, Object> params) {
         params.put("status", EnterpriseStatusEnum.PAID.value());
+        params.put("upDownFlag", true);
         return R.ok().put("page", enterpriseService.queryApiPage(params));
     }
 

renren-admin/src/main/java/io/renren/modules/qyh/controller/EnterpriseController.java

@@ -57,8 +57,8 @@ public class EnterpriseController extends AbstractController {
     @PostMapping("/down")
     @ApiOperation("下架")
     @RequiresPermissions("qyh:enterprise:down")
-    public R down(@RequestBody List<Long> ids) {
-        enterpriseService.downOrVip(ids);
+    public R down(@RequestBody Long id) {
+        enterpriseService.down(id);
         return R.ok();
     }
 }

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

@@ -115,5 +115,9 @@ public class EnterpriseEntity implements Serializable {
      * 是否删除(0正常 -1删除)
      */
     private String isDelete;
+    /**
+     * 是否上下架
+     */
+    private Boolean upDownFlag;
 
 }

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

@@ -99,5 +99,8 @@ public class EnterpriseDTO implements Serializable {
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "审核时间")
 	private LocalDateTime auditTime;
-
+	/**
+	 * 是否上下架
+	 */
+	private Boolean upDownFlag;
 }

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

@@ -86,5 +86,8 @@ public class EnterpriseVO implements Serializable {
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "缴费时间")
 	private LocalDateTime payTime;
-
+	/**
+	 * 是否上下架
+	 */
+	private Boolean upDownFlag;
 }

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

@@ -45,6 +45,6 @@ public interface EnterpriseService extends IService<EnterpriseEntity> {
 
     PageUtils orderPage(Map<String, Object> params);
 
-    void downOrVip(List<Long> ids);
+    void down(Long id);
 }
 

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

@@ -6,7 +6,6 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -55,7 +54,6 @@ import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -383,10 +381,13 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void downOrVip(List<Long> ids) {
-        baseMapper.update(null, new LambdaUpdateWrapper<EnterpriseEntity>()
-                .in(EnterpriseEntity::getId, ids)
-                .set(EnterpriseEntity::getStatus, EnterpriseStatusEnum.DOWN.value()));
+    public void down(Long id) {
+        EnterpriseEntity enterpriseEntity = baseMapper.selectById(id);
+        if (enterpriseEntity == null) {
+            throw new RRException("企业不存在");
+        }
+        enterpriseEntity.setUpDownFlag(!enterpriseEntity.getUpDownFlag());
+        baseMapper.updateById(enterpriseEntity);
     }
 
     private void validateEnterpriseExists(EnterpriseDTO dto) {

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

@@ -50,6 +50,9 @@
             <if test="params.contactPhone != null and params.contactPhone != ''">
                 AND qe.`contact_phone` LIKE CONCAT('%',#{params.contactPhone},'%')
             </if>
+            <if test="params.upDownFlag != null">
+                AND qe.`up_down_flag` = #{params.upDownFlag}
+            </if>
         </where>
         ORDER BY qe.create_time DESC
     </select>
@@ -73,6 +76,9 @@
             <if test="params.contactPhone != null and params.contactPhone != ''">
                 AND qe.`contact_phone` LIKE CONCAT('%',#{params.contactPhone},'%')
             </if>
+            <if test="params.upDownFlag != null">
+                AND qe.`up_down_flag` = #{params.upDownFlag}
+            </if>
         </where>
         ORDER BY qe.create_time DESC
     </select>

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

@@ -19,6 +19,13 @@ $(function () {
                         return '已过期'
                     }
                 } },
+            { label: '是否上下架', name: 'upDownFlag', index: 'upDownFlag', width: 80, formatter:function (cellvalue, options, rowdata) {
+                        if(cellvalue == 1) {
+                            return '已上架'
+                        } else if(cellvalue == 0) {
+                            return '已下架'
+                        }
+                    } },
         ],
 		viewrecords: true,
         height: 385,
@@ -183,8 +190,8 @@ var vm = new Vue({
             });
 		},
         down: function (event) {
-            var ids = getSelectedRows();
-            if(ids == null){
+            var id = getSelectedRow();
+            if(id == null){
                 return ;
             }
             var lock = false;
@@ -197,7 +204,7 @@ var vm = new Vue({
                         type: "POST",
                         url: baseURL + "qyh/enterprise/down",
                         contentType: "application/json",
-                        data: JSON.stringify(ids),
+                        data: JSON.stringify(id),
                         success: function(r){
                             if(r.code == 0){
                                 layer.msg("操作成功", {icon: 1});

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

@@ -105,6 +105,12 @@
                     <option value="2" >已缴费</option>
                     <option value="3" >已过期</option>
                 </select>
+                <select class="form-control" v-model="queryParam.upDownFlag">
+                    <option value="" disabled hidden>--选择上下架--</option>
+                    <option value="" >全部</option>
+                    <option value="1" >已上架</option>
+                    <option value="0" >已下架</option>
+                </select>
                 <a class="btn btn-query" @click="query"><i class="fa fa-search"></i>&nbsp;查询</a>
                 <a class="btn btn-success" @click="reset"><i class="fa fa-refresh"></i>&nbsp;刷新</a>
             </div>