店铺列表 普通店铺使用

用户优惠券列表

cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java

@@ -46,6 +46,15 @@ public class ShopInfoController {
         return CzgResult.success(shopInfoService.get(pageDTO, shopName, status, isHeadShop));
     }
 
+    /**
+     * 店铺的 店铺列表
+     *
+     */
+    @GetMapping("/otherShop")
+    public CzgResult<Page<ShopInfo>> getShopByMainId(PageDTO pageDTO, String shopName, Integer status) {
+        return CzgResult.success(shopInfoService.getShopByMainId(pageDTO, shopName, status));
+    }
+
     /**
      * 店铺详情
      * 权限标识: shopInfo:detail

cash-api/market-server/src/main/java/com/czg/controller/admin/ACouponController.java

@@ -158,7 +158,7 @@ public class ACouponController {
             @RequestParam(required = false) String startTime,
             @RequestParam(required = false) String endTime,
             MkShopCouponRecordDTO param) {
-        Page<MkShopCouponRecordDTO> data = couponRecordService.getRecordByUser(param, startTime, endTime);
+        Page<MkShopCouponRecordDTO> data = couponRecordService.getRecordByShopUser(param, startTime, endTime);
         return CzgResult.success(data);
     }
 

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java

@@ -14,6 +14,8 @@ import java.util.List;
 public interface ShopInfoService extends IService<ShopInfo> {
     Page<ShopInfo> get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop);
 
+    Page<ShopInfo> getShopByMainId(PageDTO pageDTO, String shopName, Integer status);
+
     Boolean add(ShopInfoAddDTO shopInfoAddDTO);
 
     Boolean edit(ShopInfoEditDTO shopInfoEditDTO);

cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java

@@ -32,7 +32,7 @@ public interface MkShopCouponRecordService extends IService<MkShopCouponRecord>
      * 优惠券列表/已领取详情
      */
     Page<MkShopCouponRecordDTO> getRecord(MkShopCouponRecordDTO param, String startTime, String endTime);
-    Page<MkShopCouponRecordDTO> getRecordByUser(MkShopCouponRecordDTO param, String startTime, String endTime);
+    Page<MkShopCouponRecordDTO> getRecordByShopUser(MkShopCouponRecordDTO param, String startTime, String endTime);
 
     /**
      * 发放券 统一方法

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java

@@ -374,6 +374,27 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
         return PageUtil.convert(new PageInfo<>(mapper.getSubList(lng, lat, distance)));
     }
 
+    @Override
+    public Page<ShopInfo> getShopByMainId(PageDTO pageDTO, String shopName, Integer status) {
+        Long loginId = (Long) StpKit.USER.getLoginId();
+        ShopInfo shopInfo = getById(loginId);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        if (!"only".equals(shopInfo.getShopType())) {
+            if (shopInfo.getIsHeadShop() != 1) {
+                queryWrapper.eq(ShopInfo::getId, loginId);
+            } else {
+                queryWrapper.and(q -> {
+                    q.eq(ShopInfo::getId, loginId).or(q1 -> {
+                        q1.eq(ShopInfo::getMainId, loginId);
+                    });
+                });
+            }
+        } else {
+            queryWrapper.eq(ShopInfo::getId, loginId);
+        }
+        return page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper);
+    }
+
     @Override
     public List<ShopBranchSelectDTO> findShopBranch(Long shopId) {
         Long mainIdByShopId = getMainIdByShopId(shopId);

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java

@@ -134,24 +134,23 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
 
 
     @Override
-    public Page<MkShopCouponRecordDTO> getRecordByUser(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
+    public Page<MkShopCouponRecordDTO> getRecordByShopUser(MkShopCouponRecordDTO mkShopCouponRecordDTO, String startTime, String endTime) {
-        AssertUtil.isNull(mkShopCouponRecordDTO.getShopId(), "店铺ID不能为空");
+        AssertUtil.isNull(mkShopCouponRecordDTO.getShopUserId(), "店铺用户ID不能为空");
-        AssertUtil.isNull(mkShopCouponRecordDTO.getUserId(), "用户ID不能为空");
         QueryWrapper recordQueryWrapper = new QueryWrapper();
         recordQueryWrapper.eq(MkShopCouponRecord::getShopId, mkShopCouponRecordDTO.getShopId())
                 .eq(MkShopCouponRecord::getIsDel, 0)
                 .eq(MkShopCouponRecord::getStatus, mkShopCouponRecordDTO.getStatus())
-                .eq(MkShopCouponRecord::getUserId, mkShopCouponRecordDTO.getUserId())
+                .eq(MkShopCouponRecord::getShopUserId, mkShopCouponRecordDTO.getShopUserId())
                 .orderBy(MkShopCouponRecord::getCreateTime).desc();
         if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) {
             recordQueryWrapper.between(MkShopCouponRecord::getCreateTime, startTime, endTime);
         }
         Page<MkShopCouponRecordDTO> recordPage = pageAs(PageUtil.buildPage(), recordQueryWrapper, MkShopCouponRecordDTO.class);
         if (mkShopCouponRecordDTO.getUserId() != null) {
-            UserInfo userInfo = userInfoService.getById(mkShopCouponRecordDTO.getUserId());
+            ShopUser shopUser = shopUserService.getById(mkShopCouponRecordDTO.getShopUserId());
             for (MkShopCouponRecordDTO record : recordPage.getRecords()) {
-                record.setHeadImg(userInfo.getHeadImg());
+                record.setHeadImg(shopUser.getHeadImg());
-                record.setNickName(userInfo.getNickName());
+                record.setNickName(shopUser.getNickName());
             }
         }
         return recordPage;