diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/controller/SysCouponController.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/controller/SysCouponController.java index 321a84b..c3dd142 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/controller/SysCouponController.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/controller/SysCouponController.java @@ -95,8 +95,10 @@ public class SysCouponController { public R verification(HttpServletRequest request ,@Parameter(name = "id", description = "领取记录表ID", required = true) @RequestParam String id , @Parameter(name = "checkCode", description = "核销码", - required = true)@RequestParam String checkCode) { - return this.sysCouponService.verification(id,checkCode); + required = true)@RequestParam String checkCode, + @Parameter(name = "openId", description = "核销码", + required = true)String openId) { + return this.sysCouponService.verification(id,checkCode,openId); } } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/controller/SysDataStatisticsController.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/controller/SysDataStatisticsController.java new file mode 100644 index 0000000..0a8a121 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/controller/SysDataStatisticsController.java @@ -0,0 +1,58 @@ +package com.hb0730.boot.admin.modules.api.buiness.controller; + + +import cn.hutool.core.collection.CollectionUtil; +import com.hb0730.boot.admin.base.R; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysReadDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.query.CouponQuery; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponDataVO; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.api.buiness.service.SysReadDataService; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.springdoc.core.annotations.ParameterObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/buiness/statis") +@Tag(name = "系统：数据统计") +@RequiredArgsConstructor +public class SysDataStatisticsController { + + + @Autowired + private SysReadDataService sysReadDataService; + + /** + * 报名数量，核销数量统计 + */ + @PostMapping("/queryCouponData") + @Operation(summary = "数据统计（报名，核销数量）") + + public R> queryCouponData(@RequestBody TimeDto timeDto) { + List couponNumVos = sysReadDataService.queryCouponData(timeDto); + if (CollectionUtil.isEmpty(couponNumVos)) { + return R.OK(201, "暂无数据", couponNumVos); + } + return R.OK(couponNumVos); + } + + + @PostMapping("/queryBar") + @Operation(summary = "数据统计（单个店铺数量统计）") + + public R queryBar(@RequestBody TimeDto timeDto) { + CouponDataVO couponDataVO = sysReadDataService.queryBar(timeDto); + if (couponDataVO == null || CollectionUtil.isEmpty(couponDataVO.getyData())) { + return R.OK(201, "暂无数据", couponDataVO); + } + return R.OK(couponDataVO); + } +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysCouponMapper.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysCouponMapper.java index bfad284..52817d2 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysCouponMapper.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysCouponMapper.java @@ -18,4 +18,6 @@ public interface SysCouponMapper extends BaseMapper { List queryPage(Page page, @Param("query") CouponQuery query); void updateNums(@Param("id")String id); + + List queryPageByOpenId(Page page, @Param("query") CouponQuery query); } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysMenuDataMapper.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysMenuDataMapper.java new file mode 100644 index 0000000..8ab96b5 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysMenuDataMapper.java @@ -0,0 +1,16 @@ +package com.hb0730.boot.admin.modules.api.buiness.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysMenuData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface SysMenuDataMapper extends BaseMapper { + CouponNumVo querySeasonData(@Param("timeDto") TimeDto timeDto); + + CouponNumVo queryHourData(@Param("timeDto") TimeDto timeDto); +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysReadDataMapper.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysReadDataMapper.java new file mode 100644 index 0000000..077faa8 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysReadDataMapper.java @@ -0,0 +1,19 @@ +package com.hb0730.boot.admin.modules.api.buiness.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponDataVO; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.DataTypeVo; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SysReadDataMapper extends BaseMapper { + CouponNumVo queryCouponData(@Param("timeDto")TimeDto timeDto); + + CouponNumVo queryCouponCheckData(@Param("timeDto") TimeDto timeDto); +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysShopDataMapper.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysShopDataMapper.java new file mode 100644 index 0000000..8a12d2f --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysShopDataMapper.java @@ -0,0 +1,14 @@ +package com.hb0730.boot.admin.modules.api.buiness.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface SysShopDataMapper extends BaseMapper { + CouponNumVo queryShopData(@Param("timeDto") TimeDto timeDto); +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysShopOnlyMapper.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysShopOnlyMapper.java new file mode 100644 index 0000000..3cd5657 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/SysShopOnlyMapper.java @@ -0,0 +1,17 @@ +package com.hb0730.boot.admin.modules.api.buiness.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopOnly; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SysShopOnlyMapper extends BaseMapper { + + List queryBar(@Param("timeDto") TimeDto timeDto); +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysCouponMapper.xml b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysCouponMapper.xml index df84b81..3118530 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysCouponMapper.xml +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysCouponMapper.xml @@ -18,7 +18,6 @@ t.activity_dec, t.gift_name, t.gift_image, - t.open_id, t.tag_img @@ -35,4 +34,28 @@ UPDATE sys_coupon SET nums = nums - 1 WHERE id = #{id}; + + \ No newline at end of file diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysMenuDataMapper.xml b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysMenuDataMapper.xml new file mode 100644 index 0000000..766ce2e --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysMenuDataMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysReadDataMapper.xml b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysReadDataMapper.xml new file mode 100644 index 0000000..30f395e --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysReadDataMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysShopDataMapper.xml b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysShopDataMapper.xml new file mode 100644 index 0000000..2703a35 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysShopDataMapper.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysShopOnlyMapper.xml b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysShopOnlyMapper.xml new file mode 100644 index 0000000..019ba8f --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/mapper/xml/SysShopOnlyMapper.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCoupon.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCoupon.java index 300633a..5adf7d2 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCoupon.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCoupon.java @@ -1,5 +1,6 @@ package com.hb0730.boot.admin.modules.api.buiness.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.hb0730.boot.admin.data.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -45,7 +46,18 @@ public class SysCoupon extends BaseEntity { private String giftImage; + @TableField(exist = false) private String openId; private String tagImg; + + @TableField(exist = false) + private Boolean state = false; + + @TableField(exist = false) + private Boolean verifState = false ; + + + @TableField(exist = false) + private String recordId; } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCouponLog.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCouponLog.java index f1e1ec9..0c12b67 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCouponLog.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysCouponLog.java @@ -1,5 +1,6 @@ package com.hb0730.boot.admin.modules.api.buiness.model; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.hb0730.boot.admin.data.domain.BaseEntity; import lombok.Data; @@ -33,5 +34,9 @@ public class SysCouponLog extends BaseEntity { private String userName; private String giftName; + @TableField(value = "state") + private Boolean state = true; + @TableField(value = "verif_state") + private Boolean verifState = true; } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysMenuData.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysMenuData.java new file mode 100644 index 0000000..140da05 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysMenuData.java @@ -0,0 +1,26 @@ +package com.hb0730.boot.admin.modules.api.buiness.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hb0730.boot.admin.data.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 优惠券表 + * + * @author hb0730 + * @date 2023/2/4 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString +@TableName(value = "sys_menu_data") +public class SysMenuData extends BaseEntity { + + + + private Integer type; + + private String name; +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysReadData.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysReadData.java new file mode 100644 index 0000000..292b6ec --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysReadData.java @@ -0,0 +1,30 @@ +package com.hb0730.boot.admin.modules.api.buiness.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hb0730.boot.admin.data.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 优惠券表 + * + * @author hb0730 + * @date 2023/2/4 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString +@TableName(value = "sys_read_data") +public class SysReadData extends BaseEntity { + + /** + * 读取数量 + */ + private String couponId; + + + private Integer type; + + private String name; +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShop.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShop.java index d1704fb..a28656c 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShop.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShop.java @@ -77,7 +77,7 @@ public class SysShop extends BaseEntity { /** * 店铺楼层 */ - private Integer floor; + private String floor; /** * 是否启用，true：启用，false：禁用 */ diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShopData.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShopData.java new file mode 100644 index 0000000..21d078b --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShopData.java @@ -0,0 +1,27 @@ +package com.hb0730.boot.admin.modules.api.buiness.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hb0730.boot.admin.data.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 优惠券表 + * + * @author hb0730 + * @date 2023/2/4 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString +@TableName(value = "sys_shop_data") +public class SysShopData extends BaseEntity { + + /** + * 读取数量 + */ + private String shopId; + + private String name; +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShopOnly.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShopOnly.java new file mode 100644 index 0000000..e0e5874 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/SysShopOnly.java @@ -0,0 +1,29 @@ +package com.hb0730.boot.admin.modules.api.buiness.model; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hb0730.boot.admin.data.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 优惠券表 + * + * @author hb0730 + * @date 2023/2/4 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString +@TableName(value = "sys_shop_only") +public class SysShopOnly extends BaseEntity { + + /** + * 读取数量 + */ + private String shopId; + + private String shopName; + + private Integer num; +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/query/CouponQuery.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/query/CouponQuery.java index 93ecdc6..221fa06 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/query/CouponQuery.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/query/CouponQuery.java @@ -19,4 +19,6 @@ public class CouponQuery extends BasePageQuery { private String id; + + private String openId; } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponDataVO.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponDataVO.java new file mode 100644 index 0000000..23d2f93 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponDataVO.java @@ -0,0 +1,37 @@ +package com.hb0730.boot.admin.modules.api.buiness.model.vo; + +import lombok.Data; + +import java.util.List; + +/** + *

