删除原有activityManage模块代码

src/main/java/com/sqx/modules/activityManage/controller/AdminActivityManageController.java

@@ -1,75 +0,0 @@
-package com.sqx.modules.activityManage.controller;
-
-
-import com.sqx.common.utils.Result;
-import com.sqx.modules.activityManage.entity.ActivityManage;
-import com.sqx.modules.activityManage.service.ActivityManageService;
-import com.sqx.modules.goods.entity.GoodsShop;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 活动管理
- * </p>
- *
- * @author 吴畅
- * @since 2022-11-04
- */
-@RestController
-@RequestMapping("/admin/activityManage/")
-public class AdminActivityManageController {
-    @Autowired
-    private ActivityManageService activityManageService;
-
-    @PostMapping("addActivity")
-    @ApiOperation("添加活动")
-    public Result addActivity(ActivityManage activityManage) {
-        return activityManageService.addActivity(activityManage);
-    }
-
-    @PostMapping("updateActivity")
-    @ApiOperation("修改活动")
-    public Result updateActivity(ActivityManage activityManage) {
-        return activityManageService.updateActivity(activityManage);
-    }
-
-    @PostMapping("deleteActivity")
-    @ApiOperation("删除活动")
-    public Result deleteActivity(Long activityId) {
-        return activityManageService.deleteActivity(activityId);
-    }
-
-    @GetMapping("getActivityList")
-    @ApiOperation("获取活动列表")
-    public Result getActivityList(Integer page, Integer limit, ActivityManage activityManage) {
-        return Result.success().put("data", activityManageService.getActivityList(page, limit, activityManage));
-    }
-    @GetMapping("getActivityInfo")
-    @ApiOperation("获取活动信息")
-    public Result getActivityInfo(Long activityId){
-        return Result.success().put("data", activityManageService.getActivityInfo(activityId));
-
-    }
-    @GetMapping("getShoActivityShopList")
-    @ApiOperation("根据活动查找商家列表")
-    public Result getShoActivityShopList(Integer page, Integer limit, GoodsShop goodsShop) {
-        return Result.success().put("data", activityManageService.getAdminShoActivityShopList(page, limit, goodsShop));
-    }
-    @GetMapping("cancelActivityShop")
-    @ApiOperation("删除活动中的商家")
-    public Result cancelActivityShop(Long activityId,Long shopId){
-        return activityManageService.cancelActivityShop(activityId,shopId);
-    }
-    @GetMapping("shopJoinActivity")
-    @ApiOperation("将商家加入活动")
-    private Result shopJoinActivity(Long shopId, Long activityId) {
-        return activityManageService.shopJoinActivity(shopId, activityId,1);
-    }
-}
-

src/main/java/com/sqx/modules/activityManage/controller/app/AppActivityManageController.java

@@ -1,55 +0,0 @@
-package com.sqx.modules.activityManage.controller.app;
-
-
-import com.sqx.common.utils.Result;
-import com.sqx.modules.activityManage.entity.ActivityManage;
-import com.sqx.modules.activityManage.service.ActivityManageService;
-import com.sqx.modules.goods.entity.GoodsShop;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 活动管理
- * </p>
- *
- * @author 吴畅
- * @since 2022-11-04
- */
-@RestController
-@RequestMapping("/app/activityManage/")
-public class AppActivityManageController {
-    @Autowired
-    private ActivityManageService activityManageService;
-
-
-    @GetMapping("getActivityList")
-    @ApiOperation("获取活动列表")
-    public Result getActivityList(Integer page, Integer limit, ActivityManage activityManage) {
-        activityManage.setIsEnable(1);
-        return Result.success().put("data", activityManageService.getActivityList(page, limit, activityManage));
-    }
-
-    @GetMapping("getActivityInfo")
-    @ApiOperation("获取活动信息")
-    public Result getActivityInfo(Long activityId) {
-        return Result.success().put("data", activityManageService.getActivityInfo(activityId));
-    }
-
-    @GetMapping("getShoActivityShopList")
-    @ApiOperation("根据活动查找商家列表")
-    public Result getShoActivityShopList(Integer page, Integer limit,Double lng,Double lat, GoodsShop goodsShop) {
-        return Result.success().put("data", activityManageService.getShoActivityShopList(page, limit,lng,lat ,goodsShop));
-    }
-
-    @GetMapping("shopJoinActivity")
-    @ApiOperation("商户主动加入活动")
-    private Result shopJoinActivity(Long shopId, Long activityId) {
-        return activityManageService.shopJoinActivity(shopId, activityId,0);
-    }
-}
-

