czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

积分商品问题

Browse Source
This commit is contained in:
wangw
2025-12-10 15:03:05 +08:00
parent 1d896d30ef
commit 2cfe13cd99
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
View File

@@ -1,13 +1,12 @@
package com.czg.controller.user;
import com.czg.market.entity.MkPointsGoods;
import com.czg.market.entity.MkPointsGoodsRecord;
import com.czg.market.service.MkPointsGoodsService;
import com.czg.order.dto.PointGoodsExchangeDTO;
import com.czg.order.dto.PointGoodsRefundDTO;
import com.czg.order.service.PointsGoodPayService;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.order.dto.PointGoodsExchangeDTO;
import com.czg.utils.ServletUtil;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
@@ -35,13 +34,17 @@ public class UPointGoodsController {
/**
* 商品列表
* {
* "pointsGoods": 商品信息,
* "pointsUser": 用户积分信息
* }
*/
@GetMapping("/page")
public CzgResult<Page<MkPointsGoods>> getPointsGoodsSettingPage(@RequestParam(defaultValue = "1", required = false) Integer page,
public CzgResult<Map<String, Object>> getPointsGoodsSettingPage(@RequestParam(defaultValue = "1", required = false) Integer page,
@RequestParam(defaultValue = "10", required = false) Integer size,
@RequestParam(required = false) String goodsCategory,
Long shopId) {
Page<MkPointsGoods> data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, goodsCategory, StpKit.USER.getLoginIdAsLong());
Map<String, Object> data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, goodsCategory, StpKit.USER.getLoginIdAsLong());
return CzgResult.success(data);
}

1
cash-common/cash-common-service/src/main/java/com/czg/account/vo/PointsShopListVO.java
View File

@@ -6,6 +6,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
public class PointsShopListVO {
private Long id;
private String shopName;
private String logo;
private String coverImg;

4
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
View File

@@ -7,6 +7,8 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkPointsGoods;
import java.util.Map;
/**
* 积分商品设置 服务层。
*
@@ -17,7 +19,7 @@ public interface MkPointsGoodsService extends IService<MkPointsGoods> {
Page<MkPointsGoods> getPointsGoodsPage(BaseQueryParam param, Long shopId);
Page<MkPointsGoods> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId);
Map<String, Object> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId);
Page<MkPointsGoodsRecord> getGoodsRecordPage(Integer page, Integer size, Long shopId, Long userId);

20
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
View File

@@ -2,10 +2,9 @@ package com.czg.service.market.service.impl;
import com.czg.BaseQueryParam;
import com.czg.exception.CzgException;
import com.czg.market.entity.MkPointsGoodsRecord;
import com.czg.market.entity.MkPointsUserRecord;
import com.czg.market.entity.ShopCoupon;
import com.czg.market.entity.*;
import com.czg.market.service.MkPointsGoodsRecordService;
import com.czg.market.service.MkPointsUserService;
import com.czg.market.service.ShopCouponService;
import com.czg.order.dto.PointGoodsRefundDTO;
import com.czg.utils.PageUtil;
@@ -13,14 +12,15 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.MkPointsGoods;
import com.czg.market.service.MkPointsGoodsService;
import com.czg.service.market.mapper.MkPointsGoodsMapper;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 积分商品设置 服务层实现。
@@ -34,6 +34,8 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
@Resource
private MkPointsGoodsRecordService goodsRecordService;
@Resource
private MkPointsUserService pointsUserService;
@Resource
private ShopCouponService shopCouponService;
@Override
@@ -57,10 +59,14 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
}
@Override
public Page<MkPointsGoods> 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);
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
PageHelper.startPage(page, size);
List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId,goodsCategory);
return PageUtil.convert(new PageInfo<>(list));
List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId, goodsCategory);
result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list)));
result.put("pointsUser", pointsUser == null ? "" : pointsUser);
return result;
}
@Override

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java
View File

@@ -70,7 +70,7 @@ public class MkPointsUserServiceImpl extends ServiceImpl<MkPointsUserMapper, MkP
@Override
public List<PointsShopListVO> pointsShopList(Long userId, String shopName) {
return listAs(query().select(MkPointsUser::getShopId).select(ShopInfo::getShopName, ShopInfo::getLogo, ShopInfo::getCoverImg)
return listAs(query().select(MkPointsUser::getId, MkPointsUser::getShopId).select(ShopInfo::getShopName, ShopInfo::getLogo, ShopInfo::getCoverImg)
.eq(MkPointsUser::getUserId, userId).leftJoin(ShopInfo.class).on(MkPointsUser::getShopId, ShopInfo::getId),
PointsShopListVO.class);
}