Commit 63a5103a authored by jiaorz's avatar jiaorz

订单权限

parent e5ac89d1
...@@ -18,6 +18,7 @@ import com.github.wxiaoqi.security.common.util.ClientUtil; ...@@ -18,6 +18,7 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
import com.github.wxiaoqi.security.common.util.Query; import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode; import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.activity.user.UserInfoBiz;
import com.xxfc.platform.order.biz.BaseOrderBiz; import com.xxfc.platform.order.biz.BaseOrderBiz;
import com.xxfc.platform.order.biz.OrderMemberDetailBiz; import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
import com.xxfc.platform.order.biz.OrderUserLicenseBiz; import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
...@@ -48,12 +49,14 @@ import org.springframework.stereotype.Controller; ...@@ -48,12 +49,14 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER; import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
@Controller @Controller
...@@ -74,6 +77,9 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -74,6 +77,9 @@ public class BaseOrderController extends CommonBaseController implements UserRes
@Autowired @Autowired
RabbitProduct rabbitProduct; RabbitProduct rabbitProduct;
@Autowired
UserInfoBiz userInfoBiz;
@Autowired @Autowired
OrderMemberDetailBiz orderMemberDetailBiz; OrderMemberDetailBiz orderMemberDetailBiz;
@Autowired @Autowired
...@@ -150,7 +156,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -150,7 +156,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
@ApiOperation(value = "获取后台订单列表") @ApiOperation(value = "获取后台订单列表")
@IgnoreClientToken @IgnoreClientToken
@CrossOrigin @CrossOrigin
public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(QueryOrderList dto) { public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(QueryOrderList dto, HttpServletRequest request) {
if (dto.getStartTime() != null) { if (dto.getStartTime() != null) {
if (dto.getEndTime() == null) { if (dto.getEndTime() == null) {
dto.setEndTime(new Date().getTime()); dto.setEndTime(new Date().getTime());
...@@ -162,6 +168,19 @@ public class BaseOrderController extends CommonBaseController implements UserRes ...@@ -162,6 +168,19 @@ public class BaseOrderController extends CommonBaseController implements UserRes
dto.setUserId(appUserLogin.getId()); dto.setUserId(appUserLogin.getId());
} }
} }
UserDTO userDTO = userInfoBiz.getAdminUserInfo();
if(userDTO == null) {
return ObjectRestResponse.succ(new PageDataVO<>());
}
if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
if(StringUtils.isNotBlank(userDTO.getDataZone())) {
dto.setStartZoneId(userDTO.getZoneId());
}
if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
dto.setStartCompanyId(userDTO.getCompanyId());
}
}
Query query = new Query(dto); Query query = new Query(dto);
PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper())); PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
List<OrderListVo> list = pageDataVO.getData(); List<OrderListVo> list = pageDataVO.getData();
......
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