From 69987aafc8a99f84f7af5d7dffc6433853aaab3e Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Sun, 29 Dec 2024 19:59:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=B1=B3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-pc/.env.development | 2 +- admin-pc/.env.production | 2 +- admin-pc/src/views/orderList/CommonOrderList.vue | 309 +++++++++++++++++++++ .../views/orderList/modules/CommonOrderForm.vue | 179 ++++++++++++ .../modules/CommonOrderModal.Style#Drawer.vue | 84 ++++++ .../views/orderList/modules/CommonOrderModal.vue | 60 ++++ .../src/views/waterList/CommonMoneyLogList.vue | 252 +++++++++++++++++ .../views/waterList/modules/CommonMoneyLogForm.vue | 139 +++++++++ .../modules/CommonMoneyLogModal.Style#Drawer.vue | 84 ++++++ .../waterList/modules/CommonMoneyLogModal.vue | 60 ++++ .../controller/CommonMoneyLogController.java | 172 ++++++++++++ .../commonMoneyLog/entity/CommonMoneyLog.java | 96 +++++++ .../mapper/CommonMoneyLogMapper.java | 17 ++ .../mapper/xml/CommonMoneyLogMapper.xml | 5 + .../service/ICommonMoneyLogService.java | 14 + .../service/impl/CommonMoneyLogServiceImpl.java | 19 ++ .../commonMoneyLog/vue/CommonMoneyLogList.vue | 258 +++++++++++++++++ .../vue/modules/CommonMoneyLogForm.vue | 149 ++++++++++ .../modules/CommonMoneyLogModal.Style#Drawer.vue | 84 ++++++ .../vue/modules/CommonMoneyLogModal.vue | 60 ++++ .../commonMoneyLog/vue3/CommonMoneyLog.api.ts | 61 ++++ .../commonMoneyLog/vue3/CommonMoneyLog.data.ts | 155 +++++++++++ .../commonMoneyLog/vue3/CommonMoneyLogList.vue | 162 +++++++++++ .../vue3/components/CommonMoneyLogModal.vue | 58 ++++ .../riceNews/controller/RiceNewsController.java | 2 +- .../jeecg/modules/riceNews/entity/RiceNews.java | 6 +- .../modules/riceNews/mapper/RiceNewsMapper.java | 2 +- .../modules/riceNews/service/IRiceNewsService.java | 2 +- .../riceNews/service/impl/RiceNewsServiceImpl.java | 2 +- .../jeecg/modules/riceNews/vue/RiceNewsList.vue | 7 + .../modules/riceNews/vue/modules/RiceNewsForm.vue | 5 + .../jeecg/modules/riceNews/vue3/RiceNews.data.ts | 13 + .../controller/CommonMoneyLogController.java | 3 +- .../commonMoneyLog/entity/CommonMoneyLog.java | 15 +- .../mapper/CommonMoneyLogMapper.java | 2 +- .../service/ICommonMoneyLogService.java | 2 +- .../service/impl/CommonMoneyLogServiceImpl.java | 2 +- .../commonMoneyLog/vue/CommonMoneyLogList.vue | 25 +- .../vue/modules/CommonMoneyLogForm.vue | 10 - .../commonMoneyLog/vue3/CommonMoneyLog.data.ts | 32 +-- .../controller/CommonOrderController.java | 10 +- .../modules/commonOrder/entity/CommonOrder.java | 20 +- .../commonOrder/mapper/CommonOrderMapper.java | 2 +- .../commonOrder/service/ICommonOrderService.java | 2 +- .../service/impl/CommonOrderServiceImpl.java | 2 +- .../modules/commonOrder/vue/CommonOrderList.vue | 54 +++- .../commonOrder/vue/modules/CommonOrderForm.vue | 12 +- .../modules/commonOrder/vue3/CommonOrder.data.ts | 80 +++++- .../commonOrderSku/entity/CommonOrderSku.java | 4 + .../src/main/resources/application-dev.yml | 2 +- 50 files changed, 2702 insertions(+), 97 deletions(-) create mode 100644 admin-pc/src/views/orderList/CommonOrderList.vue create mode 100644 admin-pc/src/views/orderList/modules/CommonOrderForm.vue create mode 100644 admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue create mode 100644 admin-pc/src/views/orderList/modules/CommonOrderModal.vue create mode 100644 admin-pc/src/views/waterList/CommonMoneyLogList.vue create mode 100644 admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue create mode 100644 admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue create mode 100644 admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/xml/CommonMoneyLogMapper.xml create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.Style#Drawer.vue create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.vue create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.api.ts create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLogList.vue create mode 100644 applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/components/CommonMoneyLogModal.vue diff --git a/admin-pc/.env.development b/admin-pc/.env.development index cdc6b71..11af7b8 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8001/rice-admin/ +VUE_APP_API_BASE_URL=https://admin.szqwdgidm.com/rice-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 47acf84..c8a1bd3 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8001/rice-admin/ +VUE_APP_API_BASE_URL=https://admin.szqwdgidm.com/rice-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-pc/src/views/orderList/CommonOrderList.vue b/admin-pc/src/views/orderList/CommonOrderList.vue new file mode 100644 index 0000000..0f4a289 --- /dev/null +++ b/admin-pc/src/views/orderList/CommonOrderList.vue @@ -0,0 +1,309 @@ + + + + \ No newline at end of file diff --git a/admin-pc/src/views/orderList/modules/CommonOrderForm.vue b/admin-pc/src/views/orderList/modules/CommonOrderForm.vue new file mode 100644 index 0000000..63a14a7 --- /dev/null +++ b/admin-pc/src/views/orderList/modules/CommonOrderForm.vue @@ -0,0 +1,179 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue b/admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..fdc5994 --- /dev/null +++ b/admin-pc/src/views/orderList/modules/CommonOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-pc/src/views/orderList/modules/CommonOrderModal.vue b/admin-pc/src/views/orderList/modules/CommonOrderModal.vue new file mode 100644 index 0000000..7e27362 --- /dev/null +++ b/admin-pc/src/views/orderList/modules/CommonOrderModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/waterList/CommonMoneyLogList.vue b/admin-pc/src/views/waterList/CommonMoneyLogList.vue new file mode 100644 index 0000000..090ec10 --- /dev/null +++ b/admin-pc/src/views/waterList/CommonMoneyLogList.vue @@ -0,0 +1,252 @@ + + + + \ No newline at end of file diff --git a/admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue b/admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue new file mode 100644 index 0000000..0ff5f51 --- /dev/null +++ b/admin-pc/src/views/waterList/modules/CommonMoneyLogForm.vue @@ -0,0 +1,139 @@ + + + \ No newline at end of file diff --git a/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue new file mode 100644 index 0000000..b01a85e --- /dev/null +++ b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue new file mode 100644 index 0000000..6041bfb --- /dev/null +++ b/admin-pc/src/views/waterList/modules/CommonMoneyLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java new file mode 100644 index 0000000..8212f72 --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java @@ -0,0 +1,172 @@ +package org.jeecg.modules.commonMoneyLog.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.commonMoneyLog.entity.CommonMoneyLog; +import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; + +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-27 + * @Version: V1.0 + */ +@Api(tags="流水日志表") +@RestController +@RequestMapping("/commonMoneyLog/commonMoneyLog") +@Slf4j +public class CommonMoneyLogController extends JeecgController { + @Autowired + private ICommonMoneyLogService commonMoneyLogService; + + /** + * 分页列表查询 + * + * @param commonMoneyLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "流水日志表-分页列表查询") + @ApiOperation(value="流水日志表-分页列表查询", notes="流水日志表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(CommonMoneyLog commonMoneyLog, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(commonMoneyLog, req.getParameterMap()); + queryWrapper.eq("is_get", "Y"); + Page page = new Page(pageNo, pageSize); + IPage pageList = commonMoneyLogService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param commonMoneyLog + * @return + */ + @AutoLog(value = "流水日志表-添加") + @ApiOperation(value="流水日志表-添加", notes="流水日志表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody CommonMoneyLog commonMoneyLog) { + commonMoneyLogService.save(commonMoneyLog); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param commonMoneyLog + * @return + */ + @AutoLog(value = "流水日志表-编辑") + @ApiOperation(value="流水日志表-编辑", notes="流水日志表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody CommonMoneyLog commonMoneyLog) { + commonMoneyLogService.updateById(commonMoneyLog); + 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) { + commonMoneyLogService.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.commonMoneyLogService.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) { + CommonMoneyLog commonMoneyLog = commonMoneyLogService.getById(id); + if(commonMoneyLog==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(commonMoneyLog); + } + + /** + * 导出excel + * + * @param request + * @param commonMoneyLog + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, CommonMoneyLog commonMoneyLog) { + return super.exportXls(request, commonMoneyLog, CommonMoneyLog.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, CommonMoneyLog.class); + } + +} diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java new file mode 100644 index 0000000..e6e40cf --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java @@ -0,0 +1,96 @@ +package org.jeecg.modules.commonMoneyLog.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-27 + * @Version: V1.0 + */ +@Data +@TableName("common_money_log") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="common_money_log对象", description="流水日志表") +public class CommonMoneyLog 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; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**流水标题*/ + @Excel(name = "流水标题", width = 15) + @ApiModelProperty(value = "流水标题") + private java.lang.String title; + /**变动金额*/ + @Excel(name = "变动金额", width = 15) + @ApiModelProperty(value = "变动金额") + private java.math.BigDecimal money; + /**原钱包金额*/ + @Excel(name = "原钱包金额", width = 15) + @ApiModelProperty(value = "原钱包金额") + private java.math.BigDecimal oldMoney; + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "pay_type") + @Dict(dicCode = "pay_type") + @ApiModelProperty(value = "类型") + private java.lang.Integer type; + /**状态*/ + @Excel(name = "状态", width = 15, dicCode = "pay_state") + @Dict(dicCode = "pay_state") + @ApiModelProperty(value = "状态") + private java.lang.Integer state; + /**用户标识*/ + @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.lang.String name; + /**开户行*/ + @Excel(name = "开户行", width = 15) + @ApiModelProperty(value = "开户行") + private java.lang.String bankName; + /**开户号*/ + @Excel(name = "开户号", width = 15) + @ApiModelProperty(value = "开户号") + private java.lang.String bankNo; + /**是否提现*/ + @Excel(name = "是否提现", width = 15) + @ApiModelProperty(value = "是否提现") + private java.lang.String isGet; +} diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java new file mode 100644 index 0000000..a604e2c --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.commonMoneyLog.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 流水日志表 + * @Author: jeecg-boot + * @Date: 2024-12-27 + * @Version: V1.0 + */ +public interface CommonMoneyLogMapper extends BaseMapper { + +} diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/xml/CommonMoneyLogMapper.xml b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/xml/CommonMoneyLogMapper.xml new file mode 100644 index 0000000..b4baad0 --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/xml/CommonMoneyLogMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java new file mode 100644 index 0000000..9c9cff9 --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.commonMoneyLog.service; + +import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 流水日志表 + * @Author: jeecg-boot + * @Date: 2024-12-27 + * @Version: V1.0 + */ +public interface ICommonMoneyLogService extends IService { + +} diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java new file mode 100644 index 0000000..aef773c --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.commonMoneyLog.service.impl; + +import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog; +import org.jeecg.modules.commonMoneyLog.mapper.CommonMoneyLogMapper; +import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 流水日志表 + * @Author: jeecg-boot + * @Date: 2024-12-27 + * @Version: V1.0 + */ +@Service +public class CommonMoneyLogServiceImpl extends ServiceImpl implements ICommonMoneyLogService { + +} diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue new file mode 100644 index 0000000..6017de1 --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue @@ -0,0 +1,258 @@ + + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue new file mode 100644 index 0000000..0efb16c --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue @@ -0,0 +1,149 @@ + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.Style#Drawer.vue b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.Style#Drawer.vue new file mode 100644 index 0000000..b01a85e --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.vue b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.vue new file mode 100644 index 0000000..6041bfb --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.api.ts b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.api.ts new file mode 100644 index 0000000..7ba1b7d --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/commonMoneyLog/commonMoneyLog/list', + save='/commonMoneyLog/commonMoneyLog/add', + edit='/commonMoneyLog/commonMoneyLog/edit', + deleteOne = '/commonMoneyLog/commonMoneyLog/delete', + deleteBatch = '/commonMoneyLog/commonMoneyLog/deleteBatch', + importExcel = '/commonMoneyLog/commonMoneyLog/importExcel', + exportXls = '/commonMoneyLog/commonMoneyLog/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/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts new file mode 100644 index 0000000..156dedf --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts @@ -0,0 +1,155 @@ +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: 'title' + }, + { + title: '变动金额', + align:"center", + dataIndex: 'money' + }, + { + title: '原钱包金额', + align:"center", + dataIndex: 'oldMoney' + }, + { + title: '类型', + align:"center", + dataIndex: 'type_dictText' + }, + { + title: '状态', + align:"center", + dataIndex: 'state_dictText' + }, + { + title: '用户标识', + align:"center", + dataIndex: 'userId_dictText' + }, + { + title: '姓名', + align:"center", + dataIndex: 'name' + }, + { + title: '开户行', + align:"center", + dataIndex: 'bankName' + }, + { + title: '开户号', + align:"center", + dataIndex: 'bankNo' + }, + { + title: '是否提现', + align:"center", + dataIndex: 'isGet' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "流水标题", + field: "title", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "类型", + field: "type", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"pay_type" + }, + colProps: {span: 6}, + }, + { + label: "状态", + field: "state", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"pay_state" + }, + colProps: {span: 6}, + }, + { + label: "用户标识", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '流水标题', + field: 'title', + component: 'Input', + }, + { + label: '变动金额', + field: 'money', + component: 'InputNumber', + }, + { + label: '原钱包金额', + field: 'oldMoney', + component: 'InputNumber', + }, + { + label: '类型', + field: 'type', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"pay_type" + }, + }, + { + label: '状态', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"pay_state" + }, + }, + { + label: '用户标识', + field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '姓名', + field: 'name', + component: 'Input', + }, + { + label: '开户行', + field: 'bankName', + component: 'Input', + }, + { + label: '开户号', + field: 'bankNo', + component: 'Input', + }, + { + label: '是否提现', + field: 'isGet', + component: 'Input', + }, +]; diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLogList.vue b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLogList.vue new file mode 100644 index 0000000..d36c2ac --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLogList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/components/CommonMoneyLogModal.vue b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/components/CommonMoneyLogModal.vue new file mode 100644 index 0000000..072fcc5 --- /dev/null +++ b/applet-rice-api/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/components/CommonMoneyLogModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/controller/RiceNewsController.java b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/controller/RiceNewsController.java index af3f3f3..539471c 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/controller/RiceNewsController.java +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/controller/RiceNewsController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 介绍 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-23 * @Version: V1.0 */ @Api(tags="介绍") diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/entity/RiceNews.java b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/entity/RiceNews.java index 3927ecb..20c5b06 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/entity/RiceNews.java +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/entity/RiceNews.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 介绍 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-23 * @Version: V1.0 */ @Data @@ -68,4 +68,8 @@ public class RiceNews implements Serializable { @Excel(name = "文本介绍", width = 15) @ApiModelProperty(value = "文本介绍") private java.lang.String titleSub; + /**视频*/ + @Excel(name = "视频", width = 15) + @ApiModelProperty(value = "视频") + private java.lang.String voSub; } diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/mapper/RiceNewsMapper.java b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/mapper/RiceNewsMapper.java index 78b7a39..bf406d3 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/mapper/RiceNewsMapper.java +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/mapper/RiceNewsMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 介绍 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-23 * @Version: V1.0 */ public interface RiceNewsMapper extends BaseMapper { diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/IRiceNewsService.java b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/IRiceNewsService.java index 9bd6f2b..b4d6b87 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/IRiceNewsService.java +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/IRiceNewsService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 介绍 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-23 * @Version: V1.0 */ public interface IRiceNewsService extends IService { diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/impl/RiceNewsServiceImpl.java b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/impl/RiceNewsServiceImpl.java index 30d0adb..59b3129 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/impl/RiceNewsServiceImpl.java +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/service/impl/RiceNewsServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 介绍 * @Author: jeecg-boot - * @Date: 2024-12-04 + * @Date: 2024-12-23 * @Version: V1.0 */ @Service diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/RiceNewsList.vue b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/RiceNewsList.vue index d1a0cd7..da5d7ed 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/RiceNewsList.vue +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/RiceNewsList.vue @@ -143,6 +143,12 @@ align:"center", dataIndex: 'titleSub' }, + { + title:'视频', + align:"center", + dataIndex: 'voSub', + scopedSlots: {customRender: 'fileSlot'} + }, { title: '操作', dataIndex: 'action', @@ -182,6 +188,7 @@ fieldList.push({type:'string',value:'type',text:'类型',dictCode:'rice_news_type'}) fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''}) fieldList.push({type:'string',value:'titleSub',text:'文本介绍',dictCode:''}) + fieldList.push({type:'Text',value:'voSub',text:'视频',dictCode:''}) this.superFieldList = fieldList } } diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/modules/RiceNewsForm.vue b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/modules/RiceNewsForm.vue index fdcf142..3e6526e 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/modules/RiceNewsForm.vue +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue/modules/RiceNewsForm.vue @@ -28,6 +28,11 @@ + + + + + diff --git a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue3/RiceNews.data.ts b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue3/RiceNews.data.ts index e5a4530..df9b6ba 100644 --- a/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue3/RiceNews.data.ts +++ b/applet-rice-api/src/main/java/org/jeecg/modules/riceNews/vue3/RiceNews.data.ts @@ -25,6 +25,12 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'titleSub' }, + { + title: '视频', + align:"center", + dataIndex: 'voSub', + slots: { customRender: 'fileSlot' }, + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -61,4 +67,11 @@ export const formSchema: FormSchema[] = [ field: 'titleSub', component: 'InputTextArea',//TODO 注意string转换问题 }, + { + label: '视频', + field: 'voSub', + component: 'JUpload', + componentProps:{ + }, + }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java index ea759fd..8212f72 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 流水日志表 * @Author: jeecg-boot - * @Date: 2024-12-17 + * @Date: 2024-12-27 * @Version: V1.0 */ @Api(tags="流水日志表") @@ -67,6 +67,7 @@ public class CommonMoneyLogController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(commonMoneyLog, req.getParameterMap()); + queryWrapper.eq("is_get", "Y"); Page page = new Page(pageNo, pageSize); IPage pageList = commonMoneyLogService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java index 807c629..9459376 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 流水日志表 * @Author: jeecg-boot - * @Date: 2024-12-17 + * @Date: 2024-12-27 * @Version: V1.0 */ @Data @@ -77,6 +77,10 @@ public class CommonMoneyLog implements Serializable { @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.lang.String name; /**开户行*/ @Excel(name = "开户行", width = 15) @ApiModelProperty(value = "开户行") @@ -85,4 +89,13 @@ public class CommonMoneyLog implements Serializable { @Excel(name = "开户号", width = 15) @ApiModelProperty(value = "开户号") private java.lang.String bankNo; + /**是否提现*/ + @Excel(name = "是否提现", width = 15) + @ApiModelProperty(value = "是否提现") + private java.lang.String isGet; + /**提现状态*/ + @Excel(name = "提现状态", width = 15, dicCode = "tx_state_sub") + @Dict(dicCode = "tx_state_sub") + @ApiModelProperty(value = "提现状态") + private java.lang.Integer txState; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java index 9a8ae8d..a604e2c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 流水日志表 * @Author: jeecg-boot - * @Date: 2024-12-17 + * @Date: 2024-12-27 * @Version: V1.0 */ public interface CommonMoneyLogMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java index dc4aa98..9c9cff9 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 流水日志表 * @Author: jeecg-boot - * @Date: 2024-12-17 + * @Date: 2024-12-27 * @Version: V1.0 */ public interface ICommonMoneyLogService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java index cf01784..aef773c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 流水日志表 * @Author: jeecg-boot - * @Date: 2024-12-17 + * @Date: 2024-12-27 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue index a6e7cab..4c32890 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue @@ -25,6 +25,11 @@ + + + + + @@ -154,6 +159,12 @@ return parseInt(index)+1; } }, + { + title:'创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime' + }, { title:'流水标题', align:"center", @@ -184,16 +195,6 @@ align:"center", dataIndex: 'userId_dictText' }, - { - title:'开户行', - align:"center", - dataIndex: 'bankName' - }, - { - title:'开户号', - align:"center", - dataIndex: 'bankNo' - }, { title: '操作', dataIndex: 'action', @@ -228,14 +229,14 @@ }, getSuperFieldList(){ let fieldList=[]; + fieldList.push({type:'datetime',value:'createTime',text:'创建日期'}) fieldList.push({type:'string',value:'title',text:'流水标题',dictCode:''}) fieldList.push({type:'BigDecimal',value:'money',text:'变动金额',dictCode:''}) fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原钱包金额',dictCode:''}) fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'}) fieldList.push({type:'int',value:'state',text:'状态',dictCode:'pay_state'}) fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) - fieldList.push({type:'string',value:'bankName',text:'开户行',dictCode:''}) - fieldList.push({type:'string',value:'bankNo',text:'开户号',dictCode:''}) + fieldList.push({type:'string',value:'isGet',text:'是否提现',dictCode:''}) this.superFieldList = fieldList } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue index 6a6dccc..00ee044 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue @@ -33,16 +33,6 @@ - - - - - - - - - - diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts index eb5b1af..8f7daaf 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts @@ -5,6 +5,12 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { + title: '创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime' + }, + { title: '流水标题', align:"center", dataIndex: 'title' @@ -34,16 +40,6 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId_dictText' }, - { - title: '开户行', - align:"center", - dataIndex: 'bankName' - }, - { - title: '开户号', - align:"center", - dataIndex: 'bankNo' - }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -80,6 +76,12 @@ export const searchFormSchema: FormSchema[] = [ }, colProps: {span: 6}, }, + { + label: "是否提现", + field: "isGet", + component: 'Input', + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -122,14 +124,4 @@ export const formSchema: FormSchema[] = [ dict:"han_hai_member,nick_name,id" }, }, - { - label: '开户行', - field: 'bankName', - component: 'Input', - }, - { - label: '开户号', - field: 'bankNo', - component: 'Input', - }, ]; diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java index 4a6dae7..c7a1803 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-27 * @Version: V1.0 */ @Api(tags="订单信息表") @@ -96,6 +96,14 @@ public class CommonOrderController extends JeecgController edit(@RequestBody CommonOrder commonOrder) { + //请输入快递公司 + if(oConvertUtils.isEmpty(commonOrder.getKuai())){ + return Result.error("请输入快递公司"); + } + if(oConvertUtils.isEmpty(commonOrder.getWuliu())){ + return Result.error("请输入物流订单"); + } + commonOrder.setState(2); // 已发货 commonOrderService.updateById(commonOrder); return Result.OK("编辑成功!"); } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java index fd24a0f..7cb684c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java @@ -24,7 +24,7 @@ import lombok.experimental.Accessors; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-27 * @Version: V1.0 */ @Data @@ -51,6 +51,11 @@ public class CommonOrder implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**订单状态*/ + @Excel(name = "订单状态", width = 15, dicCode = "order_state") + @Dict(dicCode = "order_state") + @ApiModelProperty(value = "订单状态") + private java.lang.Integer state; /**标题*/ @Excel(name = "标题", width = 15) @ApiModelProperty(value = "标题") @@ -59,10 +64,6 @@ public class CommonOrder implements Serializable { @Excel(name = "图片", width = 15) @ApiModelProperty(value = "图片") private java.lang.String image; - /**支付状态*/ - @Excel(name = "支付状态", width = 15) - @ApiModelProperty(value = "支付状态") - private java.lang.Integer state; /**价格*/ @Excel(name = "价格", width = 15) @ApiModelProperty(value = "价格") @@ -92,7 +93,8 @@ public class CommonOrder implements Serializable { @ApiModelProperty(value = "详细地址") private java.lang.String addressDetails; /**用户*/ - @Excel(name = "用户", width = 15) + @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; /**地址标识*/ @@ -100,7 +102,8 @@ public class CommonOrder implements Serializable { @ApiModelProperty(value = "地址标识") private java.lang.String addressId; /**商品标识*/ - @Excel(name = "商品标识", width = 15) + @Excel(name = "商品标识", width = 15, dictTable = "common_shop", dicText = "title", dicCode = "id") + @Dict(dictTable = "common_shop", dicText = "title", dicCode = "id") @ApiModelProperty(value = "商品标识") private java.lang.String shopId; /**支付编号*/ @@ -129,6 +132,7 @@ public class CommonOrder implements Serializable { @ApiModelProperty(value = "物流订单") private java.lang.String wuliu; - @TableField(exist = false) + + @TableField(exist = false) private List commonOrderSkuList; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java index 3ba5eb5..e6605f2 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-27 * @Version: V1.0 */ public interface CommonOrderMapper extends BaseMapper { diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java index c53439a..1768592 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-27 * @Version: V1.0 */ public interface ICommonOrderService extends IService { diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java index 6a41943..4dcd62b 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 订单信息表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2024-12-27 * @Version: V1.0 */ @Service diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue index e07e712..23e340e 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue @@ -5,10 +5,42 @@ - - + + + + + + + + 查询 @@ -138,14 +170,14 @@ } }, { - title:'标题', + title:'订单状态', align:"center", - dataIndex: 'title' + dataIndex: 'state_dictText' }, { - title:'支付状态', + title:'标题', align:"center", - dataIndex: 'state' + dataIndex: 'title' }, { title:'价格', @@ -185,12 +217,12 @@ { title:'用户', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' }, { title:'商品标识', align:"center", - dataIndex: 'shopId' + dataIndex: 'shopId_dictText' }, { title:'商品类型', @@ -251,8 +283,8 @@ }, getSuperFieldList(){ let fieldList=[]; + fieldList.push({type:'int',value:'state',text:'订单状态',dictCode:'order_state'}) fieldList.push({type:'string',value:'title',text:'标题',dictCode:''}) - fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:''}) fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''}) fieldList.push({type:'int',value:'num',text:'数量',dictCode:''}) fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''}) @@ -260,8 +292,8 @@ fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) fieldList.push({type:'string',value:'address',text:'地址',dictCode:''}) fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''}) - fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''}) - fieldList.push({type:'string',value:'shopId',text:'商品标识',dictCode:''}) + fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'shopId',text:'商品标识',dictTable:"common_shop", dictText:'title', dictCode:'id'}) fieldList.push({type:'int',value:'shopState',text:'商品类型',dictCode:'shop_type'}) fieldList.push({type:'string',value:'shareId',text:'推荐购买会员',dictCode:''}) fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''}) diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue index e506cb3..c588e6c 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue @@ -4,13 +4,13 @@ - - + + - - + + @@ -50,12 +50,12 @@ - + - + diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts index 17f276d..4413711 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts @@ -5,14 +5,14 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '标题', + title: '订单状态', align:"center", - dataIndex: 'title' + dataIndex: 'state_dictText' }, { - title: '支付状态', + title: '标题', align:"center", - dataIndex: 'state' + dataIndex: 'title' }, { title: '价格', @@ -52,12 +52,12 @@ export const columns: BasicColumn[] = [ { title: '用户', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' }, { title: '商品标识', align:"center", - dataIndex: 'shopId' + dataIndex: 'shopId_dictText' }, { title: '商品类型', @@ -88,6 +88,51 @@ export const columns: BasicColumn[] = [ //查询数据 export const searchFormSchema: FormSchema[] = [ { + label: "订单状态", + field: "state", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_state" + }, + colProps: {span: 6}, + }, + { + label: "标题", + field: "title", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "姓名", + field: "name", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "电话", + field: "phone", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "用户", + field: "userId", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, + { + label: "商品标识", + field: "shopId", + component: 'JSearchSelect', + componentProps:{ + dict:"common_shop,title,id" + }, + colProps: {span: 6}, + }, + { label: "商品类型", field: "shopState", component: 'JDictSelectTag', @@ -99,16 +144,19 @@ export const searchFormSchema: FormSchema[] = [ ]; //表单数据 export const formSchema: FormSchema[] = [ + { + label: '订单状态', + field: 'state', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"order_state" + }, + }, { label: '标题', field: 'title', component: 'Input', }, - { - label: '支付状态', - field: 'state', - component: 'InputNumber', - }, { label: '价格', field: 'price', @@ -147,12 +195,18 @@ export const formSchema: FormSchema[] = [ { label: '用户', field: 'userId', - component: 'Input', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, }, { label: '商品标识', field: 'shopId', - component: 'Input', + component: 'JSearchSelect', + componentProps:{ + dict:"common_shop,title,id" + }, }, { label: '商品类型', diff --git a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java index 78acd0d..fb97dbd 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java +++ b/module-common/src/main/java/org/jeecg/modules/commonOrderSku/entity/CommonOrderSku.java @@ -4,7 +4,10 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; +import java.util.List; + import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -86,4 +89,5 @@ public class CommonOrderSku implements Serializable { @Excel(name = "商品", width = 15) @ApiModelProperty(value = "商品") private java.lang.String shopId; + } diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index 3d97702..0a3043b 100644 --- a/module-system/src/main/resources/application-dev.yml +++ b/module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8001 + port: 8000 tomcat: max-swallow-size: -1 error: