Remove .idea directory

src/main/java/com/sqx/modules/printInfo/controller/PrintInfoController.java

@@ -0,0 +1,75 @@
+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/printInfo/controller/app/AppPrintInfoController.java

@@ -0,0 +1,55 @@
+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/printInfo/dao/PrintInfoDao.java

@@ -0,0 +1,18 @@
+package com.sqx.modules.printInfo.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sqx.modules.printInfo.entity.ActivityManage;
+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/printInfo/dao/PrintInfoShopDao.java

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

src/main/java/com/sqx/modules/printInfo/entity/PrintDropVo.java

@@ -0,0 +1,50 @@
+package com.sqx.modules.printInfo.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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+@Data
+public class PrintInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    @ApiModelProperty("类型id")
+    private Integer typeId;
+
+    @ApiModelProperty("打印信息类型")
+    private String typeName;
+
+    @ApiModelProperty("打印信息名称")
+    private String printName;
+
+    @ApiModelProperty("打印信息字段名")
+    private String printField;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    private String updateTime;
+
+    @ApiModelProperty("是否删除（0：未删除；1：删除）")
+    private Integer deleteFlag;
+}

src/main/java/com/sqx/modules/printInfo/entity/PrintInfo.java

@@ -0,0 +1,65 @@
+package com.sqx.modules.printInfo.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.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/printInfo/entity/PrintInfoShop.java

@@ -0,0 +1,50 @@
+package com.sqx.modules.printInfo.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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+@Data
+public class PrintInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    @ApiModelProperty("类型id")
+    private Integer typeId;
+
+    @ApiModelProperty("打印信息类型")
+    private String typeName;
+
+    @ApiModelProperty("打印信息名称")
+    private String printName;
+
+    @ApiModelProperty("打印信息字段名")
+    private String printField;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
+
+    @ApiModelProperty("修改时间")
+    private String updateTime;
+
+    @ApiModelProperty("是否删除（0：未删除；1：删除）")
+    private Integer deleteFlag;
+}

src/main/java/com/sqx/modules/printInfo/entity/PrintModelDetailResult.java

@@ -0,0 +1,23 @@
+package com.sqx.modules.printInfo.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+@Data
+public class PrintModelResult {
+
+    @ApiModelProperty("类型ID")
+    private Integer id;
+
+    @ApiModelProperty("类型名称")
+    private String name;
+
+}

src/main/java/com/sqx/modules/printInfo/entity/PrintModelResult.java

@@ -0,0 +1,27 @@
+package com.sqx.modules.printInfo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+@Data
+public class PrintDropVo {
+
+    @ApiModelProperty("数据下拉id")
+    private Integer id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+}

src/main/java/com/sqx/modules/printInfo/entity/PrintModelTypeResult.java

@@ -0,0 +1,34 @@
+package com.sqx.modules.printInfo.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+@Data
+public class PrintModelDetailResult {
+
+    @ApiModelProperty("打印信息字段ID")
+    private Integer id;
+
+    @ApiModelProperty("打印信息名称")
+    private String printName;
+
+    @ApiModelProperty("打印信息字段名")
+    private String printField;
+
+    /**
+     * 是否勾选
+     * 否：0
+     * 是：1
+     */
+    @ApiModelProperty("是否勾选")
+    private Integer isCheck;
+
+}

src/main/java/com/sqx/modules/printInfo/entity/PrintResultModelVo.java

@@ -0,0 +1,27 @@
+package com.sqx.modules.printInfo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+@Data
+public class PrintDropVo {
+
+    @ApiModelProperty("数据下拉id")
+    private Integer id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+}

src/main/java/com/sqx/modules/printInfo/entity/eOrderTypeExtra.java

