管理端回显店铺信息

2025-12-12 13:40:38 +08:00
parent 2fb8cfe878
commit 48181a0929
8 changed files with 127 additions and 122 deletions
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java
@@ -1,6 +1,6 @@
 package com.czg.service.market.service.impl;

-import com.czg.account.entity.ShopInfo;
+import cn.hutool.core.util.StrUtil;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.service.ShopInfoService;
 import com.czg.account.service.ShopUserService;
@@ -34,31 +34,6 @@ public class MkPointsGoodsRecordServiceImpl extends ServiceImpl<MkPointsGoodsRec
    @DubboReference
    private ShopUserService shopUserService;

-    @Override
-    public Page<MkPointsGoodsRecordDTO> getGoodsRecordPage(MkPointsGoodsRecordQueryDTO param) {
-        Long mainIdByShopId = shopInfoService.getMainIdByShopId(param.getShopId());
-        Page<MkPointsGoodsRecordDTO> pages = pageAs(
-                Page.of(param.getPage(), param.getSize())
-                , query().eq(MkPointsGoodsRecord::getShopId, param.getShopId())
-                        .between(MkPointsGoodsRecord::getCreateTime, param.getStartTime(), param.getEndTime())
-                        .eq(MkPointsGoodsRecord::getShopUserId, param.getShopUserId())
-                        .eq(MkPointsGoodsRecord::getStatus, param.getStatus())
-                        .eq(MkPointsGoodsRecord::getIsDel, 0)
-                        .like(MkPointsGoodsRecord::getPointsGoodsName, param.getPointsGoodsName())
-                        .like(MkPointsGoodsRecord::getGoodsCategory, param.getGoodsCategory())
-                        .orderBy(MkPointsGoodsRecord::getCreateTime, false)
-                , MkPointsGoodsRecordDTO.class);
-        pages.getRecords().forEach(data -> {
-            data.fillCouponInfo();
-            ShopUser shopUser = shopUserService.getOne(query().eq(ShopUser::getId, data.getShopUserId()).eq(ShopUser::getMainShopId, mainIdByShopId));
-            data.setHeadImg(shopUser.getHeadImg());
-            data.setNickName(shopUser.getNickName());
-            data.setPhone(shopUser.getPhone());
-        });
-        return pages;
-    }
-
-
    @Override
    public PointsExchangeSummaryVo total(MkPointsGoodsRecordQueryDTO param) {
        QueryWrapper queryWrapper = query().eq(MkPointsGoodsRecord::getShopId, param.getShopId())
@@ -72,6 +47,64 @@ public class MkPointsGoodsRecordServiceImpl extends ServiceImpl<MkPointsGoodsRec
        return getOneAs(queryWrapper, PointsExchangeSummaryVo.class);
    }