src/main/java/com/sqx/modules/activityManage/dao/ActivityManageDao.java

@@ -1,18 +0,0 @@
-package com.sqx.modules.activityManage.dao;
-
-import com.sqx.modules.activityManage.entity.ActivityManage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author www.javacoder.top
- * @since 2022-11-04
- */
-@Mapper
-public interface ActivityManageDao extends BaseMapper<ActivityManage> {
-
-}

src/main/java/com/sqx/modules/activityManage/entity/ActivityManage.java

@@ -1,66 +0,0 @@
-package com.sqx.modules.activityManage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.SqlCondition;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author www.javacoder.top
- * @since 2022-11-04
- */
-@Data
-public class ActivityManage implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 活动id
-     */
-    @TableId(value = "activity_id", type = IdType.AUTO)
-    private Long activityId;
-
-    /**
-     * 活动标题
-     */
-    @TableField(condition = SqlCondition.LIKE)
-    private String activityTitle;
-
-    /**
-     * 活动内容介绍
-     */
-    private String activityContent;
-
-    /**
-     * 活动图片
-     */
-    private String activityImage;
-
-    /**
-     * 是否启用(0否 1是)
-     */
-    private Integer isEnable;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-    /**
-     * 是否允许商户主动加入 0否 1是
-     */
-    private Integer isAllowShop;
-}

src/main/java/com/sqx/modules/activityManage/service/ActivityManageService.java

@@ -1,46 +0,0 @@
-package com.sqx.modules.activityManage.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.sqx.common.utils.Result;
-import com.sqx.modules.activityManage.entity.ActivityManage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.sqx.modules.goods.entity.GoodsShop;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author www.javacoder.top
- * @since 2022-11-04
- */
-public interface ActivityManageService extends IService<ActivityManage> {
-
-    Result addActivity(ActivityManage activityManage);
-
-    Result updateActivity(ActivityManage activityManage);
-
-    Result deleteActivity(Long activityId);
-
-    IPage<ActivityManage> getActivityList(Integer page, Integer limit, ActivityManage activityManage);
-
-
-    ActivityManage getActivityInfo(Long activityId);
-
-    IPage<GoodsShop> getShoActivityShopList(Integer page, Integer limit, Double lng, Double lat, GoodsShop goodsShop);
-
-    IPage<GoodsShop> getAdminShoActivityShopList(Integer page, Integer limit, GoodsShop goodsShop);
-
-    Result cancelActivityShop(Long activityId, Long shopId);
-
-    /**
-     *
-     * @param shopId
-     * @param activityId
-     * @param auth 1表示是管理员给活动中添加商铺
-     * @return
-     */
-    Result shopJoinActivity(Long shopId, Long activityId, Integer auth);
-
-    Result addShopActivity(Long activityId, Long shopId);
-}

src/main/java/com/sqx/modules/activityManage/service/impl/ActivityManageServiceImpl.java