@@ -0,0 +1,90 @@
+package com.sqx.modules.printInfo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/6 星期四 16:34
+ * @Description: com.template.model.enumModel
+ * @Version: 1.0
+ * 考勤状态
+ */
+// 基本信息：1
+// 商品信息：2
+// 支付信息：3
+// 用户信息：4
+public enum ePrintStatu {
+    Base(1),//基本信息
+    Good(2),//商品信息
+    Pay(3),//支付信息
+    User(4);//用户信息
+
+    private int value;
+
+    ePrintStatu(int value){
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+    public static ePrintStatu valueOf(int value) {
+        switch (value) {
+            case 1:
+                return ePrintStatu.Base;
+            case 2:
+                return ePrintStatu.Good;
+            case 3:
+                return ePrintStatu.Pay;
+            case 4:
+                return ePrintStatu.User;
+            default:
+                return null;
+        }
+    }
+
+    public static Integer integerOf(String value) {
+        switch (value) {
+            case "基本信息":
+                return 1;
+            case "商品信息":
+                return 2;
+            case "支付信息":
+                return 3;
+            case "用户信息":
+                return 4;
+            default:
+                return null;
+        }
+    }
+
+    public static String stringOf(Integer value) {
+        switch (value) {
+            case 1:
+                return "基本信息";
+            case 2:
+                return "商品信息";
+            case 3:
+                return "支付信息";
+            case 4:
+                return "用户信息";
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 获取考勤状态集合
+     * @return
+     */
+    public static List<Integer> attendanceStatus(){
+        List<Integer> result = new ArrayList<>();
+        result.add(0);
+        result.add(1);
+        result.add(3);
+        result.add(6);
+        result.add(7);
+        return result;
+    }
+}

src/main/java/com/sqx/modules/printInfo/entity/ePrintStatu.java

@@ -0,0 +1,98 @@
+package com.template.model.enumModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/6 星期四 16:34
+ * @Description: com.template.model.enumModel
+ * @Version: 1.0
+ * 考勤状态
+ */
+// 准时：0
+// 迟到：1
+// 缺卡：3
+// 请假：6
+// 超时打卡：7
+public enum eAttendanceStatu {
+    OnTime(0),//准时
+    BeLate(1),//迟到
+    LackCard(3),//缺卡
+    AskLeave(6),//请假
+    ClockIn(7);//超时打卡
+
+    private int value;
+
+    eAttendanceStatu(int value){
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+    public static eAttendanceStatu valueOf(int value) {
+        switch (value) {
+            case 0:
+                return eAttendanceStatu.OnTime;
+            case 1:
+                return eAttendanceStatu.BeLate;
+            case 3:
+                return eAttendanceStatu.LackCard;
+            case 6:
+                return eAttendanceStatu.AskLeave;
+            case 7:
+                return eAttendanceStatu.ClockIn;
+            default:
+                return null;
+        }
+    }
+
+    public static Integer integerOf(String value) {
+        switch (value) {
+            case "准时":
+                return 0;
+            case "迟到":
+                return 1;
+            case "缺卡":
+                return 3;
+            case "请假":
+                return 6;
+            case "超时打卡":
+                return 7;
+            default:
+                return null;
+        }
+    }
+
+    public static String stringOf(Integer value) {
+        switch (value) {
+            case 0:
+                return "准时";
+            case 1:
+                return "迟到";
+            case 3:
+                return "缺卡";
+            case 6:
+                return "请假";
+            case 7:
+                return "超时打卡";
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 获取考勤状态集合
+     * @return
+     */
+    public static List<Integer> attendanceStatus(){
+        List<Integer> result = new ArrayList<>();
+        result.add(0);
+        result.add(1);
+        result.add(3);
+        result.add(6);
+        result.add(7);
+        return result;
+    }
+}

src/main/java/com/sqx/modules/printInfo/entity/eWordSize.java

@@ -0,0 +1,82 @@
+package com.sqx.modules.printInfo.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/7/6 星期四 16:34
+ * @Description: com.template.model.enumModel
+ * @Version: 1.0
+ * 订单类型
+ */
+//上门：1
+//骑手配送：2
+//商家配送：3
+public enum eOrderTypeExtra {
+    Door(1),//上门
+    Rider(2),//骑手配送
+    Store(3);//商家配送
+
+    private int value;
+
+    eOrderTypeExtra(int value){
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+    public static eOrderTypeExtra valueOf(int value) {
+        switch (value) {
+            case 1:
+                return eOrderTypeExtra.Door;
+            case 2:
+                return eOrderTypeExtra.Rider;
+            case 3:
+                return eOrderTypeExtra.Store;
+            default:
+                return null;
+        }
+    }
+
+    public static Integer integerOf(String value) {
+        switch (value) {
+            case "上门":
+                return 1;
+            case "骑手配送":
+                return 2;
+            case "商家配送":
+                return 3;
+            default:
+                return null;
+        }
+    }
+
+    public static String stringOf(Integer value) {
+        switch (value) {
+            case 1:
+                return "上门";
+            case 2:
+                return "骑手配送";
+            case 3:
+                return "商家配送";
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 获取考勤状态集合
+     * @return
+     */
+    public static List<Integer> attendanceStatus(){
+        List<Integer> result = new ArrayList<>();
+        result.add(0);
+        result.add(1);
+        result.add(3);
+        result.add(6);
+        result.add(7);
+        return result;
+    }
+}

src/main/java/com/sqx/modules/printInfo/service/PrintInfoService.java

@@ -0,0 +1,46 @@
+package com.sqx.modules.printInfo.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.goods.entity.GoodsShop;
+import com.sqx.modules.printInfo.entity.ActivityManage;
+
+/**
+ * <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/printInfo/service/PrintInfoShopService.java

@@ -0,0 +1,25 @@
+package com.sqx.modules.printInfo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.printInfo.entity.PrintInfo;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+public interface PrintInfoService extends IService<PrintInfo> {
+    Result selectPrintInfoList(Integer page, Integer limit);
+
+    Result insertPrintInfo(PrintInfo PrintInfo);
+
+    Result updatePrintInfo(PrintInfo PrintInfo);
+
+    Result selectPrintInfoById(Integer id);
+
+    Result deletePrintInfo(Integer id);
+}

src/main/java/com/sqx/modules/printInfo/service/impl/PrintInfoServiceImpl.java

@@ -0,0 +1,199 @@
+package com.sqx.modules.printInfo.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.Result;
+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.printInfo.dao.PrintInfoDao;
+import com.sqx.modules.printInfo.entity.ActivityManage;
+import com.sqx.modules.printInfo.service.ActivityManageService;
+import com.sqx.modules.utils.HttpClientUtil;
+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<PrintInfoDao, ActivityManage> implements ActivityManageService {
+    @Autowired
+    private PrintInfoDao 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/printInfo/service/impl/PrintInfoShopServiceImpl.java

@@ -0,0 +1,70 @@
+package com.sqx.modules.printInfo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.printInfo.dao.PrintInfoDao;
+import com.sqx.modules.printInfo.entity.PrintInfo;
+import com.sqx.modules.printInfo.service.PrintInfoService;
+import com.sqx.modules.shop.entity.SearchHistory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author www.javacoder.top
+ * @since 2022-11-04
+ */
+@Service
+public class PrintInfoServiceImpl extends ServiceImpl<PrintInfoDao, PrintInfo> implements PrintInfoService {
+    @Autowired
+    private PrintInfoDao printInfoDao;
+
+    @Override
+    public Result selectPrintInfoList(Integer page, Integer limit) {
+        Page<PrintInfo> pages = new Page<>(page, limit);
+        PageUtils pageUtils = new PageUtils(baseMapper.selectPage(pages,null));
+        return Result.success().put("data", pageUtils);
+    }
+
+    @Transactional
+    @Override
+    public Result insertPrintInfo(PrintInfo PrintInfo) {
+        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        PrintInfo.setCreateTime(format);
+        PrintInfo.setUpdateTime(format);
+        PrintInfo.setDeleteFlag(0);
+        baseMapper.insert(PrintInfo);
+        return Result.success();
+    }
+
+    @Transactional
+    @Override
+    public Result updatePrintInfo(PrintInfo PrintInfo) {
+        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        PrintInfo.setUpdateTime(format);
+        baseMapper.updateById(PrintInfo);
+        return Result.success();
+    }
+
+    @Override
+    public Result selectPrintInfoById(Integer id) {
+        PrintInfo PrintInfo = baseMapper.selectById(id);
+        return Result.success().put("data", PrintInfo);
+    }
+
+    @Override
+    public Result deletePrintInfo(Integer id) {
+        baseMapper.deleteById(id);
+        return Result.success();
+    }
+}

src/main/resources/mapper/printInfo/PrintInfoDao.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sqx.modules.address.dao.AddressDao">
+
+    <select id="selectAddressList" resultType="com.sqx.modules.address.entity.Address">
+        select * from address where user_id = #{userId}
+        order by address_default desc, update_time desc
+    </select>
+
+</mapper>

src/main/resources/mapper/printInfo/PrintInfoShopDao.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sqx.modules.printInfo.dao.PrintInfoDao">
+
+
+</mapper>