Commit 2d07e21f authored by hanfeng's avatar hanfeng

修改会员

parent 1faaf47b
...@@ -52,4 +52,10 @@ public class AppUserManageDTO { ...@@ -52,4 +52,10 @@ public class AppUserManageDTO {
*/ */
private Integer source; private Integer source;
/**
*
*/
private String registrationDate;
} }
...@@ -220,7 +220,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb ...@@ -220,7 +220,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
return; return;
}else if (baseUserMembers.size()==1){ }else if (baseUserMembers.size()==1){
baseUserMember.setUpdTime(System.currentTimeMillis()); baseUserMember.setUpdTime(System.currentTimeMillis());
updateSelectiveById(baseUserMember); getMyBiz().updateSelectiveById(baseUserMember);
}else { }else {
throw new BaseException("Member purchase repeat!"); throw new BaseException("Member purchase repeat!");
} }
......
...@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.admin.AdminBootstrap; ...@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.admin.AdminBootstrap;
import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz; import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
import com.github.wxiaoqi.security.admin.biz.BaseUserMemberExportBiz; import com.github.wxiaoqi.security.admin.biz.BaseUserMemberExportBiz;
import com.github.wxiaoqi.security.admin.dto.UserMemberDTO; import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.exception.BaseException; import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.excel.ExcelImport; import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
...@@ -67,7 +68,7 @@ public class UserMemberController { ...@@ -67,7 +68,7 @@ public class UserMemberController {
} }
@PostMapping("/user/export") @PostMapping("/user/export")
public ObjectRestResponse importUserMember(MultipartFile userMemberExcel) { public ObjectRestResponse importUserMember(@RequestPart("file") MultipartFile userMemberExcel) {
List<String[]> userMemberData = ExcelImport.getExcelData(userMemberExcel); List<String[]> userMemberData = ExcelImport.getExcelData(userMemberExcel);
if (userMemberData.size() < 1) { if (userMemberData.size() < 1) {
return ObjectRestResponse.createFailedResult(1001, "导入不能没数据!!!"); return ObjectRestResponse.createFailedResult(1001, "导入不能没数据!!!");
...@@ -86,7 +87,7 @@ public class UserMemberController { ...@@ -86,7 +87,7 @@ public class UserMemberController {
} }
} }
@GetMapping("/user/excel_model/dowload") @GetMapping("/app/unauth/user/excel_model/dowload")
public ResponseEntity<byte[]> dowloadUserMemberExcelModel(HttpServletResponse response){ public ResponseEntity<byte[]> dowloadUserMemberExcelModel(HttpServletResponse response){
// 重置response // 重置response
response.reset(); response.reset();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment