汉字问题
This commit is contained in:
@@ -65,16 +65,9 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
|
|||||||
Map<String, Object> result = new HashMap<>(2);
|
Map<String, Object> result = new HashMap<>(2);
|
||||||
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
|
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
|
||||||
PageHelper.startPage(page, size);
|
PageHelper.startPage(page, size);
|
||||||
if (StrUtil.isNotBlank(goodsCategory)) {
|
|
||||||
if (goodsCategory.contains("优惠劵")) {
|
|
||||||
goodsCategory = "优惠劵";
|
|
||||||
} else if (goodsCategory.contains("其他商品")) {
|
|
||||||
goodsCategory = "其他商品";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory));
|
List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory));
|
||||||
list.forEach(goods -> {
|
list.forEach(goods -> {
|
||||||
if (goods.getGoodsCategory().equals("优惠劵")) {
|
if (goods.getGoodsCategory().equals("优惠券")) {
|
||||||
ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
|
ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
|
||||||
.eq(ShopCoupon::getShopId, shopId)
|
.eq(ShopCoupon::getShopId, shopId)
|
||||||
.eq(ShopCoupon::getStatus, 1)
|
.eq(ShopCoupon::getStatus, 1)
|
||||||
|
|||||||
Reference in New Issue
Block a user