update 会员组

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java

@@ -1,9 +1,13 @@
 package com.jsowell.pile.service.impl;
 
+import com.google.common.collect.Lists;
 import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.id.IdUtils;
 import com.jsowell.pile.domain.MemberGroup;
 import com.jsowell.pile.mapper.MemberGroupMapper;
 import com.jsowell.pile.service.MemberGroupService;
+import com.jsowell.pile.vo.web.MemberGroupVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -38,8 +42,12 @@ public class MemberGroupServiceImpl implements MemberGroupService {
      * @return 会员组
      */
     @Override
-    public List<MemberGroup> selectMemberGroupList(MemberGroup memberGroup) {
-        return memberGroupMapper.selectMemberGroupList(memberGroup);
+    public List<MemberGroupVO> selectMemberGroupList(MemberGroup memberGroup) {
+        List<MemberGroupVO> resultList = memberGroupMapper.queryMemberGroupList(memberGroup);
+        if (CollectionUtils.isEmpty(resultList)) {
+            return Lists.newArrayList();
+        }
+        return resultList;
     }
 
     /**
@@ -50,10 +58,33 @@ public class MemberGroupServiceImpl implements MemberGroupService {
      */
     @Override
     public int insertMemberGroup(MemberGroup memberGroup) {
+        // 生成编号
+        memberGroup.setGroupCode(generateGroupCode());
         memberGroup.setCreateTime(DateUtils.getNowDate());
         return memberGroupMapper.insertMemberGroup(memberGroup);
     }
 
+    // 生成编号
+    private String generateGroupCode() {
+        while (true) {
+            String groupCode = IdUtils.get16UUID("32");
+            // 通过walletCode查询是否已经存在
+            MemberGroup memberGroup = selectByGroupCode(groupCode);
+            if (memberGroup == null) {
+                return groupCode;
+            }
+        }
+    }
+
+    /**
+     * 根据会员组编号查询
+     * @param groupCode
+     * @return
+     */
+    public MemberGroup selectByGroupCode(String groupCode) {
+        return null;
+    }
+
     /**
      * 修改会员组
      *