+
+    @Override
+    public Page<MkPointsGoodsRecordDTO> getGoodsRecordPage(MkPointsGoodsRecordQueryDTO param) {
+        Long mainIdByShopId = shopInfoService.getMainIdByShopId(param.getShopId());
+        QueryWrapper queryWrapper = query().eq(MkPointsGoodsRecord::getShopId, param.getShopId())
+                .between(MkPointsGoodsRecord::getCreateTime, param.getStartTime(), param.getEndTime())
+                .eq(MkPointsGoodsRecord::getShopUserId, param.getShopUserId())
+                .eq(MkPointsGoodsRecord::getIsDel, 0)
+                .like(MkPointsGoodsRecord::getPointsGoodsName, param.getPointsGoodsName())
+                .like(MkPointsGoodsRecord::getGoodsCategory, param.getGoodsCategory())
+                .orderBy(MkPointsGoodsRecord::getCreateTime, false);
+
+        if (StrUtil.isNotBlank(param.getStatus())) {
+            if ("售后".equals(param.getStatus())) {
+                queryWrapper.and(wrapper -> {
+                    wrapper.eq(MkPointsGoodsRecord::getStatus, "退款中").or(MkPointsGoodsRecord::getStatus).eq("已退款");
+                });
+                queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false);
+            } else {
+                queryWrapper.eq(MkPointsGoodsRecord::getStatus, param.getStatus());
+                queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false);
+            }
+        }
+        Page<MkPointsGoodsRecordDTO> pages = pageAs(Page.of(param.getPage(), param.getSize()), queryWrapper, MkPointsGoodsRecordDTO.class);
+        pages.getRecords().forEach(data -> {
+            data.fillCouponInfo();
+            ShopUser shopUser = shopUserService.getOne(query().eq(ShopUser::getId, data.getShopUserId()).eq(ShopUser::getMainShopId, mainIdByShopId));
+            data.setHeadImg(shopUser.getHeadImg());
+            data.setNickName(shopUser.getNickName());
+            data.setPhone(shopUser.getPhone());
+        });
+        return pages;
+    }
+
+    @Override
+    public Page<MkPointsGoodsRecord> userGoodsRecordPage(Integer page, Integer size, Long shopId, String status, Long userId) {
+        QueryWrapper queryWrapper = query()
+                .eq(MkPointsGoodsRecord::getUserId, userId)
+                .eq(MkPointsGoodsRecord::getShopId, shopId)
+                .eq(MkPointsGoodsRecord::getIsDel, 0);
+
+        if (StrUtil.isNotBlank(status)) {
+            if ("售后".equals(status)) {
+                queryWrapper.and(wrapper -> {
+                    wrapper.eq(MkPointsGoodsRecord::getStatus, "退款中").or(MkPointsGoodsRecord::getStatus).eq("已退款");
+                });
+                queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false);
+            } else {
+                queryWrapper.eq(MkPointsGoodsRecord::getStatus, status);
+                queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false);
+            }
+        }
+        queryWrapper.orderBy(MkPointsGoodsRecord::getCreateTime, false);
+        Page<MkPointsGoodsRecord> pages = page(Page.of(page, size), queryWrapper);
+        pages.getRecords().forEach(MkPointsGoodsRecord::fillCouponInfo);
+        return pages;
+    }
+
    @Override
    public boolean checkout(String couponCode, Long shopId) {
        MkPointsGoodsRecord record = getOne(query().eq(MkPointsGoodsRecord::getCouponCode, couponCode).eq(MkPointsGoodsRecord::getShopId, shopId));
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
@@ -2,27 +2,21 @@ package com.czg.service.market.service.impl;

 import cn.hutool.core.util.StrUtil;
 import com.czg.BaseQueryParam;
-import com.czg.exception.CzgException;
 import com.czg.market.entity.MkPointsGoods;
-import com.czg.market.entity.MkPointsGoodsRecord;
 import com.czg.market.entity.MkPointsUser;
 import com.czg.market.entity.ShopCoupon;
-import com.czg.market.service.MkPointsGoodsRecordService;
 import com.czg.market.service.MkPointsGoodsService;
 import com.czg.market.service.MkPointsUserService;
 import com.czg.market.service.ShopCouponService;
-import com.czg.order.dto.PointGoodsRefundDTO;
 import com.czg.service.market.mapper.MkPointsGoodsMapper;
 import com.czg.utils.PageUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.mybatisflex.core.paginate.Page;
-import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 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;
@@ -35,9 +29,6 @@ import java.util.Map;
 */
@Service
 public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, MkPointsGoods> implements MkPointsGoodsService {
-
-    @Resource
-    private MkPointsGoodsRecordService goodsRecordService;
    @Resource
    private MkPointsUserService pointsUserService;
    @Resource
@@ -84,70 +75,6 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
        return result;
    }

-    @Override
-    public Page<MkPointsGoodsRecord> getGoodsRecordPage(Integer page, Integer size, Long shopId, String status, Long userId) {
-        QueryWrapper queryWrapper = query()
-                .eq(MkPointsGoodsRecord::getUserId, userId)
-                .eq(MkPointsGoodsRecord::getShopId, shopId)
-                .eq(MkPointsGoodsRecord::getIsDel, 0);
-
-        if (StrUtil.isNotBlank(status)) {
-            if ("售后".equals(status)) {
-                queryWrapper.and(wrapper -> {
-                    wrapper.eq(MkPointsGoodsRecord::getStatus, "退款中").or(MkPointsGoodsRecord::getStatus).eq("已退款");
-                });
-                queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false);
-            } else {
-                queryWrapper.eq(MkPointsGoodsRecord::getStatus, status);
-                queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false);
-            }
-        }
-        queryWrapper.orderBy(MkPointsGoodsRecord::getCreateTime, false);
-        Page<MkPointsGoodsRecord> pages = goodsRecordService.page(Page.of(page, size), queryWrapper);
-        pages.getRecords().forEach(MkPointsGoodsRecord::fillCouponInfo);
-        return pages;
-    }
-
-    @Override
-    public boolean applyRefund(PointGoodsRefundDTO param, Long userId) {
-        MkPointsGoodsRecord record = new MkPointsGoodsRecord();
-        record.setStatus("退款中");
-        record.setCancelOrRefundReason(param.getReason());
-        record.setCancelOrRefundTime(LocalDateTime.now());
-
-        return goodsRecordService.update(record, query()
-                .eq(MkPointsGoodsRecord::getId, param.getRecordId())
-                .eq(MkPointsGoodsRecord::getOrderNo, param.getOrderNo())
-                .eq(MkPointsGoodsRecord::getUserId, userId)
-        );
-    }
-
-    @Override
-    public boolean cancelRefund(PointGoodsRefundDTO param, Long userId, Long shopId) {
-        MkPointsGoodsRecord record1 = goodsRecordService.getById(param.getRecordId());
-        if (record1 == null) {
-            throw new CzgException("取消失败，订单不存在");
-        }
-        if (!"退款中".equals(record1.getStatus())) {
-            throw new CzgException("取消失败，订单不处于退款中");
-        }
-        MkPointsGoodsRecord record = new MkPointsGoodsRecord();
-        if (record1.getCheckoutTime() != null) {
-            record.setStatus("已完成");
-        } else {
-            record.setStatus("待核销");
-        }
-        record.setCancelOrRefundReason(param.getReason());
-        record.setCancelOrRefundTime(LocalDateTime.now());
-
-        return goodsRecordService.update(record, query()
-                .eq(MkPointsGoodsRecord::getId, param.getRecordId())
-                .eq(MkPointsGoodsRecord::getOrderNo, param.getOrderNo())
-                .eq(MkPointsGoodsRecord::getUserId, userId)
-                .eq(MkPointsGoodsRecord::getShopId, shopId)
-        );
-    }
-
    @Override
    public boolean upNumberById(Long id, Integer quantity, Integer totalExchangeCount) {
        MkPointsGoods goodUp = new MkPointsGoods();
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java
@@ -123,7 +123,47 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
    }

    @Override
