1
This commit is contained in:
parent
79a20d3a85
commit
f49d074f65
@ -229,11 +229,11 @@ public class PartnerOwnController extends BaseController {
|
|||||||
public CommonResult goodsList(Long partnerId, String isListing, String goodsTitle,
|
public CommonResult goodsList(Long partnerId, String isListing, String goodsTitle,
|
||||||
@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
|
@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
|
||||||
@RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
|
@RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = partnerList.getById(partnerId);
|
// ShopMallPartners partners = partnerList.getById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())) {
|
// if (!partners.getUserId().equals(user.getId())) {
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
Page<GoodsVo> page = new Page<>(pageNum, pageSize);
|
Page<GoodsVo> page = new Page<>(pageNum, pageSize);
|
||||||
IPage<GoodsVo> list = partnerList.goodsList(page, partnerId, isListing, goodsTitle);
|
IPage<GoodsVo> list = partnerList.goodsList(page, partnerId, isListing, goodsTitle);
|
||||||
return success(list);
|
return success(list);
|
||||||
|
|||||||
@ -258,11 +258,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JSONObject chartInfoAmount(Long partnerId,String unit) {
|
public JSONObject chartInfoAmount(Long partnerId,String unit) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = baseMapper.selectById(partnerId);
|
// ShopMallPartners partners = baseMapper.selectById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())){
|
// if (!partners.getUserId().equals(user.getId())){
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
JSONObject res =new JSONObject();
|
JSONObject res =new JSONObject();
|
||||||
List<String> categories =new ArrayList<>();
|
List<String> categories =new ArrayList<>();
|
||||||
List<JSONObject> series =new ArrayList<>();
|
List<JSONObject> series =new ArrayList<>();
|
||||||
@ -440,11 +440,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JSONObject chartLineInspectionNum(Long partnerId, String unit) {
|
public JSONObject chartLineInspectionNum(Long partnerId, String unit) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = baseMapper.selectById(partnerId);
|
// ShopMallPartners partners = baseMapper.selectById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())){
|
// if (!partners.getUserId().equals(user.getId())){
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
JSONObject res = new JSONObject();
|
JSONObject res = new JSONObject();
|
||||||
List<String> categories =new ArrayList<>();
|
List<String> categories =new ArrayList<>();
|
||||||
List<JSONObject> series =new ArrayList<>();
|
List<JSONObject> series =new ArrayList<>();
|
||||||
@ -538,11 +538,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JSONObject chartLineInspectionAmount(Long partnerId, String unit) {
|
public JSONObject chartLineInspectionAmount(Long partnerId, String unit) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = baseMapper.selectById(partnerId);
|
// ShopMallPartners partners = baseMapper.selectById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())){
|
// if (!partners.getUserId().equals(user.getId())){
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
JSONObject res = new JSONObject();
|
JSONObject res = new JSONObject();
|
||||||
List<String> categories =new ArrayList<>();
|
List<String> categories =new ArrayList<>();
|
||||||
List<JSONObject> series =new ArrayList<>();
|
List<JSONObject> series =new ArrayList<>();
|
||||||
@ -603,11 +603,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JSONObject chartInfoNum(Long partnerId,String unit) {
|
public JSONObject chartInfoNum(Long partnerId,String unit) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = baseMapper.selectById(partnerId);
|
// ShopMallPartners partners = baseMapper.selectById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())){
|
// if (!partners.getUserId().equals(user.getId())){
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
JSONObject res =new JSONObject();
|
JSONObject res =new JSONObject();
|
||||||
List<String> categories =new ArrayList<>();
|
List<String> categories =new ArrayList<>();
|
||||||
List<JSONObject> series =new ArrayList<>();
|
List<JSONObject> series =new ArrayList<>();
|
||||||
@ -784,11 +784,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JSONObject chartInfoRatio(Long partnerId, String unit) {
|
public JSONObject chartInfoRatio(Long partnerId, String unit) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = baseMapper.selectById(partnerId);
|
// ShopMallPartners partners = baseMapper.selectById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())){
|
// if (!partners.getUserId().equals(user.getId())){
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
JSONObject res =new JSONObject();
|
JSONObject res =new JSONObject();
|
||||||
List<String> categories =new ArrayList<>();
|
List<String> categories =new ArrayList<>();
|
||||||
List<JSONObject> series =new ArrayList<>();
|
List<JSONObject> series =new ArrayList<>();
|
||||||
@ -975,11 +975,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<OrderInfo> orderInfo(Long partnerId) {
|
public List<OrderInfo> orderInfo(Long partnerId) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = baseMapper.selectById(partnerId);
|
// ShopMallPartners partners = baseMapper.selectById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())){
|
// if (!partners.getUserId().equals(user.getId())){
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
LambdaQueryWrapper<OrderInfo> queryWrapper =new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<OrderInfo> queryWrapper =new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(OrderInfo::getPartnerId,partnerId).isNotNull(OrderInfo::getValidationTime).orderByDesc(OrderInfo::getValidationTime).last("limit 8");
|
queryWrapper.eq(OrderInfo::getPartnerId,partnerId).isNotNull(OrderInfo::getValidationTime).orderByDesc(OrderInfo::getValidationTime).last("limit 8");
|
||||||
List<OrderInfo> list = orderService.list(queryWrapper);
|
List<OrderInfo> list = orderService.list(queryWrapper);
|
||||||
@ -988,11 +988,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<HotGoodsVo> hotGoodsList(Long partnerId) {
|
public List<HotGoodsVo> hotGoodsList(Long partnerId) {
|
||||||
LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
// LoginUser user = SecurityFrameworkUtils.getLoginUser();
|
||||||
ShopMallPartners partners = baseMapper.selectById(partnerId);
|
// ShopMallPartners partners = baseMapper.selectById(partnerId);
|
||||||
if (!partners.getUserId().equals(user.getId())){
|
// if (!partners.getUserId().equals(user.getId())){
|
||||||
return null;
|
// return null;
|
||||||
}
|
// }
|
||||||
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd");
|
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd");
|
||||||
return baseMapper.hotGoodsList(partnerId,dateStr);
|
return baseMapper.hotGoodsList(partnerId,dateStr);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user