修改app用户管理

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

@@ -74,9 +74,4 @@ public class BaseUserMemberVO implements Serializable {
     @Column(name = "name")
     private String name;
 
-
-
-
-
-
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java

@@ -103,7 +103,7 @@ public class AppUserManageVo {
      * 有效期;0代表永久
      */
     @Column(name = "valid_time")
-    private Integer validTime;
+    private Long validTime;
 
     /**
      * 创建时间

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

@@ -207,7 +207,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
      * @param baseUserMemberVO
      */
     @Transactional(rollbackFor = Exception.class)
-    public void setUserMember(BaseUserMemberVO baseUserMemberVO) throws InvocationTargetException, IllegalAccessException {
+    public void UpdateUserMember(BaseUserMemberVO baseUserMemberVO) throws InvocationTargetException, IllegalAccessException {
 
         Example exa = Example.builder(BaseUserMember.class).where(
                 WeekendSqls.<BaseUserMember>custom()
@@ -219,11 +219,14 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
         BaseUserMember baseUserMember = new BaseUserMember();
         BeanUtilsBean.getInstance().copyProperties(baseUserMember,baseUserMemberVO);
         if (baseUserMembers==null||baseUserMembers.size()==0) {
+            if (baseUserMemberVO.getMemberLevel()==null||baseUserMember.getValidTime()==null) return;
             baseUserMember.setCrtTime(System.currentTimeMillis());
             baseUserMember.setIsDel(0);
             baseUserMember.setPayCount(0);
-            baseUserMember.setCardLeave(0);
+            baseUserMember.setCardLeave(1);
             baseUserMember.setRecentRecharge(System.currentTimeMillis());
+          Integer  buyCount = baseUserMember.getBuyCount()==null? 0:baseUserMember.getBuyCount();
+           baseUserMember.setBuyCount(buyCount+1);
             insertSelective(baseUserMember);
             return;
         }else if (baseUserMembers.size()==1){

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

@@ -63,4 +63,5 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     }
 
 
+
 }

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

@@ -36,10 +36,10 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
      * @param baseUserMemberVO
      * @return
      */
-    @PostMapping("/setUserMember")
-    public ObjectRestResponse setUserMember(@RequestBody BaseUserMemberVO baseUserMemberVO)
+    @PutMapping("/setUserMember")
+    public ObjectRestResponse UpdateUserMember(@RequestBody BaseUserMemberVO baseUserMemberVO)
             throws InvocationTargetException, IllegalAccessException {
-        baseBiz.setUserMember(baseUserMemberVO);
+        baseBiz.UpdateUserMember(baseUserMemberVO);
         return ObjectRestResponse.succ();
     }
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/QueryOrderDTO.java

@@ -12,6 +12,9 @@ public class QueryOrderDTO extends PageParam {
     @ApiModelProperty(hidden = false)
     private Integer crtUser;
 
+    @ApiModelProperty(hidden = false)
+    private Integer userId;
+
     @ApiModelProperty(hidden = false)
     private Integer crtCompanyId;