From d25251405c77c3473f70278d4f23e0f8757887aa Mon Sep 17 00:00:00 2001 From: 19173159168 Date: Mon, 18 Aug 2025 23:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E7=94=B5=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZcBaseWalletChangeController.java | 127 ++++++++++++++++++ .../baseUser/domain/ZcBaseWalletChange.java | 21 ++- .../mapper/ZcBaseWalletChangeMapper.java | 61 +++++++++ .../service/IZcBaseWalletChangeService.java | 61 +++++++++ .../impl/ZcBaseWalletChangeServiceImpl.java | 97 +++++++++++++ .../controller/ZcOrderSubController.java | 3 +- .../com/ruoyi/orders/domain/ZcOrderSub.java | 15 +-- .../baseUser/ZcBaseWalletChangeMapper.xml | 99 ++++++++++++++ .../mapper/orders/ZcOrderMainMapper.xml | 7 +- .../mapper/orders/ZcOrderSubMapper.xml | 6 + .../templates/baseUser/walletChange/add.html | 66 +++++++++ .../templates/baseUser/walletChange/edit.html | 61 +++++++++ .../baseUser/walletChange/walletChange.html | 114 ++++++++++++++++ .../templates/orders/order/order.html | 7 +- .../templates/orders/orderSub/orderSub.html | 80 +++++------ 15 files changed, 766 insertions(+), 59 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseWalletChangeController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletChangeMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletChangeService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletChangeServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/baseUser/walletChange/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseWalletChangeController.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseWalletChangeController.java new file mode 100644 index 0000000..e835207 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseWalletChangeController.java @@ -0,0 +1,127 @@ +package com.ruoyi.baseUser.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.baseUser.domain.ZcBaseWalletChange; +import com.ruoyi.baseUser.service.IZcBaseWalletChangeService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 钱包变更记录Controller + * + * @author ruoyi + * @date 2025-08-16 + */ +@Controller +@RequestMapping("/baseUser/walletChange") +public class ZcBaseWalletChangeController extends BaseController +{ + private String prefix = "baseUser/walletChange"; + + @Autowired + private IZcBaseWalletChangeService zcBaseWalletChangeService; + + @RequiresPermissions("baseUser:walletChange:view") + @GetMapping() + public String walletChange() + { + return prefix + "/walletChange"; + } + + /** + * 查询钱包变更记录列表 + */ + @RequiresPermissions("baseUser:walletChange:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ZcBaseWalletChange zcBaseWalletChange) + { + startPage(); + List list = zcBaseWalletChangeService.selectZcBaseWalletChangeList(zcBaseWalletChange); + return getDataTable(list); + } + + /** + * 导出钱包变更记录列表 + */ + @RequiresPermissions("baseUser:walletChange:export") + @Log(title = "钱包变更记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ZcBaseWalletChange zcBaseWalletChange) + { + List list = zcBaseWalletChangeService.selectZcBaseWalletChangeList(zcBaseWalletChange); + ExcelUtil util = new ExcelUtil(ZcBaseWalletChange.class); + return util.exportExcel(list, "钱包变更记录数据"); + } + + /** + * 新增钱包变更记录 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存钱包变更记录 + */ + @RequiresPermissions("baseUser:walletChange:add") + @Log(title = "钱包变更记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ZcBaseWalletChange zcBaseWalletChange) + { + return toAjax(zcBaseWalletChangeService.insertZcBaseWalletChange(zcBaseWalletChange)); + } + + /** + * 修改钱包变更记录 + */ + @RequiresPermissions("baseUser:walletChange:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + ZcBaseWalletChange zcBaseWalletChange = zcBaseWalletChangeService.selectZcBaseWalletChangeById(id); + mmap.put("zcBaseWalletChange", zcBaseWalletChange); + return prefix + "/edit"; + } + + /** + * 修改保存钱包变更记录 + */ + @RequiresPermissions("baseUser:walletChange:edit") + @Log(title = "钱包变更记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ZcBaseWalletChange zcBaseWalletChange) + { + return toAjax(zcBaseWalletChangeService.updateZcBaseWalletChange(zcBaseWalletChange)); + } + + /** + * 删除钱包变更记录 + */ + @RequiresPermissions("baseUser:walletChange:remove") + @Log(title = "钱包变更记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(zcBaseWalletChangeService.deleteZcBaseWalletChangeByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/domain/ZcBaseWalletChange.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/domain/ZcBaseWalletChange.java index 24af8b4..60eaed3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/domain/ZcBaseWalletChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/domain/ZcBaseWalletChange.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.data.annotation.Transient; /** * 钱包变更记录对象 zc_base_wallet_change @@ -22,15 +23,19 @@ public class ZcBaseWalletChange extends BaseEntity private Long id; /** 用户id */ - @Excel(name = "用户id") + private Long userId; + @Transient + @Excel(name = "用户") + private String userName; + /** 变更类型 */ - @Excel(name = "变更类型") + @Excel(name = "变更类型", dictType = "key_wallet_change_type") private String changeType; /** 支付类型 */ - @Excel(name = "支付类型") + @Excel(name = "支付类型", dictType = "key_wallet_pay_type") private String payType; /** 变更时间 */ @@ -72,7 +77,15 @@ public class ZcBaseWalletChange extends BaseEntity this.changeType = changeType; } - public String getChangeType() + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getChangeType() { return changeType; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletChangeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletChangeMapper.java new file mode 100644 index 0000000..afb30e8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletChangeMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.baseUser.mapper; + +import java.util.List; +import com.ruoyi.baseUser.domain.ZcBaseWalletChange; + +/** + * 钱包变更记录Mapper接口 + * + * @author ruoyi + * @date 2025-08-16 + */ +public interface ZcBaseWalletChangeMapper +{ + /** + * 查询钱包变更记录 + * + * @param id 钱包变更记录主键 + * @return 钱包变更记录 + */ + public ZcBaseWalletChange selectZcBaseWalletChangeById(Long id); + + /** + * 查询钱包变更记录列表 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 钱包变更记录集合 + */ + public List selectZcBaseWalletChangeList(ZcBaseWalletChange zcBaseWalletChange); + + /** + * 新增钱包变更记录 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 结果 + */ + public int insertZcBaseWalletChange(ZcBaseWalletChange zcBaseWalletChange); + + /** + * 修改钱包变更记录 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 结果 + */ + public int updateZcBaseWalletChange(ZcBaseWalletChange zcBaseWalletChange); + + /** + * 删除钱包变更记录 + * + * @param id 钱包变更记录主键 + * @return 结果 + */ + public int deleteZcBaseWalletChangeById(Long id); + + /** + * 批量删除钱包变更记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteZcBaseWalletChangeByIds(String[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletChangeService.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletChangeService.java new file mode 100644 index 0000000..ba279e0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletChangeService.java @@ -0,0 +1,61 @@ +package com.ruoyi.baseUser.service; + +import java.util.List; +import com.ruoyi.baseUser.domain.ZcBaseWalletChange; + +/** + * 钱包变更记录Service接口 + * + * @author ruoyi + * @date 2025-08-16 + */ +public interface IZcBaseWalletChangeService +{ + /** + * 查询钱包变更记录 + * + * @param id 钱包变更记录主键 + * @return 钱包变更记录 + */ + public ZcBaseWalletChange selectZcBaseWalletChangeById(Long id); + + /** + * 查询钱包变更记录列表 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 钱包变更记录集合 + */ + public List selectZcBaseWalletChangeList(ZcBaseWalletChange zcBaseWalletChange); + + /** + * 新增钱包变更记录 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 结果 + */ + public int insertZcBaseWalletChange(ZcBaseWalletChange zcBaseWalletChange); + + /** + * 修改钱包变更记录 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 结果 + */ + public int updateZcBaseWalletChange(ZcBaseWalletChange zcBaseWalletChange); + + /** + * 批量删除钱包变更记录 + * + * @param ids 需要删除的钱包变更记录主键集合 + * @return 结果 + */ + public int deleteZcBaseWalletChangeByIds(String ids); + + /** + * 删除钱包变更记录信息 + * + * @param id 钱包变更记录主键 + * @return 结果 + */ + public int deleteZcBaseWalletChangeById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletChangeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletChangeServiceImpl.java new file mode 100644 index 0000000..6948345 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletChangeServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.baseUser.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.baseUser.mapper.ZcBaseWalletChangeMapper; +import com.ruoyi.baseUser.domain.ZcBaseWalletChange; +import com.ruoyi.baseUser.service.IZcBaseWalletChangeService; +import com.ruoyi.common.core.text.Convert; + +/** + * 钱包变更记录Service业务层处理 + * + * @author ruoyi + * @date 2025-08-16 + */ +@Service +public class ZcBaseWalletChangeServiceImpl implements IZcBaseWalletChangeService +{ + @Autowired + private ZcBaseWalletChangeMapper zcBaseWalletChangeMapper; + + /** + * 查询钱包变更记录 + * + * @param id 钱包变更记录主键 + * @return 钱包变更记录 + */ + @Override + public ZcBaseWalletChange selectZcBaseWalletChangeById(Long id) + { + return zcBaseWalletChangeMapper.selectZcBaseWalletChangeById(id); + } + + /** + * 查询钱包变更记录列表 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 钱包变更记录 + */ + @Override + public List selectZcBaseWalletChangeList(ZcBaseWalletChange zcBaseWalletChange) + { + return zcBaseWalletChangeMapper.selectZcBaseWalletChangeList(zcBaseWalletChange); + } + + /** + * 新增钱包变更记录 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 结果 + */ + @Override + public int insertZcBaseWalletChange(ZcBaseWalletChange zcBaseWalletChange) + { + zcBaseWalletChange.setCreateTime(DateUtils.getNowDate()); + return zcBaseWalletChangeMapper.insertZcBaseWalletChange(zcBaseWalletChange); + } + + /** + * 修改钱包变更记录 + * + * @param zcBaseWalletChange 钱包变更记录 + * @return 结果 + */ + @Override + public int updateZcBaseWalletChange(ZcBaseWalletChange zcBaseWalletChange) + { + zcBaseWalletChange.setUpdateTime(DateUtils.getNowDate()); + return zcBaseWalletChangeMapper.updateZcBaseWalletChange(zcBaseWalletChange); + } + + /** + * 批量删除钱包变更记录 + * + * @param ids 需要删除的钱包变更记录主键 + * @return 结果 + */ + @Override + public int deleteZcBaseWalletChangeByIds(String ids) + { + return zcBaseWalletChangeMapper.deleteZcBaseWalletChangeByIds(Convert.toStrArray(ids)); + } + + /** + * 删除钱包变更记录信息 + * + * @param id 钱包变更记录主键 + * @return 结果 + */ + @Override + public int deleteZcBaseWalletChangeById(Long id) + { + return zcBaseWalletChangeMapper.deleteZcBaseWalletChangeById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderSubController.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderSubController.java index a9e6b30..1b26399 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderSubController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderSubController.java @@ -36,8 +36,9 @@ public class ZcOrderSubController extends BaseController @RequiresPermissions("orders:orderSub:view") @GetMapping() - public String orderSub() + public String orderSub(ModelMap mmap, ZcOrderSub zcOrderSub) { + mmap.put("zcOrderSub", zcOrderSub); return prefix + "/orderSub"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java index c3555d6..c5534ae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderSub.java @@ -22,15 +22,14 @@ public class ZcOrderSub extends BaseEntity private Long suborderId; /** 关联的订单ID（外键） */ - @Excel(name = "关联的订单ID", readConverterExp = "外=键") private Long orderId; /** 子订单编号 */ - @Excel(name = "子订单编号") + @Excel(name = "订单编号") private String suborderNo; /** 子订单类型（首租、续租、逾期、押金、租电等） */ - @Excel(name = "子订单类型", readConverterExp = "首=租、续租、逾期、押金、租电等") + @Excel(name = "订单类型", dictType = "key_order_suborder_type") private String suborderType; /** 订单金额 */ @@ -38,7 +37,7 @@ public class ZcOrderSub extends BaseEntity private BigDecimal amount; /** 支付方式 */ - @Excel(name = "支付方式") + @Excel(name = "支付方式",dictType = "key_order_payment_method") private String paymentMethod; /** 车架/电池编号 */ @@ -46,8 +45,8 @@ public class ZcOrderSub extends BaseEntity private String vinBatteryNo; /** 订单产生时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "订单产生时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "订单产生时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createdAt; /** 支付ID */ @@ -55,8 +54,8 @@ public class ZcOrderSub extends BaseEntity private String paymentId; /** 实际支付时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "实际支付时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "实际支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date paidAt; /** 删除标志（0代表存在 2代表删除） */ diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml new file mode 100644 index 0000000..252bac6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + select id, user_id, change_type, pay_type, change_time, change_amount, referral_order_no, del_flag, create_time, update_time from zc_base_wallet_change + + + + + + + + insert into zc_base_wallet_change + + user_id, + change_type, + pay_type, + change_time, + change_amount, + referral_order_no, + del_flag, + create_time, + update_time, + + + #{userId}, + #{changeType}, + #{payType}, + #{changeTime}, + #{changeAmount}, + #{referralOrderNo}, + #{delFlag}, + #{createTime}, + #{updateTime}, + + + + + update zc_base_wallet_change + + user_id = #{userId}, + change_type = #{changeType}, + pay_type = #{payType}, + change_time = #{changeTime}, + change_amount = #{changeAmount}, + referral_order_no = #{referralOrderNo}, + del_flag = #{delFlag}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from zc_base_wallet_change where id = #{id} + + + + delete from zc_base_wallet_change where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml index dc3d369..1d71d2c 100644 --- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml @@ -111,7 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.overdue_fee = #{overdueFee} and a.is_deposit_free = #{isDepositFree} and a.is_auto_deduct = #{isAutoDeduct} - and a.first_order_time = #{firstOrderTime} and a.start_rent_time = #{startRentTime} and a.overdue_days = #{overdueDays} and a.renewal_times = #{renewalTimes} @@ -121,6 +120,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.name = #{storeName} and zc.license_plate = #{licensePlate} + + and date_format(a.first_order_time,'%y%m%d') >= date_format(#{params.beginFirstOrderTime},'%y%m%d') + + + and date_format(a.first_order_time,'%y%m%d') <= date_format(#{params.endFirstOrderTime},'%y%m%d') + order by a.update_time desc diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml index a3938b9..4fdf0b7 100644 --- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderSubMapper.xml @@ -37,6 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and created_at = #{createdAt} and payment_id = #{paymentId} and paid_at = #{paidAt} + + and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + + + and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + diff --git a/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/add.html b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/add.html new file mode 100644 index 0000000..19b2952 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/add.html @@ -0,0 +1,66 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html new file mode 100644 index 0000000..88b3660 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/edit.html @@ -0,0 +1,61 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html new file mode 100644 index 0000000..44dd35f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/baseUser/walletChange/walletChange.html @@ -0,0 +1,114 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ +
+ + + + + + + + + + + + +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/orders/order/order.html b/ruoyi-admin/src/main/resources/templates/orders/order/order.html index 0fa8c1b..00c2158 100644 --- a/ruoyi-admin/src/main/resources/templates/orders/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/orders/order/order.html @@ -60,7 +60,12 @@ - +
  • + + + - + +
  •  搜索  重置 diff --git a/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html b/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html index 1ec9b88..ab95966 100644 --- a/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html +++ b/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html @@ -9,40 +9,37 @@
    + +
      + + + +
    • - - -
      • -
    • - +
      • -
    • - - -
      • -
    • - - -
      • -
    • - - -
      • + + + + + + + + +
      • -
    • - - +
    • + + + - +
      • -
    •  搜索  重置 @@ -76,6 +73,7 @@ var editFlag = [[${@permission.hasPermi('orders:orderSub:edit')}]]; var removeFlag = [[${@permission.hasPermi('orders:orderSub:remove')}]]; var suborderTypeDatas = [[${@dict.getType('key_order_suborder_type')}]]; + var paymentMethodDatas = [[${@dict.getType('key_order_payment_method')}]]; var prefix = ctx + "orders/orderSub"; $(function() { @@ -85,26 +83,17 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", - modalName: "租车子订单", + modalName: "租电订单", columns: [{ checkbox: true }, - { - field: 'suborderId', - title: '子订单', - visible: false - }, - { - field: 'orderId', - title: '订单号' - }, { field: 'suborderNo', - title: '子订单编号' + title: '订单编号' }, { field: 'suborderType', - title: '子订单类型', + title: '订单类型', formatter: function(value, row, index) { return $.table.selectDictLabel(suborderTypeDatas, value); } @@ -115,7 +104,10 @@ }, { field: 'paymentMethod', - title: '支付方式' + title: '支付方式', + formatter: function(value, row, index) { + return $.table.selectDictLabel(paymentMethodDatas, value); + } }, { field: 'vinBatteryNo', @@ -134,14 +126,14 @@ title: '实际支付时间' }, { - title: '操作', + field: 'createTime', align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); - } + title: '创建时间' + }, + { + field: 'updateTime', + align: 'center', + title: '更新时间' }] }; $.table.init(options);