Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -48,7 +48,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     private AppUserLoginBiz appUserLoginBiz;
 
 
-    public void saveUserMember(UserMemberSaveDTO userMemberSaveDTO) {
+    public void saveUserMember(UserMemberSaveDTO userMemberSaveDTO,Integer userId,String name) {
         if (userMemberSaveDTO != null) {
             UserMemberDTO userMemberDTO = new UserMemberDTO();
             BaseUserMemberLevel level = userMemberLevelBiz.getLevel(userMemberSaveDTO.getMemberLevel());
@@ -76,6 +76,8 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .rentFreeDays(userMemberSaveDTO.getRentFreeDays())
                     .discount(level == null ? 0 : level.getDiscount() == null ? 0 : level.getDiscount())
                     .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()) == null ? 0 : 1))
+                    .crtId(userId)
+                    .crtName(name)
                     .isDel(0)
                     .build();
             if (log.isDebugEnabled()) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java

@@ -95,9 +95,15 @@ public class UserMemberAdminController {
 
     @ApiOperation("会员新增")
     @PostMapping("/save")
-    public ObjectRestResponse<Void> saveUserMember(@RequestBody UserMemberSaveDTO userMemberSaveDTO) {
-        baseUserMemberExportBiz.saveUserMember(userMemberSaveDTO);
-        return ObjectRestResponse.succ();
+    public ObjectRestResponse<Void> saveUserMember(@RequestBody UserMemberSaveDTO userMemberSaveDTO,HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            baseUserMemberExportBiz.saveUserMember(userMemberSaveDTO,Integer.valueOf(infoFromToken.getId()),infoFromToken.getName());
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+
     }
 
     @ApiOperation("分页查询")