-    public boolean applyRefund(PointGoodsRefundDTO param, Long shopId) {
+    public boolean applyRefund(PointGoodsRefundDTO param, Long userId) {
+        MkPointsGoodsRecord record = new MkPointsGoodsRecord();
+        record.setStatus("退款中");
+        record.setCancelOrRefundReason(param.getReason());
+        record.setCancelOrRefundTime(LocalDateTime.now());
+
+        return goodsRecordService.update(record, QueryWrapper.create()
+                .eq(MkPointsGoodsRecord::getId, param.getRecordId())
+                .eq(MkPointsGoodsRecord::getOrderNo, param.getOrderNo())
+                .eq(MkPointsGoodsRecord::getUserId, userId)
+        );
+    }
+
+    @Override
+    public boolean cancelRefund(PointGoodsRefundDTO param, Long userId, Long shopId) {
+        MkPointsGoodsRecord record1 = goodsRecordService.getById(param.getRecordId());
+        if (record1 == null) {
+            throw new CzgException("取消失败，订单不存在");
+        }
+        if (!"退款中".equals(record1.getStatus())) {
+            throw new CzgException("取消失败，订单不处于退款中");
+        }
+        MkPointsGoodsRecord record = new MkPointsGoodsRecord();
+        if (record1.getCheckoutTime() != null) {
+            record.setStatus("已完成");
+        } else {
+            record.setStatus("待核销");
+        }
+        record.setCancelOrRefundReason(param.getReason());
+        record.setCancelOrRefundTime(LocalDateTime.now());
+
+        return goodsRecordService.update(record, QueryWrapper.create()
+                .eq(MkPointsGoodsRecord::getId, param.getRecordId())
+                .eq(MkPointsGoodsRecord::getOrderNo, param.getOrderNo())
+                .eq(MkPointsGoodsRecord::getUserId, userId)
+                .eq(MkPointsGoodsRecord::getShopId, shopId)
+        );
+    }
+
+    @Override
+    public boolean agreeRefund(PointGoodsRefundDTO param, Long shopId) {
        MkPointsGoodsRecord record = goodsRecordService.getOne(QueryWrapper.create()
                .eq(MkPointsGoodsRecord::getId, param.getRecordId())
                .eq(MkPointsGoodsRecord::getShopId, shopId));