Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/UserMemberDTO.java

@@ -53,6 +53,10 @@ public class UserMemberDTO  {
 	@ApiModelProperty(value = "折扣")
 	private Integer discount;
 
+	//购买次数
+	@ApiModelProperty(value = "购买次数")
+	private Integer buyCount;
+
 
 	
 

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

@@ -72,9 +72,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
         if(freeDays==null||freeDays==0){
             freeDays=totalNumber;
         }
+        Integer buyCount=1;
+        if(userMemberDTO.getBuyCount()!=null){
+            buyCount=userMemberDTO.getBuyCount();
+        }
         if(userMemberVo==null){
             baseUserMember.setRentFreeDays(freeDays);
-            baseUserMember.setBuyCount(1);
+            baseUserMember.setBuyCount(buyCount);
             insertSelective(baseUserMember);
         }else {
             Integer discount=userMemberVo.getDiscount()==null?0:userMemberVo.getDiscount();
@@ -90,7 +94,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
             baseUserMember.setId(userMemberVo.getId());
             totalNumber+=userMemberVo.getTotalNumber()==null?0:userMemberVo.getTotalNumber();
             freeDays+=userMemberVo.getRentFreeDays()==null?0:userMemberVo.getRentFreeDays();
-            baseUserMember.setBuyCount(userMemberVo.getBuyCount()+1);
+            baseUserMember.setBuyCount(userMemberVo.getBuyCount()+buyCount);
             baseUserMember.setTotalNumber(totalNumber);
             baseUserMember.setRentFreeDays(freeDays);
             getMyBiz().updateSelectiveById(baseUserMember);

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

@@ -129,7 +129,7 @@ public class AppUserController extends CommonBaseController {
             }
         }
         AppUserPosition userPosition=positionBiz.selectById(positionId);
-        if (userPosition!=null){
+        if (userPosition!=null&&userPosition.getLevel()>0){
             userDTO.setPositionName(userPosition.getName());
         }
         userDTO.setId(id);

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

@@ -90,7 +90,7 @@ public class PublicController {
             }
         }
         AppUserPosition userPosition=positionBiz.selectById(positionId);
-        if (userPosition!=null){
+        if (userPosition!=null&&userPosition.getLevel()>0){
             userDTO.setPositionName(userPosition.getName());
         }
         userDTO.setId(id);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -869,6 +869,7 @@ public class AppPermissionService {
             userMemberDTO.setMemberLevel(userMemberExportDTO.getMemberLevel());
             userMemberDTO.setTotalNumber(userMemberExportDTO.getTotalNumber());
             userMemberDTO.setDiscount(userMemberExportDTO.getDiscount());
+            userMemberDTO.setBuyCount(0);
             userMemberDTO.setIsBind(1);
             baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
         }