@@ -1,200 +0,0 @@
-package com.sqx.modules.activityManage.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sqx.common.utils.Result;
-import com.sqx.modules.activityManage.entity.ActivityManage;
-import com.sqx.modules.activityManage.dao.ActivityManageDao;
-import com.sqx.modules.activityManage.service.ActivityManageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sqx.modules.app.entity.UserEntity;
-import com.sqx.modules.app.service.UserService;
-import com.sqx.modules.common.entity.CommonInfo;
-import com.sqx.modules.common.service.CommonInfoService;
-import com.sqx.modules.goods.dao.GoodsShopDao;
-import com.sqx.modules.goods.entity.GoodsShop;
-import com.sqx.modules.goods.service.GoodsShopService;
-import com.sqx.modules.utils.HttpClientUtil;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author www.javacoder.top
- * @since 2022-11-04
- */
-@Service
-public class ActivityManageServiceImpl extends ServiceImpl<ActivityManageDao, ActivityManage> implements ActivityManageService {
-    @Autowired
-    private ActivityManageDao activityManageDao;
-    @Autowired
-    private GoodsShopService goodsShopService;
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private GoodsShopDao goodsShopDao;
-    @Autowired
-    private CommonInfoService commonInfoService;
-    @Override
-    public Result addActivity(ActivityManage activityManage) {
-        activityManage.setCreateTime(new Date());
-        activityManage.setUpdateTime(new Date());
-        return Result.upStatus(activityManageDao.insert(activityManage));
-
-    }
-
-    @Override
-    public Result updateActivity(ActivityManage activityManage) {
-        if (activityManage.getActivityId() == null) {
-            return Result.error("活动id不能为空");
-        }
-        return Result.upStatus(activityManageDao.updateById(activityManage));
-
-    }
-
-    @Override
-    public Result deleteActivity(Long activityId) {
-
-        return Result.upStatus(activityManageDao.deleteById(activityId));
-
-
-    }
-
-    @Override
-    public IPage<ActivityManage> getActivityList(Integer page, Integer limit, ActivityManage activityManage) {
-        IPage<ActivityManage> pages;
-        if (page != null && limit != null) {
-            pages = new Page<>(page, limit);
-        } else {
-            pages = new Page<>();
-        }
-        return activityManageDao.selectPage(pages, new QueryWrapper<>(activityManage));
-    }
-
-    @Override
-    public ActivityManage getActivityInfo(Long activityId) {
-
-        return activityManageDao.selectById(activityId);
-
-    }
-
-    @Override
-    public IPage<GoodsShop> getShoActivityShopList(Integer page, Integer limit, Double lng, Double lat, GoodsShop goodsShop) {
-        Page<GoodsShop> pages;
-        if (page != null && limit != null) {
-            pages = new Page<>(page, limit);
-        } else {
-            pages = new Page<>();
-        }
-        //如果没有经纬度，则默认为北京的经纬度
-       if(lng==null && lat==null){
-           lng = 121.47;
-           lat = 31.23;
-       }
-
-       goodsShop.setShopLng(lng);
-       goodsShop.setShopLat(lat);
-
-
-        String way = commonInfoService.findOne(416).getValue();
-        if("1".equals(way)){
-            CommonInfo one = commonInfoService.findOne(235);
-            String url = "https://apis.map.qq.com/ws/geocoder/v1/";
-            Map<String, String> maps = new HashMap<>();
-            maps.put("location", lat + "," + lng);
-            maps.put("key", one.getValue());
-            String data = HttpClientUtil.doGet(url, maps);
-            JSONObject jsonObject = JSON.parseObject(data);
-            String status = jsonObject.getString("status");
-            if ("0".equals(status)) {
-                JSONObject result = jsonObject.getJSONObject("result");
-                JSONObject adInfo = result.getJSONObject("ad_info");
-                String city = (String)adInfo.get("city");
-                goodsShop.setCity(city);
-                return goodsShopDao.getShoActivityShopList(pages, goodsShop);
-            }
-        }else{
-            String value = commonInfoService.findOne(417).getValue();
-            String url="http://api.tianditu.gov.cn/geocoder";
-            Map<String,String> param=new HashMap<>();
-            JSONObject postStr=new JSONObject();
-            postStr.put("lon",lng);
-            postStr.put("lat",lat);
-            postStr.put("ver","1");
-            param.put("postStr",postStr.toJSONString());
-            param.put("type","geocode");
-            param.put("tk",value);
-            String s = HttpClientUtil.doGet(url,param);
-            JSONObject jsonObject = JSONObject.parseObject(s);
-            String status = jsonObject.getString("status");
-            if("0".equals(status)){
-                JSONObject result = jsonObject.getJSONObject("result");
-                JSONObject addressComponent = result.getJSONObject("addressComponent");
-                String city = addressComponent.getString("city");
-                goodsShop.setCity(city);
-                return goodsShopDao.getShoActivityShopList(pages, goodsShop);
-            }
-        }
-        return null;
-    }
-
-
-    @Override
-    public IPage<GoodsShop> getAdminShoActivityShopList(Integer page, Integer limit, GoodsShop goodsShop) {
-        Page<GoodsShop> pages;
-        if (page != null && limit != null) {
-            pages = new Page<>(page, limit);
-        } else {
-            pages = new Page<>();
-        }
-        return goodsShopDao.getAdminShoActivityShopList(pages, goodsShop);
-    }
-
-
-
-
-    @Override
-    public Result cancelActivityShop(Long activityId, Long shopId) {
-        return Result.upStatus(goodsShopService.cancelActivityShop(activityId, shopId));
-
-    }
-
-    @Override
-    public Result shopJoinActivity(Long shopId, Long activityId, Integer auth) {
-        ActivityManage activityManage = activityManageDao.selectById(activityId);
-        if (activityManage == null) {
-            return Result.error("当前活动不存在");
-        }
-        if (auth != 1) {
-            if (activityManage.getIsAllowShop() == 0) {
-                return Result.error("当前活动不允许商家自行加入");
-            }
-        }
-
-        GoodsShop goodsShop = new GoodsShop();
-        goodsShop.setShopId(shopId);
-        goodsShop.setActivityId(activityId);
-        goodsShopService.updateById(goodsShop);
-        return Result.success();
-
-    }
-
-    @Override
-    public Result addShopActivity(Long activityId, Long shopId) {
-        UserEntity entity = new UserEntity();
-
-        userService.updateById(entity);
-        return Result.success();
-    }
-}

