添加企业购会员领取和点播课领取配置

src/main/java/com/qkdata/biz/management/service/OrganizationService.java

@@ -135,6 +135,7 @@ public class OrganizationService extends BaseServiceImpl<OrganizationMapper, Org
         po.setCity(model.getCity());
         po.setAddress(model.getAddress());
         po.setVipReceive(VipReceiveEnum.CLOSE);
+        po.setCourseReceive(VipReceiveEnum.CLOSE);
         save(po);
         return po.getId();
     }

src/main/java/com/qkdata/biz/management/vo/QueryMemberModel.java

@@ -8,4 +8,5 @@ public class QueryMemberModel {
     private int pageIndex = Constants.DEFAULT_PAGE;
     private int pageSize = Constants.DEFAULT_PAGE_SIZE;
     private String username;
+    private Long orgId;
 }

src/main/java/com/qkdata/biz/web/controller/MyEnterpriseController.java

 package com.qkdata.biz.web.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Maps;
 import com.qkdata.biz.common.BizConstants;
 import com.qkdata.biz.enums.AccountTypeEnum;
+import com.qkdata.biz.enums.OrgTypeEnum;
 import com.qkdata.biz.enums.ProductTypeEnum;
 import com.qkdata.biz.management.entity.OrgSurplusPO;
 import com.qkdata.biz.management.entity.OrganizationPO;
-import com.qkdata.biz.management.service.CourseService;
-import com.qkdata.biz.management.service.OrgSurplusService;
-import com.qkdata.biz.management.service.OrgUserReceiveRecordService;
-import com.qkdata.biz.management.service.OrganizationService;
-import com.qkdata.biz.management.vo.MemberInfoModel;
+import com.qkdata.biz.management.mapper.CourseMapper;
+import com.qkdata.biz.management.service.*;
+import com.qkdata.biz.management.vo.*;
 import com.qkdata.biz.sys.service.SysUserService;
 import com.qkdata.biz.web.vo.*;
 import com.qkdata.common.base.exception.BusinessException;
@@ -24,6 +24,9 @@ import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.rmi.MarshalledObject;
+import java.util.Map;
+
 @Api(tags = "我的企业相关接口-手机端")
 @RestController
 @RequestMapping("/api/myEnterPrise")
@@ -38,6 +41,10 @@ public class MyEnterpriseController {
     private OrgSurplusService orgSurplusService;
     @Autowired
     private OrgUserReceiveRecordService orgUserReceiveRecordService;
+    @Autowired
+    private MemberService memberService;
+    @Autowired
+    private ProductOrderService orderService;
 
     @ApiOperation("获取我的企业信息")
     @GetMapping("/info")
@@ -110,8 +117,64 @@ public class MyEnterpriseController {
         orgService.updateById(orgInfo);
         return Result.succeed("ok");
     }
-//    @ApiOperation("企业成员列表")
-//    @PostMapping("/member/list")
-//    @RequiresRoles(value = BizConstants.ROLE_ENTERPRISE_ADMIN)
-//    public PageResult<MemberInfoModel>
+    @ApiOperation("企业成员列表")
+    @PostMapping("/member/list")
+    @RequiresRoles(value = BizConstants.ROLE_ENTERPRISE_ADMIN)
+    public PageResult<MemberListModel> memberList(@RequestBody QueryMemberModel model){
+        if (model.getOrgId() == null){
+            throw new BusinessException("请求参数错误，企业ID不能为空");
+        }
+        return memberService.queryPage(model);
+    }
+    @ApiOperation("获取企业成员详情")
+    @GetMapping("/memeber/detail")
+    @RequiresRoles(value = BizConstants.ROLE_ENTERPRISE_ADMIN)
+    public Result<Map<String ,Object>> memberDetail(@RequestParam String username){
+        Map<String,Object> map = Maps.newConcurrentMap();
+        MemberInfoModel memberInfo = memberService.getByUsername(username,true);
+        map.put("memberInfo",memberInfo);
+        QueryReceiveHistoryModel query = new QueryReceiveHistoryModel();
+        query.setUserId(UserContext.getUserId());
+        PageResult<OrgUserReceiveRecordModel> pageResult = orgUserReceiveRecordService.queryPageList(query );
+        map.put("receiveRecordList",pageResult);
+        return Result.succeed(map);
+    }
+    @ApiOperation("获取企业会员、点播库领取配置")
+    @GetMapping("/receiveConfig")
+    @RequiresRoles(value = BizConstants.ROLE_ENTERPRISE_ADMIN)
+    public Result<EnterpriesReceiveConfig> receiveConfig(){
+        EnterpriesReceiveConfig config = new EnterpriesReceiveConfig();
+        Long userId = UserContext.getUserId();
+        Long orgId = userService.getUserEnterpriesId(userId);
+        OrganizationPO po = orgService.getById(orgId);
+        if (po != null && po.getType() == OrgTypeEnum.ENTERPRISE){
+            config.setVipReceive(po.getVipReceive());
+            config.setCourseReceive(po.getCourseReceive());
+        }
+        return Result.succeed(config);
+    }
+    @ApiOperation("修改企业会员、点播库领取配置")
+    @GetMapping("/receiveConfig/save")
+    @RequiresRoles(value = BizConstants.ROLE_ENTERPRISE_ADMIN)
+    public Result<String> receiveConfigSave(@RequestBody EnterpriesReceiveConfig model){
+        EnterpriesReceiveConfig config = new EnterpriesReceiveConfig();
+        Long userId = UserContext.getUserId();
+        Long orgId = userService.getUserEnterpriesId(userId);
+        OrganizationPO po = orgService.getById(orgId);
+        if (po != null && po.getType() == OrgTypeEnum.ENTERPRISE){
+            po.setVipReceive(model.getVipReceive());
+            po.setCourseReceive(model.getCourseReceive());
+            orgService.updateById(po);
+        }
+        return Result.succeed("ok");
+    }
+
+//    @ApiOperation("企业购买记录列表")
+//    @PostMapping("/order/list")
+//    @RequiresRoles(value = {BizConstants.ROLE_ENTERPRISE_ADMIN})
+//    public PageResult<ProductOrderModel> userOrderList(@RequestBody QueryProductOrderModel model){
+//        model.setUsername(UserContext.getUser().getUsername());
+//        return orderService.queryPageList(model);
+//    }
+
 }

src/main/java/com/qkdata/biz/web/vo/EnterpriesReceiveConfig.java

+package com.qkdata.biz.web.vo;
+
+import com.qkdata.biz.enums.VipReceiveEnum;
+import lombok.Data;
+
+@Data
+public class EnterpriesReceiveConfig {
+    private VipReceiveEnum vipReceive;
+    private VipReceiveEnum courseReceive;
+}

src/main/resources/mappers/sys/SysUserExtMapper.xml

@@ -23,6 +23,9 @@
         <if test="p.username != null and p.username != ''">
             and u.username like concat('%',#{p.username},'%')
         </if>
+        <if test="p.orgId != null">
+            and e.enterprise_id = #{p.orgId}
+        </if>
         ORDER BY u.last_login_time desc
     </select>
     <select id="getByUsername" resultType="com.qkdata.biz.management.vo.MemberInfoModel">