From dd1eca5f786ef9074cf3f8cc2f3d00289713fb9a Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Tue, 26 Nov 2024 13:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-hanhai-vue/src/views/CityJd/CityJdList.vue | 204 ++++++++++++++++++++ .../src/views/CityJd}/modules/CityJdForm.vue | 0 .../CityJd}/modules/CityJdModal.Style#Drawer.vue | 0 .../src/views/CityJd}/modules/CityJdModal.vue | 0 .../src/main/resources/pay_weixin.properties | 12 +- .../controller/CityIntgerWaterController.java | 171 +++++++++++++++++ .../cityIntgerWater/entity/CityIntgerWater.java | 66 +++++++ .../mapper/CityIntgerWaterMapper.java | 17 ++ .../mapper/xml/CityIntgerWaterMapper.xml | 5 + .../service/ICityIntgerWaterService.java | 14 ++ .../service/impl/CityIntgerWaterServiceImpl.java | 19 ++ .../cityIntgerWater/vue/CityIntgerWaterList.vue | 189 ++++++++++++++++++ .../vue/modules/CityIntgerWaterForm.vue | 119 ++++++++++++ .../modules/CityIntgerWaterModal.Style#Drawer.vue | 84 ++++++++ .../vue/modules/CityIntgerWaterModal.vue | 60 ++++++ .../cityIntgerWater/vue3/CityIntgerWater.api.ts | 61 ++++++ .../cityIntgerWater/vue3/CityIntgerWater.data.ts | 53 ++++++ .../cityIntgerWater/vue3/CityIntgerWaterList.vue | 162 ++++++++++++++++ .../vue3/components/CityIntgerWaterModal.vue | 58 ++++++ .../modules/cityJd/{vue => CityJd}/CityJdList.vue | 6 - .../modules/cityJd/CityJd/modules/CityJdForm.vue | 134 +++++++++++++ .../CityJd/modules/CityJdModal.Style#Drawer.vue | 84 ++++++++ .../modules/cityJd/CityJd/modules/CityJdModal.vue | 60 ++++++ .../cityJd/controller/CityJdController.java | 2 +- .../org/jeecg/modules/cityJd/entity/CityJd.java | 2 +- .../jeecg/modules/cityJd/mapper/CityJdMapper.java | 2 +- .../modules/cityJd/service/ICityJdService.java | 2 +- .../cityJd/service/impl/CityJdServiceImpl.java | 2 +- .../org/jeecg/modules/cityJd/vue3/CityJd.data.ts | 6 - .../cityShop/controller/CityShopController.java | 2 +- .../jeecg/modules/cityShop/entity/CityShop.java | 6 +- .../modules/cityShop/mapper/CityShopMapper.java | 2 +- .../modules/cityShop/service/ICityShopService.java | 2 +- .../cityShop/service/impl/CityShopServiceImpl.java | 2 +- .../jeecg/modules/cityShop/vue/CityShopList.vue | 6 + .../modules/cityShop/vue/modules/CityShopForm.vue | 5 + .../jeecg/modules/cityShop/vue3/CityShop.data.ts | 10 + .../controller/CityShoppingController.java | 2 +- .../modules/cityShopping/entity/CityShopping.java | 7 +- .../cityShopping/mapper/CityShoppingMapper.java | 2 +- .../cityShopping/service/ICityShoppingService.java | 2 +- .../service/impl/CityShoppingServiceImpl.java | 2 +- .../modules/cityShopping/vue/CityShoppingList.vue | 21 ++ .../cityShopping/vue/modules/CityShoppingForm.vue | 5 + .../modules/cityShopping/vue3/CityShopping.data.ts | 22 +++ .../controller/CitySignLogController.java | 171 +++++++++++++++++ .../modules/citySignLog/entity/CitySignLog.java | 59 ++++++ .../citySignLog/mapper/CitySignLogMapper.java | 17 ++ .../citySignLog/mapper/xml/CitySignLogMapper.xml | 5 + .../citySignLog/service/ICitySignLogService.java | 14 ++ .../service/impl/CitySignLogServiceImpl.java | 19 ++ .../modules/citySignLog/vue/CitySignLogList.vue | 178 +++++++++++++++++ .../citySignLog/vue/modules/CitySignLogForm.vue | 109 +++++++++++ .../vue/modules/CitySignLogModal.Style#Drawer.vue | 84 ++++++++ .../citySignLog/vue/modules/CitySignLogModal.vue | 60 ++++++ .../modules/citySignLog/vue3/CitySignLog.api.ts | 61 ++++++ .../modules/citySignLog/vue3/CitySignLog.data.ts | 36 ++++ .../modules/citySignLog/vue3/CitySignLogList.vue | 162 ++++++++++++++++ .../vue3/components/CitySignLogModal.vue | 58 ++++++ .../service/impl/AppletLoginServiceImpl.java | 40 +++- .../jeecg/modules/api/service/YaoDuApiService.java | 16 ++ .../modules/api/service/YaoDuOrderService.java | 4 + .../api/service/impl/YaoDuApiServiceImpl.java | 212 +++++++++++++++++++-- .../api/service/impl/YaoDuOrderServiceImpl.java | 32 +++- .../api/yaoduapi/YaoDuApiTokenController.java | 49 +++++ .../modules/api/yaoduapi/YaoDuOrderController.java | 10 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/pay_weixin.properties | 14 +- 68 files changed, 3043 insertions(+), 61 deletions(-) create mode 100644 admin-hanhai-vue/src/views/CityJd/CityJdList.vue rename {jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue => admin-hanhai-vue/src/views/CityJd}/modules/CityJdForm.vue (100%) rename {jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue => admin-hanhai-vue/src/views/CityJd}/modules/CityJdModal.Style#Drawer.vue (100%) rename {jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue => admin-hanhai-vue/src/views/CityJd}/modules/CityJdModal.vue (100%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/controller/CityIntgerWaterController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/entity/CityIntgerWater.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/CityIntgerWaterMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/xml/CityIntgerWaterMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/ICityIntgerWaterService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/impl/CityIntgerWaterServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/CityIntgerWaterList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWaterList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/components/CityIntgerWaterModal.vue rename jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/{vue => CityJd}/CityJdList.vue (97%) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/controller/CitySignLogController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/entity/CitySignLog.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/CitySignLogMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/xml/CitySignLogMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/ICitySignLogService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/impl/CitySignLogServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/CitySignLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLogList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/components/CitySignLogModal.vue diff --git a/admin-hanhai-vue/src/views/CityJd/CityJdList.vue b/admin-hanhai-vue/src/views/CityJd/CityJdList.vue new file mode 100644 index 0000000..e4820eb --- /dev/null +++ b/admin-hanhai-vue/src/views/CityJd/CityJdList.vue @@ -0,0 +1,204 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/modules/CityJdForm.vue b/admin-hanhai-vue/src/views/CityJd/modules/CityJdForm.vue similarity index 100% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/modules/CityJdForm.vue rename to admin-hanhai-vue/src/views/CityJd/modules/CityJdForm.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/modules/CityJdModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/CityJd/modules/CityJdModal.Style#Drawer.vue similarity index 100% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/modules/CityJdModal.Style#Drawer.vue rename to admin-hanhai-vue/src/views/CityJd/modules/CityJdModal.Style#Drawer.vue diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/modules/CityJdModal.vue b/admin-hanhai-vue/src/views/CityJd/modules/CityJdModal.vue similarity index 100% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/modules/CityJdModal.vue rename to admin-hanhai-vue/src/views/CityJd/modules/CityJdModal.vue diff --git a/han-hai-module-pay/src/main/resources/pay_weixin.properties b/han-hai-module-pay/src/main/resources/pay_weixin.properties index ce02ac8..151a9e7 100644 --- a/han-hai-module-pay/src/main/resources/pay_weixin.properties +++ b/han-hai-module-pay/src/main/resources/pay_weixin.properties @@ -5,10 +5,10 @@ #pay.notifyUrl=https://jobadmin.java996.icu/job-dev/job/pay/notify #pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify -pay.mchId=1673516176 -pay.appId=wxa4d29e67e8a58d38 -pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK -pay.keyPath=classpath:apiclient_cert.pem -pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify -pay.notifyUrlDev=http://h5.xzaiyp.top/api/order/payNotify +#pay.mchId=1673516176 +#pay.appId=wxa4d29e67e8a58d38 +#pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK +#pay.keyPath= +#pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify +#pay.notifyUrlDev= diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/controller/CityIntgerWaterController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/controller/CityIntgerWaterController.java new file mode 100644 index 0000000..4871287 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/controller/CityIntgerWaterController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.cityIntgerWater.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater; +import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 积分流水表 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +@Api(tags="积分流水表") +@RestController +@RequestMapping("/cityIntgerWater/cityIntgerWater") +@Slf4j +public class CityIntgerWaterController extends JeecgController { + @Autowired + private ICityIntgerWaterService cityIntgerWaterService; + + /** + * 分页列表查询 + * + * @param cityIntgerWater + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "积分流水表-分页列表查询") + @ApiOperation(value="积分流水表-分页列表查询", notes="积分流水表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CityIntgerWater cityIntgerWater, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cityIntgerWater, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = cityIntgerWaterService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param cityIntgerWater + * @return + */ + @AutoLog(value = "积分流水表-添加") + @ApiOperation(value="积分流水表-添加", notes="积分流水表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CityIntgerWater cityIntgerWater) { + cityIntgerWaterService.save(cityIntgerWater); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param cityIntgerWater + * @return + */ + @AutoLog(value = "积分流水表-编辑") + @ApiOperation(value="积分流水表-编辑", notes="积分流水表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CityIntgerWater cityIntgerWater) { + cityIntgerWaterService.updateById(cityIntgerWater); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "积分流水表-通过id删除") + @ApiOperation(value="积分流水表-通过id删除", notes="积分流水表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + cityIntgerWaterService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "积分流水表-批量删除") + @ApiOperation(value="积分流水表-批量删除", notes="积分流水表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.cityIntgerWaterService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "积分流水表-通过id查询") + @ApiOperation(value="积分流水表-通过id查询", notes="积分流水表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CityIntgerWater cityIntgerWater = cityIntgerWaterService.getById(id); + if(cityIntgerWater==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(cityIntgerWater); + } + + /** + * 导出excel + * + * @param request + * @param cityIntgerWater + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CityIntgerWater cityIntgerWater) { + return super.exportXls(request, cityIntgerWater, CityIntgerWater.class, "积分流水表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CityIntgerWater.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/entity/CityIntgerWater.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/entity/CityIntgerWater.java new file mode 100644 index 0000000..b0bc4a3 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/entity/CityIntgerWater.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.cityIntgerWater.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 积分流水表 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +@Data +@TableName("city_intger_water") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="city_intger_water对象", description="积分流水表") +public class CityIntgerWater implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**积分*/ + @Excel(name = "积分", width = 15) + @ApiModelProperty(value = "积分") + private java.math.BigDecimal intger; + /**用户*/ + @Excel(name = "用户", width = 15) + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**类型0获得1消耗*/ + @Excel(name = "类型0获得1消耗", width = 15) + @ApiModelProperty(value = "类型0获得1消耗") + private java.lang.Integer type; + /**名称*/ + @Excel(name = "名称", width = 15) + @ApiModelProperty(value = "名称") + private java.lang.String title; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/CityIntgerWaterMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/CityIntgerWaterMapper.java new file mode 100644 index 0000000..5780971 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/CityIntgerWaterMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.cityIntgerWater.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 积分流水表 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +public interface CityIntgerWaterMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/xml/CityIntgerWaterMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/xml/CityIntgerWaterMapper.xml new file mode 100644 index 0000000..c51551d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/xml/CityIntgerWaterMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/ICityIntgerWaterService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/ICityIntgerWaterService.java new file mode 100644 index 0000000..9ab3d22 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/ICityIntgerWaterService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.cityIntgerWater.service; + +import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 积分流水表 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +public interface ICityIntgerWaterService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/impl/CityIntgerWaterServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/impl/CityIntgerWaterServiceImpl.java new file mode 100644 index 0000000..1cd8d7d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/impl/CityIntgerWaterServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.cityIntgerWater.service.impl; + +import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater; +import org.jeecg.modules.cityIntgerWater.mapper.CityIntgerWaterMapper; +import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 积分流水表 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +@Service +public class CityIntgerWaterServiceImpl extends ServiceImpl implements ICityIntgerWaterService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/CityIntgerWaterList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/CityIntgerWaterList.vue new file mode 100644 index 0000000..bd2b1c8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/CityIntgerWaterList.vue @@ -0,0 +1,189 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterForm.vue new file mode 100644 index 0000000..471f831 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterForm.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.Style#Drawer.vue new file mode 100644 index 0000000..e7aee91 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.vue new file mode 100644 index 0000000..36f7dac --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.api.ts new file mode 100644 index 0000000..a3471e0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/cityIntgerWater/cityIntgerWater/list', + save='/cityIntgerWater/cityIntgerWater/add', + edit='/cityIntgerWater/cityIntgerWater/edit', + deleteOne = '/cityIntgerWater/cityIntgerWater/delete', + deleteBatch = '/cityIntgerWater/cityIntgerWater/deleteBatch', + importExcel = '/cityIntgerWater/cityIntgerWater/importExcel', + exportXls = '/cityIntgerWater/cityIntgerWater/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.data.ts new file mode 100644 index 0000000..6aeec59 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.data.ts @@ -0,0 +1,53 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '积分', + align:"center", + dataIndex: 'intger' + }, + { + title: '用户', + align:"center", + dataIndex: 'userId' + }, + { + title: '类型0获得1消耗', + align:"center", + dataIndex: 'type' + }, + { + title: '名称', + align:"center", + dataIndex: 'title' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '积分', + field: 'intger', + component: 'InputNumber', + }, + { + label: '用户', + field: 'userId', + component: 'Input', + }, + { + label: '类型0获得1消耗', + field: 'type', + component: 'InputNumber', + }, + { + label: '名称', + field: 'title', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWaterList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWaterList.vue new file mode 100644 index 0000000..00a4829 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWaterList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/components/CityIntgerWaterModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/components/CityIntgerWaterModal.vue new file mode 100644 index 0000000..757eb16 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/components/CityIntgerWaterModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/CityJdList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/CityJdList.vue similarity index 97% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/CityJdList.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/CityJdList.vue index 6a18abb..e77e478 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/CityJdList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/CityJdList.vue @@ -153,12 +153,6 @@ dataIndex: 'titleImage', scopedSlots: {customRender: 'imgSlot'} }, - { - title:'介绍', - align:"center", - dataIndex: 'details', - scopedSlots: {customRender: 'htmlSlot'} - }, { title: '操作', dataIndex: 'action', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdForm.vue new file mode 100644 index 0000000..4db6534 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdForm.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.Style#Drawer.vue new file mode 100644 index 0000000..2f7e849 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.vue new file mode 100644 index 0000000..415bd15 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/controller/CityJdController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/controller/CityJdController.java index 77801d5..aa02f14 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/controller/CityJdController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/controller/CityJdController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 景点列表 * @Author: jeecg-boot - * @Date: 2024-10-31 + * @Date: 2024-11-24 * @Version: V1.0 */ @Api(tags="景点列表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/entity/CityJd.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/entity/CityJd.java index 11883a3..d9ff4d1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/entity/CityJd.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/entity/CityJd.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 景点列表 * @Author: jeecg-boot - * @Date: 2024-10-31 + * @Date: 2024-11-24 * @Version: V1.0 */ @Data diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/mapper/CityJdMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/mapper/CityJdMapper.java index 5302395..93675a0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/mapper/CityJdMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/mapper/CityJdMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 景点列表 * @Author: jeecg-boot - * @Date: 2024-10-31 + * @Date: 2024-11-24 * @Version: V1.0 */ public interface CityJdMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/ICityJdService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/ICityJdService.java index 224ba8a..3216d0a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/ICityJdService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/ICityJdService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 景点列表 * @Author: jeecg-boot - * @Date: 2024-10-31 + * @Date: 2024-11-24 * @Version: V1.0 */ public interface ICityJdService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/impl/CityJdServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/impl/CityJdServiceImpl.java index 0694a11..3ebb56c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/impl/CityJdServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/impl/CityJdServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 景点列表 * @Author: jeecg-boot - * @Date: 2024-10-31 + * @Date: 2024-11-24 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue3/CityJd.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue3/CityJd.data.ts index 0a0f4ca..48cd4d5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue3/CityJd.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue3/CityJd.data.ts @@ -36,12 +36,6 @@ export const columns: BasicColumn[] = [ dataIndex: 'titleImage', customRender:render.renderAvatar, }, - { - title: '介绍', - align:"center", - dataIndex: 'details', - slots: { customRender: 'htmlSlot' }, - }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/controller/CityShopController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/controller/CityShopController.java index 8bf907f..36a1255 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/controller/CityShopController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/controller/CityShopController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 商铺信息表 * @Author: jeecg-boot - * @Date: 2024-10-29 + * @Date: 2024-11-25 * @Version: V1.0 */ @Api(tags="商铺信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java index 49fed40..73a96c2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 商铺信息表 * @Author: jeecg-boot - * @Date: 2024-10-29 + * @Date: 2024-11-25 * @Version: V1.0 */ @Data @@ -103,4 +103,8 @@ public class CityShop implements Serializable { @Excel(name = "纬度", width = 15) @ApiModelProperty(value = "纬度") private java.lang.String latitude; + /**是否营业*/ + @Excel(name = "是否营业", width = 15) + @ApiModelProperty(value = "是否营业") + private java.lang.String isOpen; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/mapper/CityShopMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/mapper/CityShopMapper.java index c76bd51..9d046c9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/mapper/CityShopMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/mapper/CityShopMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 商铺信息表 * @Author: jeecg-boot - * @Date: 2024-10-29 + * @Date: 2024-11-25 * @Version: V1.0 */ public interface CityShopMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/ICityShopService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/ICityShopService.java index b27d02a..c6ddafa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/ICityShopService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/ICityShopService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 商铺信息表 * @Author: jeecg-boot - * @Date: 2024-10-29 + * @Date: 2024-11-25 * @Version: V1.0 */ public interface ICityShopService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/impl/CityShopServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/impl/CityShopServiceImpl.java index 613db93..1875cd4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/impl/CityShopServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/impl/CityShopServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 商铺信息表 * @Author: jeecg-boot - * @Date: 2024-10-29 + * @Date: 2024-11-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/CityShopList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/CityShopList.vue index bdcde22..672e498 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/CityShopList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/CityShopList.vue @@ -220,6 +220,11 @@ align:"center", dataIndex: 'latitude' }, + { + title:'是否营业', + align:"center", + dataIndex: 'isOpen' + }, { title: '操作', dataIndex: 'action', @@ -269,6 +274,7 @@ fieldList.push({type:'int',value:'isComment',text:'评论量',dictCode:''}) fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''}) fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''}) + fieldList.push({type:'string',value:'isOpen',text:'是否营业',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/modules/CityShopForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/modules/CityShopForm.vue index b46bfaa..e0dd05e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/modules/CityShopForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/modules/CityShopForm.vue @@ -73,6 +73,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue3/CityShop.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue3/CityShop.data.ts index 221a306..dc1c4d0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue3/CityShop.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue3/CityShop.data.ts @@ -83,6 +83,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'latitude' }, + { + title: '是否营业', + align:"center", + dataIndex: 'isOpen' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -177,4 +182,9 @@ export const formSchema: FormSchema[] = [ field: 'latitude', component: 'Input', }, + { + label: '是否营业', + field: 'isOpen', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java index 1af8788..d79a032 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 商城表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-25 * @Version: V1.0 */ @Api(tags="商城表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java index 098305b..bdb6475 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 商城表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-25 * @Version: V1.0 */ @Data @@ -99,4 +99,9 @@ public class CityShopping implements Serializable { @Dict(dictTable = "city_shop", dicText = "title", dicCode = "id") @ApiModelProperty(value = "关联店铺") private java.lang.String shopId; + /**商品类型*/ + @Excel(name = "商品类型", width = 15, dicCode = "class_name_no") + @Dict(dicCode = "class_name_no") + @ApiModelProperty(value = "商品类型") + private java.lang.Integer className; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java index 77dc948..7132983 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 商城表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-25 * @Version: V1.0 */ public interface CityShoppingMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java index b60ce18..1652582 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 商城表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-25 * @Version: V1.0 */ public interface ICityShoppingService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java index ee47d41..7ebca1f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 商城表 * @Author: jeecg-boot - * @Date: 2024-11-08 + * @Date: 2024-11-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue index c4f5c1c..99e4c49 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue @@ -4,6 +4,21 @@
+ + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -197,6 +212,11 @@ align:"center", dataIndex: 'shopId_dictText' }, + { + title:'商品类型', + align:"center", + dataIndex: 'className_dictText' + }, { title: '操作', dataIndex: 'action', @@ -246,6 +266,7 @@ fieldList.push({type:'int',value:'num',text:'库存',dictCode:''}) fieldList.push({type:'switch',value:'isOpen',text:'是否上架'}) fieldList.push({type:'sel_search',value:'shopId',text:'关联店铺',dictTable:"city_shop", dictText:'title', dictCode:'id'}) + fieldList.push({type:'int',value:'className',text:'商品类型',dictCode:'class_name_no'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue index ca656d6..5c8cacb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue @@ -63,6 +63,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts index 2186272..64108f6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts @@ -81,9 +81,23 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'shopId_dictText' }, + { + title: '商品类型', + align:"center", + dataIndex: 'className_dictText' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "商品类型", + field: "className", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"class_name_no" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -156,4 +170,12 @@ export const formSchema: FormSchema[] = [ dict:"city_shop,title,id" }, }, + { + label: '商品类型', + field: 'className', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"class_name_no" + }, + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/controller/CitySignLogController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/controller/CitySignLogController.java new file mode 100644 index 0000000..b323edb --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/controller/CitySignLogController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.citySignLog.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.citySignLog.entity.CitySignLog; +import org.jeecg.modules.citySignLog.service.ICitySignLogService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 签到记录 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +@Api(tags="签到记录") +@RestController +@RequestMapping("/citySignLog/citySignLog") +@Slf4j +public class CitySignLogController extends JeecgController { + @Autowired + private ICitySignLogService citySignLogService; + + /** + * 分页列表查询 + * + * @param citySignLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "签到记录-分页列表查询") + @ApiOperation(value="签到记录-分页列表查询", notes="签到记录-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CitySignLog citySignLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(citySignLog, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = citySignLogService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param citySignLog + * @return + */ + @AutoLog(value = "签到记录-添加") + @ApiOperation(value="签到记录-添加", notes="签到记录-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CitySignLog citySignLog) { + citySignLogService.save(citySignLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param citySignLog + * @return + */ + @AutoLog(value = "签到记录-编辑") + @ApiOperation(value="签到记录-编辑", notes="签到记录-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CitySignLog citySignLog) { + citySignLogService.updateById(citySignLog); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "签到记录-通过id删除") + @ApiOperation(value="签到记录-通过id删除", notes="签到记录-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + citySignLogService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "签到记录-批量删除") + @ApiOperation(value="签到记录-批量删除", notes="签到记录-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.citySignLogService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "签到记录-通过id查询") + @ApiOperation(value="签到记录-通过id查询", notes="签到记录-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CitySignLog citySignLog = citySignLogService.getById(id); + if(citySignLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(citySignLog); + } + + /** + * 导出excel + * + * @param request + * @param citySignLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CitySignLog citySignLog) { + return super.exportXls(request, citySignLog, CitySignLog.class, "签到记录"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, CitySignLog.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/entity/CitySignLog.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/entity/CitySignLog.java new file mode 100644 index 0000000..ff6c1f9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/entity/CitySignLog.java @@ -0,0 +1,59 @@ +package org.jeecg.modules.citySignLog.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 签到记录 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +@Data +@TableName("city_sign_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="city_sign_log对象", description="签到记录") +public class CitySignLog implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**用户*/ + @Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @ApiModelProperty(value = "用户") + private java.lang.String userId; + /**获得积分*/ + @Excel(name = "获得积分", width = 15) + @ApiModelProperty(value = "获得积分") + private java.math.BigDecimal intger; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/CitySignLogMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/CitySignLogMapper.java new file mode 100644 index 0000000..5ba875a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/CitySignLogMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.citySignLog.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.citySignLog.entity.CitySignLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 签到记录 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +public interface CitySignLogMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/xml/CitySignLogMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/xml/CitySignLogMapper.xml new file mode 100644 index 0000000..8bb0cc0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/xml/CitySignLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/ICitySignLogService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/ICitySignLogService.java new file mode 100644 index 0000000..5fee767 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/ICitySignLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.citySignLog.service; + +import org.jeecg.modules.citySignLog.entity.CitySignLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 签到记录 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +public interface ICitySignLogService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/impl/CitySignLogServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/impl/CitySignLogServiceImpl.java new file mode 100644 index 0000000..1e62cf1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/impl/CitySignLogServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.citySignLog.service.impl; + +import org.jeecg.modules.citySignLog.entity.CitySignLog; +import org.jeecg.modules.citySignLog.mapper.CitySignLogMapper; +import org.jeecg.modules.citySignLog.service.ICitySignLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 签到记录 + * @Author: jeecg-boot + * @Date: 2024-11-25 + * @Version: V1.0 + */ +@Service +public class CitySignLogServiceImpl extends ServiceImpl implements ICitySignLogService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/CitySignLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/CitySignLogList.vue new file mode 100644 index 0000000..1516118 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/CitySignLogList.vue @@ -0,0 +1,178 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogForm.vue new file mode 100644 index 0000000..68d2874 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogForm.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.Style#Drawer.vue new file mode 100644 index 0000000..084420b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.vue new file mode 100644 index 0000000..3d7d107 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.api.ts new file mode 100644 index 0000000..ead4fda --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/citySignLog/citySignLog/list', + save='/citySignLog/citySignLog/add', + edit='/citySignLog/citySignLog/edit', + deleteOne = '/citySignLog/citySignLog/delete', + deleteBatch = '/citySignLog/citySignLog/deleteBatch', + importExcel = '/citySignLog/citySignLog/importExcel', + exportXls = '/citySignLog/citySignLog/exportXls', +} +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; +/** + * 列表接口 + * @param params + */ +export const list = (params) => + defHttp.get({url: Api.list, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +export const batchDelete = (params, handleSuccess) => { + Modal.confirm({ + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} +/** + * 保存或者更新 + * @param params + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.data.ts new file mode 100644 index 0000000..1ecb20a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.data.ts @@ -0,0 +1,36 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '用户', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '获得积分', + align:"center", + dataIndex: 'intger' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '用户', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '获得积分', + field: 'intger', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLogList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLogList.vue new file mode 100644 index 0000000..c9ed2e8 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLogList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/components/CitySignLogModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/components/CitySignLogModal.vue new file mode 100644 index 0000000..a9da84d --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/components/CitySignLogModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java index 5c4a076..51c3f5d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java @@ -10,6 +10,8 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.bean.HttpConf; import org.jeecg.modules.bean.LoginReq; +import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater; +import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.service.AppletLoginService; @@ -18,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -39,6 +42,9 @@ public class AppletLoginServiceImpl implements AppletLoginService { @Resource private IHanHaiMemberService memberService; + @Resource + private ICityIntgerWaterService cityIntgerWaterService; + @Resource private RedisUtil redisUtil; @Resource @@ -87,7 +93,39 @@ public class AppletLoginServiceImpl implements AppletLoginService { member.setHeadImage(loginReq.getHeadimgurl()); member.setShareId(loginReq.getShareId()); member.setVtime(new Date()); - member.setVid(loginReq.getVid()); +// member.setVid(loginReq.getVid()); + + //如果邀请者标识不为空，则设置邀请者标识 + if (StringUtils.isNotBlank(loginReq.getShareId())) { + member.setShareId(loginReq.getShareId()); + + + + + //根据邀请者标识查询邀请者用户 + HanHaiMember hanHaiMember = memberService.lambdaQuery().eq(HanHaiMember::getId,loginReq.getShareId()).one(); + //用户不能为空 + if (hanHaiMember != null) { + //增加流水记录 + CityIntgerWater cityMoneyLog = new CityIntgerWater(); + cityMoneyLog.setCreateTime(new Date()); + cityMoneyLog.setIntger(new BigDecimal(5)); + cityMoneyLog.setType(1); + cityMoneyLog.setUserId(loginReq.getShareId()); + cityMoneyLog.setTitle("邀请好友"); + cityIntgerWaterService.save(cityMoneyLog); + } + + //修改用户积分 + hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(5))); + memberService.updateById(hanHaiMember); + } + + + + + + // 生成token返回给小程序端 String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid); memberService.save(member); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java index 14b4fa5..b4437d5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java @@ -193,5 +193,21 @@ public interface YaoDuApiService { //删除地址信息 Result deleteAddress(String token,String addressId); + //获取今日是否签到 + Result getTodaySign(String token); + + //点击签到 + Result sign(String token); + + //查看积分流水 + Result getPointsFlow(String token,PageBean pageBean); + + //查看签到记录 + Result getSignRecord(String token,PageBean pageBean); + + //查看钱包流水 + Result getWalletFlow(String token,PageBean pageBean); + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java index a8a9a88..317ad0d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java @@ -20,4 +20,8 @@ public interface YaoDuOrderService { //商城-支付回调 Result payNotify(String requestBody); + + + //开通万能墙会员 + Result openMember(String token,Integer type); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java index 9124d67..b4c8edf 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java @@ -19,6 +19,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.RedisUtil; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.api.bean.HttpClientUtil; @@ -55,6 +56,8 @@ import org.jeecg.modules.cityHome.entity.CityHome; import org.jeecg.modules.cityHome.service.ICityHomeService; import org.jeecg.modules.cityIcon.entity.CityIcon; import org.jeecg.modules.cityIcon.service.ICityIconService; +import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater; +import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService; import org.jeecg.modules.cityJd.entity.CityJd; import org.jeecg.modules.cityJd.service.ICityJdService; import org.jeecg.modules.cityJob.entity.CityJob; @@ -66,6 +69,8 @@ import org.jeecg.modules.cityShop.entity.CityShop; import org.jeecg.modules.cityShop.service.ICityShopService; import org.jeecg.modules.cityShopping.entity.CityShopping; import org.jeecg.modules.cityShopping.service.ICityShoppingService; +import org.jeecg.modules.citySignLog.entity.CitySignLog; +import org.jeecg.modules.citySignLog.service.ICitySignLogService; import org.jeecg.modules.cityTrends.entity.CityTrends; import org.jeecg.modules.cityTrends.service.ICityTrendsService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -82,10 +87,14 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; import java.io.*; +import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; import java.nio.charset.StandardCharsets; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; import java.util.*; @Service @@ -156,6 +165,12 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { //获取景点信息 @Resource private ICityJdService cityJdService; + //签到流水 + @Resource + private ICitySignLogService citySignLogService; + //流水记录 + @Resource + private ICityIntgerWaterService cityIntgerWaterService; @Value("${wechat.mpAppId}") private String appid; @Value("${wechat.mpAppSecret}") @@ -261,6 +276,28 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { map.put("activityNum",cityActivityService.lambdaQuery().count()); //景点信息数量 map.put("jdNum",cityJdService.lambdaQuery().count()); + + + //获取积分获取规则 + CityConf integral = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "intger_user").one(); + map.put("integralDetails",integral.getKeyDetails()); + map.put("integral",10); + + //背景 + CityConf bg = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "bg").one(); + map.put("bg",bg.getKeyImage()); + + //vip + CityConf vip = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "vip").one(); + map.put("vip",vip); + //vip2 + CityConf vipBig = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "vipBig").one(); + map.put("vipBig",vipBig); + + + + CityConf notice = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "notice").one(); + map.put("notice",notice.getKeyDetails()); return Result.OK(map); } @@ -331,8 +368,8 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { } newRecords.add(cityTrends); } -// //随机排序帖子列表数据，每次刷新展示的数据不同 -// Collections.shuffle(newRecords); + //随机排序帖子列表数据，每次刷新展示的数据不同 + Collections.shuffle(newRecords); page1.setRecords(newRecords); return Result.OK(page1); @@ -432,7 +469,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page page1 = cityShopService .lambdaQuery() - .orderByDesc(CityShop::getCreateTime) + .orderByDesc(CityShop::getSort) .page(page); return Result.OK(page1); } @@ -592,6 +629,44 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { cityTrends.setYearDate(hanHaiMember.getYearDate()); cityTrends.setIsState(0); cityTrendsService.saveOrUpdate(cityTrends); + + + // 获取当前日期，时间部分设为00:00:00 + LocalDate today = LocalDate.now(); + LocalDateTime startOfDay = today.atStartOfDay(); + LocalDateTime endOfDay = today.atTime(LocalTime.MAX); // 23:59:59.999999999 + + // 转换为Date对象，这里假设数据库和服务器在同一时区，或者已经进行了时区转换 + Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()); + Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()); + + + CityIntgerWater one = cityIntgerWaterService.lambdaQuery() + .eq(CityIntgerWater::getUserId, hanHaiMember.getId()) + .eq(CityIntgerWater::getTitle, "发布帖子") + .between(CityIntgerWater::getCreateTime, startDate, endDate) + .one(); + + + //查询今日是否已经发布 + if(one == null){ + //增加流水记录 + CityIntgerWater cityMoneyLog = new CityIntgerWater(); + cityMoneyLog.setCreateTime(new Date()); + cityMoneyLog.setIntger(new BigDecimal(3)); + cityMoneyLog.setType(1); + cityMoneyLog.setUserId(hanHaiMember.getId()); + cityMoneyLog.setTitle("发布帖子"); + cityIntgerWaterService.save(cityMoneyLog); + + //修改用户积分 + hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(3))); + hanHaiMemberService.updateById(hanHaiMember); + } + + + + return Result.OK("编辑成功"); } @@ -747,13 +822,13 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { trial= "develop"; } - WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId()); - if(o!=null){ - - - o.setName("瑶都万能墙欢迎您的加入"); - return Result.OK(o); - } +// WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId()); +// if(o!=null){ +// +// +// o.setName("瑶都万能墙欢迎您的加入"); +// return Result.OK(o); +// } Map param = new HashMap<>(); @@ -845,7 +920,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { wxCodeVo.setName("瑶都万能墙欢迎您的加入"); - redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo); +// redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo); return Result.OK(wxCodeVo); } catch (Exception e) { @@ -946,6 +1021,23 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { cityComment.setUserHead(hanHaiMember.getHeadImage()); cityComment.setCreateTime(new Date()); cityCommentService.save(cityComment); + + + + +// //增加流水记录 +// CityIntgerWater cityMoneyLog = new CityIntgerWater(); +// cityMoneyLog.setCreateTime(new Date()); +// cityMoneyLog.setIntger(new BigDecimal(1)); +// cityMoneyLog.setType(1); +// cityMoneyLog.setUserId(hanHaiMember.getId()); +// cityMoneyLog.setTitle("评论获得积分"); +// cityIntgerWaterService.save(cityMoneyLog); +// +// +// //修改用户积分 +// hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(1))); +// hanHaiMemberService.updateById(hanHaiMember); return Result.OK("评论成功"); } @@ -1233,6 +1325,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { public Result getShopPingPage(PageBean pageBean){ Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page page1 = cityShoppingService.lambdaQuery() + .orderByDesc(CityShopping::getCreateTime) .page(page); //获取列表数据循环替换数据 List records = page1.getRecords(); @@ -1290,4 +1383,101 @@ public class YaoDuApiServiceImpl implements YaoDuApiService { cityAddressService.removeById(id); return Result.OK(); } + + + //获取今日是否签到 + @Override + public Result getTodaySign(String token){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + // 获取当前日期，时间部分设为00:00:00 + LocalDate today = LocalDate.now(); + LocalDateTime startOfDay = today.atStartOfDay(); + LocalDateTime endOfDay = today.atTime(LocalTime.MAX); // 23:59:59.999999999 + +// 转换为Date对象，这里假设数据库和服务器在同一时区，或者已经进行了时区转换 + Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()); + Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()); + + CitySignLog one = citySignLogService.lambdaQuery() + .eq(CitySignLog::getUserId, hanHaiMember.getId()) + .between(CitySignLog::getCreateTime, startDate, endDate) + .one(); + if(one==null){ + return Result.OK(true); + } + return Result.OK(false); + } + + //点击签到 + @Override + public Result sign(String token){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询今日是否有签到记录 + CitySignLog one = citySignLogService.lambdaQuery() + .eq(CitySignLog::getUserId, hanHaiMember.getId()) + .eq(CitySignLog::getCreateTime, new Date()) + .one(); + if(one==null){ + //增加签到记录 + CitySignLog citySignLog = new CitySignLog(); + citySignLog.setUserId(hanHaiMember.getId()); + citySignLog.setCreateTime(new Date()); + citySignLogService.save(citySignLog); + + //增加流水记录 + CityIntgerWater cityMoneyLog = new CityIntgerWater(); + cityMoneyLog.setCreateTime(new Date()); + cityMoneyLog.setIntger(new BigDecimal(2)); + cityMoneyLog.setType(1); + cityMoneyLog.setUserId(hanHaiMember.getId()); + cityMoneyLog.setTitle("每日签到"); + cityIntgerWaterService.save(cityMoneyLog); + + + //修改用户积分 + hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(2))); + hanHaiMemberService.updateById(hanHaiMember); + return Result.OK("签到成功"); + } + return Result.OK("签到成功"); + } + + + + + //查看积分流水 + @Override + public Result getPointsFlow(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = cityIntgerWaterService.lambdaQuery() + .eq(CityIntgerWater::getUserId, hanHaiMember.getId()) + .orderByDesc(CityIntgerWater::getCreateTime) + .page(page); + return Result.OK(page1); + } + + //查看签到记录 + @Override + public Result getSignRecord(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = cityIntgerWaterService.lambdaQuery() + .eq(CityIntgerWater::getUserId, hanHaiMember.getId()) + .orderByDesc(CityIntgerWater::getCreateTime) + .page(page); + return Result.OK(page1); + } + + //查看钱包流水 + @Override + public Result getWalletFlow(String token,PageBean pageBean){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page page1 = cityIntgerWaterService.lambdaQuery() + .eq(CityIntgerWater::getUserId, hanHaiMember.getId()) + .orderByDesc(CityIntgerWater::getCreateTime) + .page(page); + return Result.OK(page1); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java index 309e98c..2029d1b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java @@ -53,7 +53,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService { public Result createPointsOrder(String token,String shopId,Integer num,String addressId){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //商品标识不能为空 - if(StringUtils.isNotBlank(shopId)){ + if(StringUtils.isBlank(shopId)){ return Result.error("商品标识不能为空"); } //商品数量不能为空，并且不能小于零 @@ -61,7 +61,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService { return Result.error("商品数量不能小于零"); } //用户地址不能为空 - if(StringUtils.isNotBlank(addressId)){ + if(StringUtils.isBlank(addressId)){ return Result.error("请选择收货地址"); } //根据商品标识查询商品是否存在 @@ -102,7 +102,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService { } //积分不足 - return Result.error("积分不足"); + return Result.OK("兑换成功"); } //商城-立即购买商品 @@ -110,7 +110,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService { public Result createOrder(String token,String shopId,Integer num,String addressId){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //商品标识不能为空 - if(StringUtils.isNotBlank(shopId)){ + if(StringUtils.isBlank(shopId)){ return Result.error("商品标识不能为空"); } //商品数量不能为空，并且不能小于零 @@ -118,7 +118,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService { return Result.error("商品数量不能小于零"); } //用户地址不能为空 - if(StringUtils.isNotBlank(addressId)){ + if(StringUtils.isBlank(addressId)){ return Result.error("请选择收货地址"); } //根据商品标识查询商品是否存在 @@ -174,6 +174,8 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page page1 = cityOrderService.lambdaQuery() + .eq(CityOrder::getUserId,hanHaiMember.getId()) + .orderByDesc(CityOrder::getCreateTime) .page(page); return Result.OK(page1); } @@ -197,4 +199,24 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService { return null; } + + //开通万能墙会员 + @Override + public Result openMember(String token,Integer type){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //吊起微信支付 + String s = new BigDecimal(0.01).multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + Object appOrder = mpWxPayService.createOrderGo( + "购买会员" , + "127.0.0.1", + System.currentTimeMillis()+"", + i1, + System.currentTimeMillis()+"", + hanHaiMember.getAppletOpenid(), + "{}"); + + return Result.OK("支付成功",appOrder); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java index 3f987f0..5aa9537 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java @@ -209,7 +209,56 @@ public class YaoDuApiTokenController { + //获取今日是否签到 + @ApiOperation(value="获取今日是否签到") + @GetMapping("/getTodaySign") + public Result getTodaySign(@RequestHeader("X-Access-Token") String token) + { + return yaoDuApiService.getTodaySign(token); + } + + //点击签到 + @ApiOperation(value="点击签到") + @PostMapping("/sign") + public Result sign(@RequestHeader("X-Access-Token") String token) + { + return yaoDuApiService.sign(token); + } + + + //查询会员是否过期 + @ApiOperation(value="查询会员是否过期") + @GetMapping("/checkMember") + public Result checkMember(@RequestHeader("X-Access-Token") String token) + { + return Result.OK(true); + } + + //查看积分流水 + @ApiOperation(value="查看积分流水") + @GetMapping("/getPointsFlow") + public Result getPointsFlow(@RequestHeader("X-Access-Token") String token, PageBean pageBean) + { + return yaoDuApiService.getPointsFlow(token,pageBean); + } + + //查看签到记录 + @ApiOperation(value="查看签到记录") + @GetMapping("/getSignRecord") + public Result getSignRecord(@RequestHeader("X-Access-Token") String token, PageBean pageBean) + { + return yaoDuApiService.getSignRecord(token,pageBean); + } + + //查看钱包流水 + @ApiOperation(value="查看钱包流水") + @GetMapping("/getWalletFlow") + public Result getWalletFlow(@RequestHeader("X-Access-Token") String token, PageBean pageBean) + { + return yaoDuApiService.getWalletFlow(token,pageBean); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java index 2304fe1..5925ba0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java @@ -33,7 +33,7 @@ public class YaoDuOrderController { //商城-立即购买商品 - @ApiOperation(value="商城-立即兑换商品", notes="商城-立即兑换商品") + @ApiOperation(value="商城-立即购买商品", notes="商城-立即购买商品") @PostMapping("/createOrder") public Result createOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num,String addressId){ return yaoDuOrderService.createOrder(token,shopId,num,addressId); @@ -41,7 +41,7 @@ public class YaoDuOrderController { //商城-订单列表 @ApiOperation(value="商城-订单列表", notes="商城-订单列表") - @PostMapping("/getOrderList") + @GetMapping("/getOrderList") public Result getOrderList(@RequestHeader("X-Access-Token") String token, YaoDuOrderBean bean){ return yaoDuOrderService.getOrderList(token,bean); } @@ -61,5 +61,11 @@ public class YaoDuOrderController { } + //开通万能墙会员 + @ApiOperation(value="开通万能墙会员", notes="开通万能墙会员") + @PostMapping("/openMember") + public Result openMember(@RequestHeader("X-Access-Token") String token,Integer type){ + return yaoDuOrderService.openMember(token,type); + } } diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 383591b..25370e5 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8000 tomcat: max-swallow-size: -1 error: diff --git a/jeecg-boot-module-system/src/main/resources/pay_weixin.properties b/jeecg-boot-module-system/src/main/resources/pay_weixin.properties index f9fe890..fa11972 100644 --- a/jeecg-boot-module-system/src/main/resources/pay_weixin.properties +++ b/jeecg-boot-module-system/src/main/resources/pay_weixin.properties @@ -1,8 +1,6 @@ -pay.mchId=1684003236 -pay.appId=wxe337e285c449abfc -pay.mchKey=0fdb77429ffdf206c151af76a663041c -pay.keyPath=classpath:apiclient_cert.pem -pay.notifyUrl=http://h5.xzaiyp.top/cheer-admin/cheer/info/notify -pay.notifyUrlDev=http://h5.xzaiyp.top/cheer-admin/cheer/info/notify - - +pay.mchId=1673516176 +pay.appId=wxa4d29e67e8a58d38 +pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK +pay.keyPath= +pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify +pay.notifyUrlDev=https://admin.hhlm1688.com/api/order/payNotify \ No newline at end of file