src/main/java/com/sqx/modules/goods/controller/app/AppGoodsController.java

@@ -79,9 +79,10 @@ public class AppGoodsController {
         return goodsService.selectEvaluate(page, limit, shopId,goodsId, grade);
     }
 
-    @GetMapping("/getShopActivity")
-    @ApiOperation("获取商家所在活动")
-    public Result getShopActivity(Long shopId){
-        return Result.success().put("data", goodsShopService.getShopActivity(shopId));
-    }
+    // TODO 待活动重构完成后看是否需要补充该接口
+    // @GetMapping("/getShopActivity")
+    // @ApiOperation("获取商家所在活动")
+    // public Result getShopActivity(Long shopId){
+    //     return Result.success().put("data", goodsShopService.getShopActivity(shopId));
+    // }
 }

src/main/java/com/sqx/modules/goods/service/GoodsShopService.java

@@ -1,10 +1,7 @@
 package com.sqx.modules.goods.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.common.utils.Result;
-import com.sqx.modules.activityManage.entity.ActivityManage;
 import com.sqx.modules.goods.entity.GoodsShop;
 import com.sqx.modules.goods.entity.GoodsShopRelevancy;
 import com.sqx.modules.goods.vo.GoodsShopVo;
@@ -41,6 +38,6 @@ public interface GoodsShopService extends IService<GoodsShop> {
 
     Integer cancelActivityShop(Long activityId, Long shopId);
 
-    ActivityManage getShopActivity(Long shopId);
+    // ActivityManage getShopActivity(Long shopId);
 
 }

src/main/java/com/sqx/modules/goods/service/impl/GoodsShopServiceImpl.java

@@ -10,8 +10,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
-import com.sqx.modules.activityManage.entity.ActivityManage;
-import com.sqx.modules.activityManage.service.ActivityManageService;
 import com.sqx.modules.app.dao.MsgDao;
 import com.sqx.modules.app.dao.UserDao;
 import com.sqx.modules.app.entity.Msg;
@@ -89,8 +87,6 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
     @Autowired
     private GoodsAttrService goodsAttrService;
     @Autowired
-    private ActivityManageService activityManageService;
-    @Autowired
     private UserService userService;
     @Autowired
     private UserMoneyService userMoneyService;
@@ -518,17 +514,15 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
 
     }
 
-    @Override
-    public ActivityManage getShopActivity(Long shopId) {
-        GoodsShop goodsShop = goodsShopDao.selectById(shopId);
-        ShopType shopType = typeService.getById(goodsShop.getShopTypeId());
-        if(shopType!=null){
-            goodsShop.setShopTypeName(shopType.getShopTypeName());
-        }
-       return activityManageService.getById(goodsShop.getActivityId());
-
-
-    }
+    // @Override
+    // public ActivityManage getShopActivity(Long shopId) {
+    //     GoodsShop goodsShop = goodsShopDao.selectById(shopId);
+    //     ShopType shopType = typeService.getById(goodsShop.getShopTypeId());
+    //     if(shopType!=null){
+    //         goodsShop.setShopTypeName(shopType.getShopTypeName());
+    //     }
+    //    return activityManageService.getById(goodsShop.getActivityId());
+    // }
 
 
 }