From eceb749b1efe0dffed512c83cac4bbdb22481a6a Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Mon, 23 Dec 2024 20:38:52 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9=202?= =?UTF-8?q?=E3=80=81=E8=A1=A5=E5=85=85VIP=E5=85=85=E5=80=BC=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=203=E3=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=85=A8=E5=B9=B4=E6=94=B6=E6=94=AF=E6=94=B6=E5=85=A5/?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E9=87=91=E9=A2=9D=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=204=E3=80=81=E6=9B=BF=E6=8D=A2mysql=E3=80=81redis?= =?UTF-8?q?=E3=80=81oss=E5=BC=80=E5=8F=91=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/pay/MpWxPayService.java | 6 +- .../controller/EmployVipRecordController.java | 171 +++++++++++++++++++ .../employVipRecord/entity/EmployVipRecord.java | 66 +++++++ .../mapper/EmployVipRecordMapper.java | 17 ++ .../mapper/xml/EmployVipRecordMapper.xml | 5 + .../service/IEmployVipRecordService.java | 14 ++ .../service/impl/EmployVipRecordServiceImpl.java | 19 +++ .../employVipRecord/vue/EmployVipRecordList.vue | 190 +++++++++++++++++++++ .../vue/modules/EmployVipRecordForm.vue | 119 +++++++++++++ .../modules/EmployVipRecordModal.Style#Drawer.vue | 84 +++++++++ .../vue/modules/EmployVipRecordModal.vue | 60 +++++++ .../employVipRecord/vue3/EmployVipRecord.api.ts | 61 +++++++ .../employVipRecord/vue3/EmployVipRecord.data.ts | 53 ++++++ .../employVipRecord/vue3/EmployVipRecordList.vue | 162 ++++++++++++++++++ .../vue3/components/EmployVipRecordModal.vue | 58 +++++++ .../api/controller2/NotebookController.java | 7 + .../modules/api/controller2/VipController.java | 4 +- .../jeecg/modules/apiService/NotebookService.java | 3 + .../org/jeecg/modules/apiService/VipService.java | 2 +- .../apiService/impl/NotebookServiceImpl.java | 77 +++++++-- .../modules/apiService/impl/VipServiceImpl.java | 36 +++- .../src/main/resources/application-dev.yml | 18 +- 22 files changed, 1199 insertions(+), 33 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/controller/EmployVipRecordController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/entity/EmployVipRecord.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/EmployVipRecordMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/xml/EmployVipRecordMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/IEmployVipRecordService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/impl/EmployVipRecordServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/EmployVipRecordList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecordList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/components/EmployVipRecordModal.vue diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index 3bd4e4c..0b10eb8 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -98,14 +98,12 @@ public class MpWxPayService { request.setDetail(productName); //商品详情 request.setTotalFee(price); //总金额|分计 request.setSpbillCreateIp(clientIp); //终端IP -// request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 - request.setNotifyUrl("https://tai-testapi.sanhemovie.com/massage-api/post/notify");//设置回调路径 + request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 request.setProductId(productId); //商品id request.setOpenid(openId); //JSAPI OPENID if (dev){ request.setTotalFee(price); -// request.setNotifyUrl(wxPay.notifyUrlDev); - request.setNotifyUrl("https://tai-testapi.sanhemovie.com/massage-api/post/notify");//设置回调路径 + request.setNotifyUrl(wxPay.notifyUrlDev); } try { Object order = wxPayService.createOrder(request); diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/controller/EmployVipRecordController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/controller/EmployVipRecordController.java new file mode 100644 index 0000000..ec91510 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/controller/EmployVipRecordController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.employVipRecord.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.employVipRecord.entity.EmployVipRecord; +import org.jeecg.modules.employVipRecord.service.IEmployVipRecordService; + +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-12-23 + * @Version: V1.0 + */ +@Api(tags="会员订单记录表") +@RestController +@RequestMapping("/employVipRecord/employVipRecord") +@Slf4j +public class EmployVipRecordController extends JeecgController { + @Autowired + private IEmployVipRecordService employVipRecordService; + + /** + * 分页列表查询 + * + * @param employVipRecord + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "会员订单记录表-分页列表查询") + @ApiOperation(value="会员订单记录表-分页列表查询", notes="会员订单记录表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(EmployVipRecord employVipRecord, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(employVipRecord, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = employVipRecordService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param employVipRecord + * @return + */ + @AutoLog(value = "会员订单记录表-添加") + @ApiOperation(value="会员订单记录表-添加", notes="会员订单记录表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody EmployVipRecord employVipRecord) { + employVipRecordService.save(employVipRecord); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param employVipRecord + * @return + */ + @AutoLog(value = "会员订单记录表-编辑") + @ApiOperation(value="会员订单记录表-编辑", notes="会员订单记录表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody EmployVipRecord employVipRecord) { + employVipRecordService.updateById(employVipRecord); + 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) { + employVipRecordService.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.employVipRecordService.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) { + EmployVipRecord employVipRecord = employVipRecordService.getById(id); + if(employVipRecord==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(employVipRecord); + } + + /** + * 导出excel + * + * @param request + * @param employVipRecord + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EmployVipRecord employVipRecord) { + return super.exportXls(request, employVipRecord, EmployVipRecord.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, EmployVipRecord.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/entity/EmployVipRecord.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/entity/EmployVipRecord.java new file mode 100644 index 0000000..7baef00 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/entity/EmployVipRecord.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.employVipRecord.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-12-23 + * @Version: V1.0 + */ +@Data +@TableName("employ_vip_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="employ_vip_record对象", description="会员订单记录表") +public class EmployVipRecord 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.lang.String payNo; + /**订单状态*/ + @Excel(name = "订单状态", width = 15) + @ApiModelProperty(value = "订单状态") + private java.lang.String status; + /**关联用户id*/ + @Excel(name = "关联用户id", width = 15) + @ApiModelProperty(value = "关联用户id") + private java.lang.String userId; + /**关联会员类型*/ + @Excel(name = "关联会员类型", width = 15) + @ApiModelProperty(value = "关联会员类型") + private java.lang.String vipTypeId; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/EmployVipRecordMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/EmployVipRecordMapper.java new file mode 100644 index 0000000..b5c06ed --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/EmployVipRecordMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.employVipRecord.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.employVipRecord.entity.EmployVipRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 会员订单记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +public interface EmployVipRecordMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/xml/EmployVipRecordMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/xml/EmployVipRecordMapper.xml new file mode 100644 index 0000000..c4b1832 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/mapper/xml/EmployVipRecordMapper.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/employVipRecord/service/IEmployVipRecordService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/IEmployVipRecordService.java new file mode 100644 index 0000000..5fc5691 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/IEmployVipRecordService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.employVipRecord.service; + +import org.jeecg.modules.employVipRecord.entity.EmployVipRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 会员订单记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +public interface IEmployVipRecordService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/impl/EmployVipRecordServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/impl/EmployVipRecordServiceImpl.java new file mode 100644 index 0000000..6e3f6f4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/service/impl/EmployVipRecordServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.employVipRecord.service.impl; + +import org.jeecg.modules.employVipRecord.entity.EmployVipRecord; +import org.jeecg.modules.employVipRecord.mapper.EmployVipRecordMapper; +import org.jeecg.modules.employVipRecord.service.IEmployVipRecordService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 会员订单记录表 + * @Author: jeecg-boot + * @Date: 2024-12-23 + * @Version: V1.0 + */ +@Service +public class EmployVipRecordServiceImpl extends ServiceImpl implements IEmployVipRecordService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/EmployVipRecordList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/EmployVipRecordList.vue new file mode 100644 index 0000000..e1a780a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/EmployVipRecordList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordForm.vue new file mode 100644 index 0000000..177795e --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordForm.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/employVipRecord/vue/modules/EmployVipRecordModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.Style#Drawer.vue new file mode 100644 index 0000000..8104fc0 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.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/employVipRecord/vue/modules/EmployVipRecordModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.vue new file mode 100644 index 0000000..69a87ee --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue/modules/EmployVipRecordModal.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/employVipRecord/vue3/EmployVipRecord.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.api.ts new file mode 100644 index 0000000..d654579 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/employVipRecord/employVipRecord/list', + save='/employVipRecord/employVipRecord/add', + edit='/employVipRecord/employVipRecord/edit', + deleteOne = '/employVipRecord/employVipRecord/delete', + deleteBatch = '/employVipRecord/employVipRecord/deleteBatch', + importExcel = '/employVipRecord/employVipRecord/importExcel', + exportXls = '/employVipRecord/employVipRecord/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/employVipRecord/vue3/EmployVipRecord.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.data.ts new file mode 100644 index 0000000..033d3df --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecord.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: 'payNo' + }, + { + title: '订单状态', + align:"center", + dataIndex: 'status' + }, + { + title: '关联用户id', + align:"center", + dataIndex: 'userId' + }, + { + title: '关联会员类型', + align:"center", + dataIndex: 'vipTypeId' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '订单号', + field: 'payNo', + component: 'Input', + }, + { + label: '订单状态', + field: 'status', + component: 'Input', + }, + { + label: '关联用户id', + field: 'userId', + component: 'Input', + }, + { + label: '关联会员类型', + field: 'vipTypeId', + component: 'Input', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecordList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecordList.vue new file mode 100644 index 0000000..b8408c1 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/EmployVipRecordList.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/employVipRecord/vue3/components/EmployVipRecordModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/components/EmployVipRecordModal.vue new file mode 100644 index 0000000..5b0be08 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/employVipRecord/vue3/components/EmployVipRecordModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java index c25967f..ef28738 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/NotebookController.java @@ -56,6 +56,13 @@ public class NotebookController { return notebookService.queryBill(token, employNoteBookId, pageBean); } + //个人记工-全年收支金额 + @ApiOperation(value="记工记账-全年收支金额", notes="记工记账-全年收支金额") + @RequestMapping(value = "/queryBillAmount", method = {RequestMethod.GET}) + public Result queryBillAmount(@RequestHeader("X-Access-Token") String token, String employNoteBookId){ + return notebookService.queryBillAmount(token, employNoteBookId); + } + //个人记工-技工问题 @ApiOperation(value="记工记账-技工问题", notes="记工记账-技工问题") @RequestMapping(value = "/addQuestion", method = {RequestMethod.POST}) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java index 2d16f37..3b4b505 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller2/VipController.java @@ -28,8 +28,8 @@ public class VipController { //开通VIP @ApiOperation(value="开通VIP", notes="开通VIP") @RequestMapping(value = "/addVIP", method = {RequestMethod.POST}) - public Result addVIP(@RequestHeader("X-Access-Token") String token){ - return vipService.addVIP(token); + public Result addVIP(@RequestHeader("X-Access-Token") String token, String vipTypeId){ + return vipService.addVIP(token, vipTypeId); } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java index e7a3d74..e68e61e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/NotebookService.java @@ -18,6 +18,9 @@ public interface NotebookService { //个人记工-全年收支 public Result queryBill(String token, String employNoteBookId, PageBean pageBean); + //个人记工-全年收支金额 + public Result queryBillAmount(String token, String employNoteBookId); + //个人记工-技工问题 public Result addQuestion(String toke, EmployFeedback employFeedback); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java index dd6207f..93eaf27 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/VipService.java @@ -5,6 +5,6 @@ import org.jeecg.common.api.vo.Result; public interface VipService { //开通VIP - public Result addVIP(String token); + public Result addVIP(String token, String vipTypeId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java index 32d7b77..e076b4d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/NotebookServiceImpl.java @@ -109,8 +109,6 @@ public class NotebookServiceImpl implements NotebookService { //记工记账-全年收支 @Override public Result queryBill(String token, String employNoteBookId, PageBean pageBean) { - //返回信息 - Map map = new HashMap<>(); try{ //权限验证 @@ -158,22 +156,81 @@ public class NotebookServiceImpl implements NotebookService { .lambdaQuery() .in(EmployBillInfo::getNotebookId, notebooIds) .page(page); - map.put("BillInfo", pageList); + + + return Result.OK("收支记录", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("收支记录获取失败"); + } + } + + //记工记账-全年收支金额 + public Result queryBillAmount(String token, String employNoteBookId){ + //返回信息 + Map map = new HashMap<>(); + map.put("incomeCount", 0); + map.put("expenditureCount", 0); + + try{ + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //获取账本id列表 + Object[] notebooIds = null; + if(null == employNoteBookId){ + //根据用户id查询用户账本列表 + List notebookList = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .list(); + + //获取账本id列表 + int size = (int)notebookList.size(); + notebooIds = new Object[size]; + int index = 0; + for (EmployNotebook employNotebook : notebookList) { + notebooIds[index] = employNotebook.getId(); + index++; + } + + if(size == 0){ + return Result.OK("没有收支记录", map); + } + + }else { + notebooIds = new Object[]{employNoteBookId}; + + //判断用户输入账本id是否为自己所有 + EmployNotebook employNotebook = employNotebookService + .lambdaQuery() + .eq(EmployNotebook::getUserId, hanHaiMember.getId()) + .eq(EmployNotebook::getId, employNoteBookId) + .one(); + if(null == employNotebook){ + return Result.OK("该用户没有此账本的收支记录，请检查账本id输入是否错误", employNotebook); + } + } + + //根据账本id列表查询收支记录 + List pageList = employBillInfoService + .lambdaQuery() + .in(EmployBillInfo::getNotebookId, notebooIds) + .list(); BigDecimal incomeCount = BigDecimal.valueOf(0);//总收入 BigDecimal expenditureCount = BigDecimal.valueOf(0);//总支出 - for (EmployBillInfo record : pageList.getRecords()) { - if(0 == record.getType()){ - incomeCount = incomeCount.add(record.getAmount()); - }else if(1 == record.getType()){ - expenditureCount = expenditureCount.add(record.getAmount()); + for (EmployBillInfo employBillInfo : pageList) { + if(0 == employBillInfo.getType()){ + incomeCount = incomeCount.add(employBillInfo.getAmount()); + }else if(1 == employBillInfo.getType()){ + expenditureCount = expenditureCount.add(employBillInfo.getAmount()); } - } map.put("incomeCount", incomeCount); map.put("expenditureCount", expenditureCount); - return Result.OK("收支记录", map); + return Result.OK("收支/支出金额", map); }catch (Exception e){ e.printStackTrace(); return Result.error("收支记录获取失败"); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java index 40efec3..a2316d9 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/VipServiceImpl.java @@ -1,8 +1,13 @@ package org.jeecg.modules.apiService.impl; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiService.VipService; +import org.jeecg.modules.employVip.entity.EmployVip; +import org.jeecg.modules.employVipRecord.entity.EmployVipRecord; +import org.jeecg.modules.employVipType.entity.EmployVipType; +import org.jeecg.modules.employVipType.service.IEmployVipTypeService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; @@ -23,27 +28,44 @@ public class VipServiceImpl implements VipService { @Resource private ShiroRealm shiroRealm; + //权限验证 + @Resource + private IEmployVipTypeService employVipTypeService; + /******************************************************************************************************************/ + @Override - public Result addVIP(String token) { + public Result addVIP(String token, String vipTypeId) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //生成订单信息 + String payNo = IdWorker.getIdStr();//生成订单号 + EmployVipRecord vipRecord = new EmployVipRecord(); + vipRecord.setPayNo(payNo);//订单号 + vipRecord.setUserId(hanHaiMember.getId());//关联用户id + vipRecord.setVipTypeId(vipTypeId);//会员类型 + + //根据会员类型查询会员名称 + EmployVipType vipType = employVipTypeService + .lambdaQuery() + .eq(EmployVipType::getType, vipTypeId) + .one(); + //吊起微信支付 - BigDecimal price = BigDecimal.valueOf(0.01);//价格 - String productName = "VIP"; - String orderId = System.currentTimeMillis()+""; + BigDecimal price = vipType.getPrice();//价格 + String productName = vipType.getName();//vip类型 String s = price.multiply(new BigDecimal(100)).toString(); int i1 = Double.valueOf(s).intValue(); Object appOrder = mpWxPayService.createOrder( "购买"+ productName , "127.0.0.1", - orderId, + payNo, i1, - orderId, + payNo, hanHaiMember.getAppletOpenid(), - "{}"); + vipRecord.toString()); return Result.OK("支付成功",appOrder); } 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 835ca14..b44e3a6 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -134,9 +134,9 @@ spring: # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://8.138.162.67:3306/employ?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://110.40.186.41:3306/employ?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false username: root - password: Fk4q*h@V + password: Qy8D3Cne driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -147,7 +147,7 @@ spring: #redis 配置 redis: database: 1 - host: 8.138.162.67 + host: 110.40.186.41 lettuce: pool: max-active: -1 #最大连接数据库连接数,设 -1 为没有限制 @@ -155,7 +155,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 1000ms - password: 'gmmGMM@2024' + password: 'tyz.888888' port: 6379 #mybatis plus 设置 mybatis-plus: @@ -192,11 +192,11 @@ jeecg : excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tPfZo39q2r9Sr5mW84u - secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r - endpoint: oss-cn-guangzhou.aliyuncs.com - bucketName: augcl - staticDomain: https://img.augcl.com + accessKey: LTAI5t5nV2Pw67wVC9ZvtFSb + secretKey: perarQgbRK9TPNNb2G97EojoJ6kb9H + endpoint: oss-cn-beijing.aliyuncs.com + bucketName: teyizhaoimg + staticDomain: https://img.teyizhao.com # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES