店铺列表 普通店铺使用

用户优惠券列表

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);
     }