+ * TODO CommentNumberVO + *

+ * + * @author jianpòlan hhwzyan@163.com + * @since 2023-07-01 + */ + +public class CouponDataVO { + + private List yData; + private List XData; + + + public List getyData() { + return yData; + } + + public void setyData(List yData) { + this.yData = yData; + } + + public List getxData() { + return XData; + } + + public void setxData(List XData) { + this.XData = XData; + } +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponNumVo.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponNumVo.java new file mode 100644 index 0000000..8564e81 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponNumVo.java @@ -0,0 +1,11 @@ +package com.hb0730.boot.admin.modules.api.buiness.model.vo; + + +import lombok.Data; + +@Data +public class CouponNumVo { + + private String name; + private Integer value; +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponVO.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponVO.java index 43fb5fe..7672189 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponVO.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/CouponVO.java @@ -1,5 +1,6 @@ package com.hb0730.boot.admin.modules.api.buiness.model.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.hb0730.boot.admin.data.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -93,4 +94,13 @@ public class CouponVO extends BaseEntity { private String giftImage; @Schema(description = "标签图片") private String tagImg; + + @TableField(exist = false) + private Boolean state = false; + + @TableField(exist = false) + private Boolean verifState = false ; + + @TableField(exist = false) + private String recordId; } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/DataTypeVo.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/DataTypeVo.java new file mode 100644 index 0000000..c70c1a4 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/DataTypeVo.java @@ -0,0 +1,12 @@ +package com.hb0730.boot.admin.modules.api.buiness.model.vo; + + +import lombok.Data; + +@Data +public class DataTypeVo { + + private String type; + + private Integer value; +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/GetCouponLogVO.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/GetCouponLogVO.java index dc1374b..f975394 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/GetCouponLogVO.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/GetCouponLogVO.java @@ -1,5 +1,6 @@ package com.hb0730.boot.admin.modules.api.buiness.model.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.hb0730.boot.admin.data.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -96,4 +97,7 @@ public class GetCouponLogVO extends BaseEntity { @Schema(description = "用户名称") private String userName; + + @TableField(exist = false) + private String recordId; } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/ShopVO.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/ShopVO.java index dfe1738..1b4579b 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/ShopVO.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/model/vo/ShopVO.java @@ -110,7 +110,7 @@ public class ShopVO implements Serializable { * 店铺楼层 */ @Schema(description = "店铺楼层") - private Integer floor; + private String floor; /** * 是否启用，true：启用，false：禁用 diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysCouponService.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysCouponService.java index 6ad90d0..0c7e3b7 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysCouponService.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysCouponService.java @@ -25,5 +25,5 @@ public interface SysCouponService extends IService { R getCoupon(String id , String openId); - R verification(String id, String checkCode); + R verification(String id, String checkCode,String openId); } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysMenuDataService.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysMenuDataService.java new file mode 100644 index 0000000..0db6c76 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysMenuDataService.java @@ -0,0 +1,10 @@ +package com.hb0730.boot.admin.modules.api.buiness.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hb0730.boot.admin.modules.api.buiness.model.SysMenuData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; + +public interface SysMenuDataService extends IService { + + +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysReadDataService.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysReadDataService.java new file mode 100644 index 0000000..be8ffdb --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysReadDataService.java @@ -0,0 +1,23 @@ +package com.hb0730.boot.admin.modules.api.buiness.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hb0730.boot.admin.base.R; +import com.hb0730.boot.admin.data.domain.BasePage; +import com.hb0730.boot.admin.modules.api.buiness.model.SysCouponLog; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.query.CouponQuery; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponDataVO; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponLogVO; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; + +import java.util.List; +import java.util.Map; + +public interface SysReadDataService extends IService { + + + List queryCouponData(TimeDto timeDto); + + CouponDataVO queryBar(TimeDto timeDto); +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysShopDataService.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysShopDataService.java new file mode 100644 index 0000000..b51467e --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysShopDataService.java @@ -0,0 +1,14 @@ +package com.hb0730.boot.admin.modules.api.buiness.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; + +import java.util.List; + +public interface SysShopDataService extends IService { + + +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysShopOnlyService.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysShopOnlyService.java new file mode 100644 index 0000000..6790ce4 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/SysShopOnlyService.java @@ -0,0 +1,10 @@ +package com.hb0730.boot.admin.modules.api.buiness.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopOnly; + +public interface SysShopOnlyService extends IService { + + +} diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysCouponServiceImpl.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysCouponServiceImpl.java index f92d1ef..cd7d0a5 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysCouponServiceImpl.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysCouponServiceImpl.java @@ -7,14 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hb0730.boot.admin.base.R; import com.hb0730.boot.admin.data.domain.BasePage; -import com.hb0730.boot.admin.modules.api.buiness.mapper.SysBoxMapper; -import com.hb0730.boot.admin.modules.api.buiness.mapper.SysCouponLogMapper; -import com.hb0730.boot.admin.modules.api.buiness.mapper.SysCouponMapper; -import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopMapper; -import com.hb0730.boot.admin.modules.api.buiness.model.SysBox; -import com.hb0730.boot.admin.modules.api.buiness.model.SysCoupon; -import com.hb0730.boot.admin.modules.api.buiness.model.SysCouponLog; -import com.hb0730.boot.admin.modules.api.buiness.model.SysShop; +import com.hb0730.boot.admin.modules.api.buiness.mapper.*; +import com.hb0730.boot.admin.modules.api.buiness.model.*; import com.hb0730.boot.admin.modules.api.buiness.model.query.BoxQuery; import com.hb0730.boot.admin.modules.api.buiness.model.query.CouponQuery; import com.hb0730.boot.admin.modules.api.buiness.model.vo.BoxVO; @@ -24,6 +18,7 @@ import com.hb0730.boot.admin.modules.api.buiness.model.vo.ShopVO; import com.hb0730.boot.admin.modules.api.buiness.service.SysBoxService; import com.hb0730.boot.admin.modules.api.buiness.service.SysCouponLogService; import com.hb0730.boot.admin.modules.api.buiness.service.SysCouponService; +import com.hb0730.boot.admin.modules.api.buiness.service.SysReadDataService; import com.hb0730.boot.admin.modules.sys.system.mapper.SysUserMapper; import com.hb0730.boot.admin.modules.sys.system.model.entity.SysUser; import com.hb0730.boot.admin.security.util.SecurityUtil; @@ -37,6 +32,7 @@ import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Formatter; import java.util.List; import java.util.Objects; @@ -52,18 +48,45 @@ public class SysCouponServiceImpl extends ServiceImpl queryPage(CouponQuery query) { Page page = new Page<>(); - if ( query.getSize() == 0 || query.getCurrent() == 0) { + List coupons = new ArrayList<>(); + if (query.getSize() == 0 || query.getCurrent() == 0) { page = new Page<>(0, Integer.MAX_VALUE); - }else { + } else { page = new Page<>(query.getCurrent(), query.getSize()); } - List coupons = baseMapper.queryPage(page, query); + coupons = this.baseMapper.queryPage(page, query); + // 查询出来的礼券列表根据领取记录的礼券id给领取状态和核销状态赋值，如果领取过为true，未领取过为false List collect = coupons.stream().map(coupon -> { + + + + if (query.getOpenId() != null) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysCouponLog::getOpenId, query.getOpenId()).eq(SysCouponLog::getCouponId, coupon.getId()); + SysCouponLog sysCouponLog = sysCouponLogMapper.selectOne(wrapper); + if (sysCouponLog!=null && sysCouponLog.getState() ) { + coupon.setState(sysCouponLog.getState()); + }else { + coupon.setState(false); + } + if (sysCouponLog!=null && sysCouponLog.getVerifState() ) { + coupon.setVerifState(sysCouponLog.getVerifState()); + } + else { + coupon.setVerifState(false); + } + } CouponVO couponVO = new CouponVO(); BeanUtils.copyProperties(coupon, couponVO); return couponVO; @@ -79,9 +102,8 @@ public class SysCouponServiceImpl extends ServiceImpl saveShop(CouponVO couponVO) { SysCoupon coupon = new SysCoupon(); - BeanUtils.copyProperties(couponVO,coupon); + BeanUtils.copyProperties(couponVO, coupon); coupon.setCreated(LocalDateTime.now()); coupon.setCreatedBy(SecurityUtil.getCurrentUsername()); coupon.setModified(LocalDateTime.now()); @@ -99,38 +121,37 @@ public class SysCouponServiceImpl extends ServiceImpl updateById(String id, CouponVO couponVO) { + + // + @Override + public R updateById(String id, CouponVO couponVO) { - SysCoupon coupon = getById(id); - if (null == coupon) { - return R.NG("优惠券不存在"); + SysCoupon coupon = getById(id); + if (null == coupon) { + return R.NG("优惠券不存在"); + } + BeanUtil.copyProperties(couponVO, coupon); + baseMapper.updateById(coupon); + return R.OK(couponVO); } - BeanUtil.copyProperties(couponVO, coupon); - baseMapper.updateById(coupon); - return R.OK(couponVO); -} @Override - public R getCoupon(String id,String openid) { + public R getCoupon(String id, String openid) { - LambdaQueryWrapper logs = new LambdaQueryWrapper<>(); SysCoupon coupon = this.baseMapper.selectById(id); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); SysUser user = sysUserMapper.selectOne(wrapper.eq(SysUser::getOpenId, openid)); - - - long l = System.currentTimeMillis(); - String s = Long.toString(l, 36); +// +// long l = System.currentTimeMillis(); +// String s = Long.toString(l, 36); SysCouponLog sysCouponLog = new SysCouponLog(); - if(Objects.nonNull(user)){ + if (Objects.nonNull(user)) { sysCouponLog.setUserId(user.getId()); if (StringUtils.isNotEmpty(user.getUsername())) { sysCouponLog.setUserName(user.getUsername()); @@ -142,30 +163,55 @@ public class SysCouponServiceImpl extends ServiceImpl verification(String id, String checkCode) { + public R verification(String id, String checkCode,String openId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SysCouponLog::getCheckCode, checkCode); - wrapper.eq(SysCouponLog::getId, id); + wrapper.eq(SysCouponLog::getCouponId, id); + wrapper.eq(SysCouponLog::getOpenId, openId); SysCouponLog sysCouponLog = sysCouponLogMapper.selectOne(wrapper); - if(Objects.nonNull(sysCouponLog)){ + if (Objects.nonNull(sysCouponLog)) { UpdateWrapper updateWrapper = new UpdateWrapper(); updateWrapper.set("modified", LocalDateTime.now()); - updateWrapper.eq("id", id); - sysCouponLogMapper.update(sysCouponLog,updateWrapper); + updateWrapper.set("verif_state", 1); + updateWrapper.eq("coupon_id", id).eq("open_id", openId); + baseMapper.updateNums(sysCouponLog.getCouponId()); + sysCouponLogMapper.update(sysCouponLog, updateWrapper); + SysReadData sysReadData = new SysReadData(); + sysReadData.setCreated(LocalDateTime.now()); + sysReadData.setCreatedBy(SecurityUtil.getCurrentUsername()); + sysReadData.setType(0); + sysReadData.setCouponId(sysCouponLog.getCouponId()); + sysReadData.setModified(LocalDateTime.now()); + sysReadData.setModifiedBy(SecurityUtil.getCurrentUsername()); + sysReadData.setName("核销"); + sysReadDataMapper.insert(sysReadData); + return R.OK("验证通过！！！"); - }else { - return R.error(201,"验证失败！！！！"); + } else { + return R.error(201, "验证失败！！！！"); } } diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysMenuDataServiceImpl.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysMenuDataServiceImpl.java new file mode 100644 index 0000000..8f332ed --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysMenuDataServiceImpl.java @@ -0,0 +1,19 @@ +package com.hb0730.boot.admin.modules.api.buiness.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysMenuDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysMenuData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; +import com.hb0730.boot.admin.modules.api.buiness.service.SysMenuDataService; +import com.hb0730.boot.admin.modules.api.buiness.service.SysShopDataService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class SysMenuDataServiceImpl extends ServiceImpl implements SysMenuDataService { + + +} + diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysReadDataServiceImpl.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysReadDataServiceImpl.java new file mode 100644 index 0000000..c8615c7 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysReadDataServiceImpl.java @@ -0,0 +1,83 @@ +package com.hb0730.boot.admin.modules.api.buiness.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hb0730.boot.admin.base.R; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysMenuDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysReadDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopOnlyMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponDataVO; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponVO; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.DataTypeVo; +import com.hb0730.boot.admin.modules.api.buiness.service.SysMenuDataService; +import com.hb0730.boot.admin.modules.api.buiness.service.SysReadDataService; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class SysReadDataServiceImpl extends ServiceImpl implements SysReadDataService { + + @Autowired + private SysShopDataMapper sysShopDataMapper; + + @Autowired + private SysMenuDataMapper sysMenuDataMapper; + + @Autowired + private SysShopOnlyMapper sysShopOnlyMapper; + + + @Override + public List queryCouponData(TimeDto timeDto) { + + CouponNumVo couponData = baseMapper.queryCouponData(timeDto); + CouponNumVo checkData = baseMapper.queryCouponCheckData(timeDto); + CouponNumVo shopData = sysShopDataMapper.queryShopData(timeDto); + CouponNumVo seasonData = sysMenuDataMapper.querySeasonData(timeDto); + CouponNumVo hourData = sysMenuDataMapper.queryHourData(timeDto); + List couponDataVOS = new ArrayList<>(); + if (ObjectUtil.isNotNull(couponData)){ + couponDataVOS.add(couponData); + } + if (ObjectUtil.isNotNull(checkData)){ + couponDataVOS.add(checkData); + } + if (ObjectUtil.isNotNull(shopData)){ + couponDataVOS.add(shopData); + } + if (ObjectUtil.isNotNull(seasonData)){ + couponDataVOS.add(seasonData); + } + if (ObjectUtil.isNotNull(hourData)){ + couponDataVOS.add(hourData); + } + return couponDataVOS; + } + + @Override + public CouponDataVO queryBar(TimeDto timeDto) { + List couponNumVos =new ArrayList<>(); + CouponDataVO commentNumberVO = new CouponDataVO(); + couponNumVos = sysShopOnlyMapper.queryBar(timeDto); + List collectX = couponNumVos.stream().map(i -> i.getName()).collect(Collectors.toList()); + List collectY = couponNumVos.stream().map(i -> i.getValue()).collect(Collectors.toList()); + commentNumberVO.setxData(collectX); + commentNumberVO.setyData(collectY); + + return commentNumberVO; + } +} + diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysReadOnlyServiceImpl.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysReadOnlyServiceImpl.java new file mode 100644 index 0000000..44ab85b --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysReadOnlyServiceImpl.java @@ -0,0 +1,29 @@ +package com.hb0730.boot.admin.modules.api.buiness.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysMenuDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysReadDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopOnlyMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopOnly; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponDataVO; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.api.buiness.service.SysReadDataService; +import com.hb0730.boot.admin.modules.api.buiness.service.SysShopOnlyService; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +@Slf4j +public class SysReadOnlyServiceImpl extends ServiceImpl implements SysShopOnlyService { + + +} + diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysShopDataServiceImpl.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysShopDataServiceImpl.java new file mode 100644 index 0000000..0ce1915 --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysShopDataServiceImpl.java @@ -0,0 +1,27 @@ +package com.hb0730.boot.admin.modules.api.buiness.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysReadDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysReadData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; +import com.hb0730.boot.admin.modules.api.buiness.model.vo.CouponNumVo; +import com.hb0730.boot.admin.modules.api.buiness.service.SysReadDataService; +import com.hb0730.boot.admin.modules.api.buiness.service.SysShopDataService; +import com.hb0730.boot.admin.modules.api.buiness.service.SysShopService; +import com.hb0730.boot.admin.modules.sys.system.vo.TimeDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +@Slf4j +public class SysShopDataServiceImpl extends ServiceImpl implements SysShopDataService { + + +} + diff --git a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysShopServiceImpl.java b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysShopServiceImpl.java index 29bab1f..359e2d6 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysShopServiceImpl.java +++ b/src/main/java/com/hb0730/boot/admin/modules/api/buiness/service/impl/SysShopServiceImpl.java @@ -2,16 +2,24 @@ package com.hb0730.boot.admin.modules.api.buiness.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hb0730.boot.admin.base.R; import com.hb0730.boot.admin.data.domain.BasePage; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysMenuDataMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopDataMapper; import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopMapper; +import com.hb0730.boot.admin.modules.api.buiness.mapper.SysShopOnlyMapper; +import com.hb0730.boot.admin.modules.api.buiness.model.SysMenuData; import com.hb0730.boot.admin.modules.api.buiness.model.SysShop; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopData; +import com.hb0730.boot.admin.modules.api.buiness.model.SysShopOnly; import com.hb0730.boot.admin.modules.api.buiness.model.query.ShopQuery; import com.hb0730.boot.admin.modules.api.buiness.model.vo.HourVO; import com.hb0730.boot.admin.modules.api.buiness.model.vo.SeasonVO; import com.hb0730.boot.admin.modules.api.buiness.model.vo.ShopVO; +import com.hb0730.boot.admin.modules.api.buiness.service.SysShopDataService; import com.hb0730.boot.admin.modules.api.buiness.service.SysShopService; import com.hb0730.boot.admin.security.util.SecurityUtil; import lombok.extern.slf4j.Slf4j; @@ -30,12 +38,28 @@ public class SysShopServiceImpl extends ServiceImpl impl @Autowired private SysShopMapper sysShopMapper; + + @Autowired + private SysShopDataMapper sysShopDataMapper; + + @Autowired + private SysShopOnlyMapper sysShopOnlyMapper; + @Autowired + + private SysMenuDataMapper sysMenuDataMapper; @Override public BasePage queryPage(ShopQuery query) { Page page = new Page<>(); if ( query.getSize() == 0 || query.getCurrent() == 0) { page = new Page<>(0, Integer.MAX_VALUE); + SysShopData sysShopData = new SysShopData(); + sysShopData.setName("店铺访问量"); + sysShopData.setCreated(LocalDateTime.now()); + sysShopData.setModified(LocalDateTime.now()); + sysShopData.setModifiedBy(SecurityUtil.getCurrentUsername()); + sysShopData.setCreatedBy(SecurityUtil.getCurrentUsername()); + sysShopDataMapper.insert(sysShopData); }else { page = new Page<>(query.getCurrent(), query.getSize()); } @@ -59,6 +83,23 @@ public class SysShopServiceImpl extends ServiceImpl impl SysShop shop = this.baseMapper.selectById(id); ShopVO shopVO = new ShopVO(); BeanUtil.copyProperties(shop, shopVO); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysShopOnly::getShopId, id); + SysShopOnly sysShopOnly = sysShopOnlyMapper.selectOne(wrapper); + if (sysShopOnly == null){ + SysShopOnly shopOnly = new SysShopOnly(); + shopOnly.setShopId(id); + shopOnly.setShopName(shop.getName()); + shopOnly.setNum(1); + shopOnly.setCreatedBy(SecurityUtil.getCurrentUsername()); + shopOnly.setModifiedBy(SecurityUtil.getCurrentUsername()); + shopOnly.setCreated(LocalDateTime.now()); + shopOnly.setModified(LocalDateTime.now()); + sysShopOnlyMapper.insert(shopOnly); + }else { + sysShopOnly.setNum(sysShopOnly.getNum() + 1); + sysShopOnlyMapper.updateById(sysShopOnly); + } return R.OK(shopVO); } @@ -96,13 +137,31 @@ public class SysShopServiceImpl extends ServiceImpl impl @Override public List getSeason() { List season = this.baseMapper.getSeason(); - + SysMenuData sysMenuData = new SysMenuData(); + sysMenuData.setCreated(LocalDateTime.now()); + sysMenuData.setModified(LocalDateTime.now()); + sysMenuData.setModifiedBy(SecurityUtil.getCurrentUsername()); + sysMenuData.setCreatedBy(SecurityUtil.getCurrentUsername()); + sysMenuData.setType(0); + sysMenuData.setName("季节限定"); + sysMenuDataMapper.insert(sysMenuData); return season; } @Override public List getHour() { List hour = this.baseMapper.getHour(); + SysMenuData sysMenuData = new SysMenuData(); + sysMenuData.setCreated(LocalDateTime.now()); + sysMenuData.setModified(LocalDateTime.now()); + sysMenuData.setModifiedBy(SecurityUtil.getCurrentUsername()); + sysMenuData.setCreatedBy(SecurityUtil.getCurrentUsername()); + sysMenuData.setType(1); + sysMenuData.setName("酒水菜单"); + sysMenuDataMapper.insert(sysMenuData); + + + return hour; } diff --git a/src/main/java/com/hb0730/boot/admin/modules/sys/auth/controller/WxLoginController.java b/src/main/java/com/hb0730/boot/admin/modules/sys/auth/controller/WxLoginController.java index 77edbe3..7900de2 100644 --- a/src/main/java/com/hb0730/boot/admin/modules/sys/auth/controller/WxLoginController.java +++ b/src/main/java/com/hb0730/boot/admin/modules/sys/auth/controller/WxLoginController.java @@ -74,7 +74,7 @@ public class WxLoginController { @Operation(summary = "微信登录") @GetMapping("/wxlogin") public R getWechatLoginInfo(@RequestParam String code) { - String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wxbad2e8a91c62a734&secret=e1b7fc425ca9cca05dd83609a6dc9c00&code=" + code + "&grant_type=authorization_code"; + String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=wx292995002b9476f3&secret=896202811f43b146123f8d3f9ad3c153&code=" + code + "&grant_type=authorization_code"; String H5 = HttpTool.get(url, String.class); Gson gson = new Gson(); H5LoginResponse h5LoginResponse = gson.fromJson(H5, H5LoginResponse.class); @@ -96,7 +96,9 @@ public class WxLoginController { sysUser.setOpenId(userResponse.getOpenId()); sysUser.setUnionId(userResponse.getOpenId()); sysUser.setPassword("123456"); + System.out.println(userResponse.getNicName()); sysUserService.save(sysUser); + } JSH5LoginResponse jsh5LoginResponse = new JSH5LoginResponse(); @@ -110,8 +112,8 @@ public class WxLoginController { public R access(String url){ Gson gson = new Gson(); Map map = new HashMap<>(); - map.put("appid","wxbad2e8a91c62a734"); - map.put("secret", "e1b7fc425ca9cca05dd83609a6dc9c00"); + map.put("appid","wx292995002b9476f3"); + map.put("secret", "896202811f43b146123f8d3f9ad3c153"); map.put("grant_type","client_credential"); String tokenUrl = "https://api.weixin.qq.com/cgi-bin/stable_token"; String access = REST_TEMPLATE.postForObject(tokenUrl, map, String.class); @@ -130,8 +132,6 @@ public class WxLoginController { // 替换成你的公众号AppID和AppSecret - String appId = "wxbad2e8a91c62a734"; - String appSecret = "e1b7fc425ca9cca05dd83609a6dc9c00"; String nonceStr = createNonceStr(); String timestamp = createTimestamp(); String jsapiTicket = jsResponse.getTicket(); diff --git a/src/main/java/com/hb0730/boot/admin/modules/sys/system/vo/TimeDto.java b/src/main/java/com/hb0730/boot/admin/modules/sys/system/vo/TimeDto.java new file mode 100644 index 0000000..5e7e6ca --- /dev/null +++ b/src/main/java/com/hb0730/boot/admin/modules/sys/system/vo/TimeDto.java @@ -0,0 +1,25 @@ +package com.hb0730.boot.admin.modules.sys.system.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + *

+ * TODO TimeDto + *

+ * + * @author jianpòlan hhwzyan@163.com + * @since 2023-07-01 + */ + +@Data +public class TimeDto { + + @JsonFormat(pattern="yyyy-MM-dd") + private String startTime; + + @JsonFormat(pattern="yyyy-MM-dd") + private String endTime; +} diff --git a/src/main/java/com/hb0730/boot/admin/security/config/WebSecurityConfiguration.java b/src/main/java/com/hb0730/boot/admin/security/config/WebSecurityConfiguration.java index 05531f7..77d1a2e 100644 --- a/src/main/java/com/hb0730/boot/admin/security/config/WebSecurityConfiguration.java +++ b/src/main/java/com/hb0730/boot/admin/security/config/WebSecurityConfiguration.java @@ -91,6 +91,7 @@ public class WebSecurityConfiguration { .requestMatchers("/buiness/user").permitAll() .requestMatchers("/buiness/box/**").permitAll() .requestMatchers("/buiness/oss/**").permitAll() + .requestMatchers("/buiness/statis/**").permitAll() // 文件 .requestMatchers("/avatar/**").permitAll() .requestMatchers("/file/**").permitAll()