批量充值功能迭代

fuint-application/src/main/java/com/fuint/common/dto/UserDto.java

@@ -3,6 +3,8 @@ package com.fuint.common.dto;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -31,6 +33,12 @@ public class UserDto implements Serializable {
     @ApiModelProperty("称呼")
     private String name;
 
+    @ApiModelProperty("分组ID")
+    private Integer groupId;
+
+    @ApiModelProperty("分组信息")
+    private UserGroupDto groupInfo;
+
     @ApiModelProperty("微信open_id")
     private String openId;
 
@@ -46,9 +54,11 @@ public class UserDto implements Serializable {
     @ApiModelProperty("等级名称")
     private String gradeName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("会员开始时间")
     private Date startTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("会员结束时间")
     private Date endTime;
 

fuint-application/src/main/java/com/fuint/common/service/impl/BalanceServiceImpl.java

@@ -134,7 +134,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
     @OperationServiceLog(description = "会员余额变动")
     public Boolean addBalance(MtBalance mtBalance) throws BusinessCheckException {
         if (mtBalance.getUserId() < 0) {
-           return false;
+            return false;
         }
         mtBalance.setStatus(StatusEnum.ENABLED.getKey());
         mtBalance.setCreateTime(new Date());
@@ -143,7 +143,7 @@ public class BalanceServiceImpl extends ServiceImpl<MtBalanceMapper, MtBalance>
         MtUser mtUser = mtUserMapper.selectById(mtBalance.getUserId());
         BigDecimal newAmount = mtUser.getBalance().add(mtBalance.getAmount());
         if (newAmount.compareTo(new BigDecimal("0")) < 0) {
-           return false;
+            return false;
         }
         if (mtUser.getStoreId() != null) {
             mtBalance.setStoreId(mtUser.getStoreId());

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBalanceController.java

@@ -114,7 +114,7 @@ public class BackendBalanceController extends BaseController {
     }
 
     /**
-     * 提交充值
+     * 提交充值（单个会员）
      *
      * @param request HttpServletRequest对象
      * @return

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -3,6 +3,7 @@ package com.fuint.module.backendApi.controller;
 import com.fuint.common.Constants;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.UserDto;
+import com.fuint.common.dto.UserGroupDto;
 import com.fuint.common.enums.SettingTypeEnum;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.enums.UserSettingEnum;
@@ -19,14 +20,12 @@ import com.fuint.repository.model.*;
 import com.fuint.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 会员管理类controller
@@ -63,6 +62,12 @@ public class BackendMemberController extends BaseController {
     @Autowired
     private StoreService storeService;
 
+    /**
+     * 会员分组服务接口
+     */
+    @Autowired
+    private MemberGroupService memberGroupService;
+
     /**
      * 查询会员列表
      *
@@ -153,10 +158,26 @@ public class BackendMemberController extends BaseController {
         }
         List<MtStore> storeList = storeService.queryStoresByParams(paramsStore);
 
+        // 会员分组
+        List<UserGroupDto> groupList = new ArrayList<>();
+        Map<String, Object> searchParams = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            searchParams.put("merchantId", accountInfo.getMerchantId());
+        }
+        PaginationRequest groupRequest = new PaginationRequest();
+        groupRequest.setCurrentPage(1);
+        groupRequest.setPageSize(Constants.MAX_ROWS);
+        groupRequest.setSearchParams(searchParams);
+        PaginationResponse<UserGroupDto> groupResponse = memberGroupService.queryMemberGroupListByPagination(groupRequest);
+        if (groupResponse != null && groupResponse.getContent() != null) {
+            groupList = groupResponse.getContent();
+        }
+
         Map<String, Object> result = new HashMap<>();
         result.put("paginationResponse", paginationResponse);
         result.put("userGradeList", userGradeList);
         result.put("storeList", storeList);
+        result.put("groupList", groupList);
 
         return getSuccessResult(result);
     }
@@ -207,11 +228,7 @@ public class BackendMemberController extends BaseController {
         }
 
         String operator = accountInfo.getAccountName();
-        try {
-            memberService.deleteMember(id, operator);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage() == null ? "删除失败" : e.getMessage());
-        }
+        memberService.deleteMember(id, operator);
 
         return getSuccessResult(true);
     }
@@ -235,6 +252,7 @@ public class BackendMemberController extends BaseController {
         String id = param.get("id").toString();
         String name = param.get("name") == null ? "" : param.get("name").toString();
         String gradeId = param.get("gradeId") == null ? "0" :param.get("gradeId").toString();
+        String groupId = param.get("groupId") == null ? "0" :param.get("groupId").toString();
         String userNo = param.get("userNo") == null ? "" : param.get("userNo").toString();
         String mobile = param.get("mobile") == null ? "" : param.get("mobile").toString();
         String sex = param.get("sex") == null ? "0" : param.get("sex").toString();
@@ -261,6 +279,9 @@ public class BackendMemberController extends BaseController {
         memberInfo.setMerchantId(accountInfo.getMerchantId());
         memberInfo.setName(name);
         memberInfo.setStatus(status);
+        if (StringUtil.isNotEmpty(groupId)) {
+            memberInfo.setGroupId(Integer.parseInt(groupId));
+        }
         memberInfo.setGradeId(gradeId);
         memberInfo.setUserNo(userNo);
         if (PhoneFormatCheckUtils.isChinaPhoneLegal(mobile)) {
@@ -276,16 +297,11 @@ public class BackendMemberController extends BaseController {
         TAccount account = accountService.getAccountInfoById(accountInfo.getId());
         Integer storeId = account.getStoreId();
         memberInfo.setStoreId(storeId);
-        try {
-            if (StringUtil.isEmpty(id)) {
-                memberService.addMember(memberInfo);
-            } else {
-                memberService.updateMember(memberInfo);
-            }
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
+        if (StringUtil.isEmpty(id)) {
+            memberService.addMember(memberInfo);
+        } else {
+            memberService.updateMember(memberInfo);
         }
-
         return getSuccessResult(true);
     }
 
@@ -305,11 +321,23 @@ public class BackendMemberController extends BaseController {
             return getFailureResult(1001, "请先登录");
         }
 
-        MtUser mtUserInfo = memberService.queryMemberById(id);
+        MtUser mtUser = memberService.queryMemberById(id);
+        if (mtUser == null) {
+            return getFailureResult(201, "会员信息有误");
+        }
+
+        UserDto memberInfo = new UserDto();
+        BeanUtils.copyProperties(mtUser, memberInfo);
+
+        MtUserGroup mtUserGroup = memberGroupService.queryMemberGroupById(memberInfo.getGroupId());
+        UserGroupDto userGroupDto = new UserGroupDto();
+        BeanUtils.copyProperties(mtUserGroup, userGroupDto);
+        memberInfo.setGroupInfo(userGroupDto);
+
         // 隐藏手机号中间四位
-        String phone = mtUserInfo.getMobile();
+        String phone = memberInfo.getMobile();
         if (phone != null && StringUtil.isNotEmpty(phone) && phone.length() == 11) {
-            mtUserInfo.setMobile(phone.substring(0, 3) + "****" + phone.substring(7));
+            memberInfo.setMobile(phone.substring(0, 3) + "****" + phone.substring(7));
         }
 
         Map<String, Object> param = new HashMap<>();
@@ -317,7 +345,7 @@ public class BackendMemberController extends BaseController {
 
         Map<String, Object> result = new HashMap<>();
         result.put("userGradeList", userGradeList);
-        result.put("memberInfo", mtUserInfo);
+        result.put("memberInfo", memberInfo);
 
         return getSuccessResult(result);
     }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberGroupController.java

@@ -5,7 +5,6 @@ import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.MemberGroupDto;
 import com.fuint.common.dto.UserGroupDto;
 import com.fuint.common.enums.StatusEnum;
-import com.fuint.common.service.CouponService;
 import com.fuint.common.service.MemberGroupService;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -21,8 +20,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
@@ -40,8 +37,6 @@ import java.util.Map;
 @RequestMapping(value = "/backendApi/memberGroup")
 public class BackendMemberGroupController extends BaseController {
 
-    private static final Logger logger = LoggerFactory.getLogger(BackendMemberGroupController.class);
-
     @Resource
     private MtUserMapper mtUserMapper;
 
@@ -51,16 +46,10 @@ public class BackendMemberGroupController extends BaseController {
     @Autowired
     private MemberGroupService memberGroupService;
 
-    /**
-     * 卡券服务接口
-     * */
-    @Autowired
-    CouponService couponService;
-
     /**
      * 查询会员分组列表
      *
-     * @param request
+     * @param  request
      * @return
      * @throws BusinessCheckException
      */

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserGradeController.java

@@ -237,17 +237,12 @@ public class BackendUserGradeController extends BaseController {
             info.setSpeedPoint(Float.parseFloat(speedPoint));
         }
         info.setStatus(status);
-        try {
-            if (StringUtil.isEmpty(id)) {
-                userGradeService.addUserGrade(info);
-            } else {
-                info.setId(Integer.parseInt(id));
-                userGradeService.updateUserGrade(info);
-            }
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage());
+        if (StringUtil.isEmpty(id)) {
+            userGradeService.addUserGrade(info);
+        } else {
+            info.setId(Integer.parseInt(id));
+            userGradeService.updateUserGrade(info);
         }
-
         return getSuccessResult(true);
     }
 

fuint-repository/src/main/java/com/fuint/repository/model/MtUser.java

@@ -36,6 +36,9 @@ public class MtUser implements Serializable {
     @ApiModelProperty("头像")
     private String avatar;
 
+    @ApiModelProperty("分组ID")
+    private Integer groupId;
+
     @ApiModelProperty("称呼")
     private String name;