Merge branch 'hz_master'

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

@@ -217,6 +217,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             return   null;
         }
         log.info("---userId==="+userId+"-----isForever==="+userRelation.getIsForever());
+        if (validTime==null||validTime==0){
+            return  userRelation;
+        }
         Long time=System.currentTimeMillis()-validTime;
         if (userRelation.getIsForever()==1||userRelation.getBindTime()>time){
             return  userRelation;

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

@@ -45,8 +45,10 @@ public class AppUserRelationController extends BaseController<AppUserRelationBiz
             @RequestParam(value = "code",defaultValue = "")String code,
             HttpServletRequest request){
         try {
-        Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
-        return baseBiz.appBindRelation(userid,code);
+            //屏蔽分享绑定
+        /*Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
+        return baseBiz.appBindRelation(userid,code);*/
+        return ObjectRestResponse.succ();
         } catch (Exception e) {
             e.printStackTrace();
             throw new BaseException(e);

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

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletPagVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
@@ -8,10 +9,7 @@ import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -34,6 +32,9 @@ public class UserSellingWaterController {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
+    @Autowired
+    private AppUserSellingWaterBiz waterBiz;
+
     @GetMapping("/page")
     public ObjectRestResponse<SellingWalletPagVo> findSellingWaterPage(@RequestParam(required = false,value = "type") Integer wating,
                                                                        @RequestParam("pageNo") Integer pageNo,
@@ -61,4 +62,14 @@ public class UserSellingWaterController {
             throw new BaseException(e);
         }
     }
+
+    @PostMapping("app/unauth/order")
+    public ObjectRestResponse order(@RequestBody OrderWaterDTO orderWaterDTO) {
+        try {
+            waterBiz.orderWater(orderWaterDTO);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+    }
 }

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

@@ -434,13 +434,14 @@ public class AppPermissionService {
             if(type!=null&&type==1){
                 try {
                     Integer parentId=0;
-                    if (StringUtils.isNotBlank(code)) {
+                    //屏蔽app登录的绑定关系
+                    /*if (StringUtils.isNotBlank(code)) {
                         parentId = appUserDetailBiz.getUserByCode(code);
                     }
                     //绑定上下线关系
                     if (parentId != null && parentId > 0) {
                         relationBiz.bindRelation(userid, parentId, 1);
-                    }
+                    }*/
                     //活动消息
                     Integer state=userVo.getState();
                     log.info("-----------autoLogin----state==="+state);