积分问题
This commit is contained in:
@@ -19,6 +19,7 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
|
|||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -66,22 +67,22 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
|
|||||||
@Override
|
@Override
|
||||||
public Map<String, Object> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) {
|
public Map<String, Object> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) {
|
||||||
Map<String, Object> result = new HashMap<>(2);
|
Map<String, Object> result = new HashMap<>(2);
|
||||||
boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1));
|
|
||||||
if (!exists) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
|
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
|
||||||
PageHelper.startPage(page, size);
|
List<MkPointsGoods> list = new ArrayList<>();
|
||||||
List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory));
|
boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1));
|
||||||
list.forEach(goods -> {
|
if (exists) {
|
||||||
if ("优惠券".equals(goods.getGoodsCategory())) {
|
PageHelper.startPage(page, size);
|
||||||
ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
|
list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory));
|
||||||
.eq(ShopCoupon::getShopId, shopId)
|
list.forEach(goods -> {
|
||||||
.eq(ShopCoupon::getStatus, 1)
|
if ("优惠券".equals(goods.getGoodsCategory())) {
|
||||||
.eq(ShopCoupon::getIsDel, 0));
|
ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
|
||||||
goods.setCouponInfo(one);
|
.eq(ShopCoupon::getShopId, shopId)
|
||||||
}
|
.eq(ShopCoupon::getStatus, 1)
|
||||||
});
|
.eq(ShopCoupon::getIsDel, 0));
|
||||||
|
goods.setCouponInfo(one);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list)));
|
result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list)));
|
||||||
result.put("pointsUser", pointsUser == null ? "" : pointsUser);
|
result.put("pointsUser", pointsUser == null ? "" : pointsUser);
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
Reference in New Issue
Block a user