From 6bd15e4627d078d9c881e878d5ee2e7fd69bf8a3 Mon Sep 17 00:00:00 2001 From: 19173159168 Date: Sun, 24 Aug 2025 15:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E9=92=B1=E5=8C=85=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZcBaseWalletChangeController.java | 46 +++- .../baseUser/domain/ZcBaseWalletChange.java | 45 +++- .../mapper/ZcBaseWalletChangeMapper.java | 3 + .../baseUser/mapper/ZcBaseWalletMapper.java | 12 + .../service/IZcBaseWalletChangeService.java | 8 + .../service/IZcBaseWalletService.java | 4 + .../impl/ZcBaseWalletChangeServiceImpl.java | 32 +++ .../service/impl/ZcBaseWalletServiceImpl.java | 6 + .../service/impl/CompanyStoreServiceImpl.java | 21 +- .../service/impl/ZcCarModelServiceImpl.java | 1 + .../service/impl/ZcCarServiceImpl.java | 2 + .../impl/ZcRentCarRuleServiceImpl.java | 2 + .../com/ruoyi/orders/domain/ZcOrderMain.java | 11 + .../baseUser/ZcBaseWalletChangeMapper.xml | 46 +++- .../mapper/baseUser/ZcBaseWalletMapper.xml | 15 +- .../mapper/orders/ZcOrderMainMapper.xml | 9 +- .../templates/baseUser/wallet/edit.html | 22 +- .../templates/baseUser/wallet/wallet.html | 2 +- .../templates/baseUser/walletChange/edit.html | 22 +- .../baseUser/walletChange/walletChange.html | 225 ++++++++++++++++-- .../templates/operation/store/add.html | 2 +- .../templates/operation/store/edit.html | 2 +- 22 files changed, 470 insertions(+), 68 deletions(-) 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 index e835207..1e77dc2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseWalletChangeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseWalletChangeController.java @@ -1,6 +1,10 @@ package com.ruoyi.baseUser.controller; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.framework.shiro.service.SysPasswordService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -33,11 +37,14 @@ public class ZcBaseWalletChangeController extends BaseController @Autowired private IZcBaseWalletChangeService zcBaseWalletChangeService; + @Autowired + private SysPasswordService passwordService; @RequiresPermissions("baseUser:walletChange:view") @GetMapping() - public String walletChange() + public String walletChange(ModelMap mmap, ZcBaseWalletChange zcBaseWalletChange) { + mmap.put("zcBaseWalletChange", zcBaseWalletChange); return prefix + "/walletChange"; } @@ -124,4 +131,41 @@ public class ZcBaseWalletChangeController extends BaseController { return toAjax(zcBaseWalletChangeService.deleteZcBaseWalletChangeByIds(ids)); } + + @PostMapping("/verifyPassword") + @ResponseBody + public AjaxResult verifyPassword(String password) { + // 获取当前登录用户 + SysUser currentUser = ShiroUtils.getSysUser(); + + // 验证密码是否正确 + if (passwordService.matches(currentUser, password)) { + return AjaxResult.success(); + } else { + return AjaxResult.error("密码验证失败"); + } + } + + @PostMapping("/passWithdrawal") + @ResponseBody + public AjaxResult passWithdrawal(Long id) { + // 执行审核通过的业务逻辑 + ZcBaseWalletChange change = new ZcBaseWalletChange(); + change.setId(id); + change.setChangeStatus(ZcBaseWalletChange.PASS); + zcBaseWalletChangeService.review(change); + return AjaxResult.success("审核通过成功"); + } + + @PostMapping("/rejectWithdrawal") + @ResponseBody + public AjaxResult rejectWithdrawal(Long id, String rejectReason) { + // 执行审核不通过的业务逻辑 + ZcBaseWalletChange change = new ZcBaseWalletChange(); + change.setId(id); + change.setChangeStatus(ZcBaseWalletChange.REFUSE); + zcBaseWalletChangeService.review(change); + return AjaxResult.success("审核不通过操作成功"); + } + } 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 60eaed3..667a7ef 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 @@ -3,6 +3,7 @@ package com.ruoyi.baseUser.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.operation.domain.CompanyStore; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -27,13 +28,15 @@ public class ZcBaseWalletChange extends BaseEntity private Long userId; @Transient - @Excel(name = "用户") + @Excel(name = "门店名称") private String userName; /** 变更类型 */ @Excel(name = "变更类型", dictType = "key_wallet_change_type") private String changeType; - + /** 审核状态 */ + @Excel(name = "审核状态", dictType = "key_wallet_change_status") + private String changeStatus; /** 支付类型 */ @Excel(name = "支付类型", dictType = "key_wallet_pay_type") private String payType; @@ -54,6 +57,20 @@ public class ZcBaseWalletChange extends BaseEntity /** 删除标志（0代表存在 2代表删除） */ private String delFlag; + @Transient + private CompanyStore companyStore; + + @Transient + private String password; + + /** 待审核 */ + public final static String UNREVIEWED = "UNREVIEWED"; + /** 审核通过 */ + public final static String PASS = "PASS"; + /** 审核拒绝 */ + public final static String REFUSE = "REFUSE"; + + public void setId(Long id) { this.id = id; @@ -135,6 +152,30 @@ public class ZcBaseWalletChange extends BaseEntity return delFlag; } + public String getChangeStatus() { + return changeStatus; + } + + public void setChangeStatus(String changeStatus) { + this.changeStatus = changeStatus; + } + + public CompanyStore getCompanyStore() { + return companyStore; + } + + public void setCompanyStore(CompanyStore companyStore) { + this.companyStore = companyStore; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 index afb30e8..045b70c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletChangeMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletChangeMapper.java @@ -58,4 +58,7 @@ public interface ZcBaseWalletChangeMapper * @return 结果 */ public int deleteZcBaseWalletChangeByIds(String[] ids); + + public int review(ZcBaseWalletChange zcBaseWalletChange); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletMapper.java index 9157696..56906be 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/mapper/ZcBaseWalletMapper.java @@ -1,8 +1,10 @@ package com.ruoyi.baseUser.mapper; +import java.math.BigDecimal; import java.util.List; import com.ruoyi.baseUser.domain.ZcBaseWallet; import com.ruoyi.baseUser.domain.ZcBaseWalletChange; +import org.apache.ibatis.annotations.Param; /** * 钱包信息Mapper接口 @@ -84,4 +86,14 @@ public interface ZcBaseWalletMapper * @return 结果 */ public int deleteZcBaseWalletChangeByUserId(Long userId); + + /** + * 更新钱包金额（减少可用金额和余额） + * @param userId 用户ID + * @param amount 提现金额 + * @return 更新记录数 + */ + public int reduceWalletAmount(@Param("userId") Long userId, @Param("amount") BigDecimal amount); + + } 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 index ba279e0..2a5e3ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletChangeService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletChangeService.java @@ -58,4 +58,12 @@ public interface IZcBaseWalletChangeService * @return 结果 */ public int deleteZcBaseWalletChangeById(Long id); + + /** + * 钱包变更记录审核 + * @param zcBaseWalletChange + * @return + */ + public int review(ZcBaseWalletChange zcBaseWalletChange); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletService.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletService.java index c6871e7..7385120 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseWalletService.java @@ -1,7 +1,9 @@ package com.ruoyi.baseUser.service; +import java.math.BigDecimal; import java.util.List; import com.ruoyi.baseUser.domain.ZcBaseWallet; +import org.apache.ibatis.annotations.Param; /** * 钱包信息Service接口 @@ -58,4 +60,6 @@ public interface IZcBaseWalletService * @return 结果 */ public int deleteZcBaseWalletByUserId(Long userId); + + public int reduceWalletAmount(Long userId, BigDecimal amount); } 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 index 6948345..4c29968 100644 --- 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 @@ -1,6 +1,8 @@ package com.ruoyi.baseUser.service.impl; import java.util.List; + +import com.ruoyi.baseUser.service.IZcBaseWalletService; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -8,6 +10,7 @@ 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; +import org.springframework.transaction.annotation.Transactional; /** * 钱包变更记录Service业务层处理 @@ -21,6 +24,8 @@ public class ZcBaseWalletChangeServiceImpl implements IZcBaseWalletChangeService @Autowired private ZcBaseWalletChangeMapper zcBaseWalletChangeMapper; + @Autowired + private IZcBaseWalletService zcBaseWalletService; /** * 查询钱包变更记录 * @@ -94,4 +99,31 @@ public class ZcBaseWalletChangeServiceImpl implements IZcBaseWalletChangeService { return zcBaseWalletChangeMapper.deleteZcBaseWalletChangeById(id); } + + @Transactional + @Override + public int review(ZcBaseWalletChange zcBaseWalletChange) { + // 1. 获取提现记录 + ZcBaseWalletChange walletChange = zcBaseWalletChangeMapper.selectZcBaseWalletChangeById(zcBaseWalletChange.getId()); + if (walletChange == null) { + throw new RuntimeException("提现记录不存在"); + } + if (!ZcBaseWalletChange.UNREVIEWED.equals(walletChange.getChangeStatus())) { + throw new RuntimeException("提现记录状态异常"); + } + zcBaseWalletChange.setUpdateTime(DateUtils.getNowDate()); + int flag = zcBaseWalletChangeMapper.review(zcBaseWalletChange); + if(flag > 0 && ZcBaseWalletChange.PASS.equals(zcBaseWalletChange.getChangeStatus())){ + // 更新钱包金额（减少可用金额和余额） + flag = zcBaseWalletService.reduceWalletAmount( + walletChange.getUserId(), + walletChange.getChangeAmount() + ); + + if (flag == 0) { + throw new RuntimeException("钱包余额不足，无法完成提现"); + } + } + return flag; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletServiceImpl.java index 9e65d8d..f0dcffc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseWalletServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.baseUser.service.impl; +import java.math.BigDecimal; import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -109,6 +110,11 @@ public class ZcBaseWalletServiceImpl implements IZcBaseWalletService return zcBaseWalletMapper.deleteZcBaseWalletByUserId(userId); } + @Override + public int reduceWalletAmount(Long userId, BigDecimal amount) { + return zcBaseWalletMapper.reduceWalletAmount(userId, amount); + } + /** * 新增钱包变更记录信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java index 1df0f6e..5b3773a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.operation.service.impl; import java.util.List; + +import com.ruoyi.baseUser.domain.ZcBaseWallet; +import com.ruoyi.baseUser.service.IZcBaseWalletService; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysAreaHn; @@ -11,6 +14,7 @@ import com.ruoyi.operation.mapper.CompanyStoreMapper; import com.ruoyi.operation.domain.CompanyStore; import com.ruoyi.operation.service.ICompanyStoreService; import com.ruoyi.common.core.text.Convert; +import org.springframework.transaction.annotation.Transactional; /** * 门店Service业务层处理 @@ -25,6 +29,9 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService private CompanyStoreMapper companyStoreMapper; @Autowired private ISysAreaHnService sysAreaHnService; + @Autowired + private IZcBaseWalletService zcBaseWalletService; + /** * 查询门店 * @@ -73,6 +80,7 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService * @param companyStore 门店 * @return 结果 */ + @Transactional @Override public int insertCompanyStore(CompanyStore companyStore) { @@ -81,7 +89,18 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService companyStore.setStatus("0"); setAreaInfo(companyStore); - return companyStoreMapper.insertCompanyStore(companyStore); + int flag = companyStoreMapper.insertCompanyStore(companyStore); + if(flag > 0){ + // 同步创建门店钱包 + ZcBaseWallet newZcBaseWallet = new ZcBaseWallet(); + newZcBaseWallet.setUserId(companyStore.getId()); + newZcBaseWallet.setUserName(companyStore.getName()); + newZcBaseWallet.setPhoneNumber(companyStore.getPhone()); + newZcBaseWallet.setCreateTime(DateUtils.getNowDate()); + zcBaseWalletService.insertZcBaseWallet(newZcBaseWallet); + } + return flag; + } private void setAreaInfo(CompanyStore companyStore){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarModelServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarModelServiceImpl.java index 9c98d49..3da38cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarModelServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarModelServiceImpl.java @@ -65,6 +65,7 @@ public class ZcCarModelServiceImpl implements IZcCarModelService return zcCarModelMapper.selectZcCarModelList(zcCarModel); } + @Transactional @Override public List selectCarModelListByCarRuleId(Long rentCarRuleId) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java index b218f36..67eba00 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcCarServiceImpl.java @@ -25,6 +25,7 @@ import com.ruoyi.operation.mapper.ZcCarMapper; import com.ruoyi.operation.domain.ZcCar; import com.ruoyi.operation.service.IZcCarService; import com.ruoyi.common.core.text.Convert; +import org.springframework.transaction.annotation.Transactional; import javax.validation.Validator; @@ -140,6 +141,7 @@ public class ZcCarServiceImpl implements IZcCarService return zcCarMapper.updateZcCar(zcCar); } + @Transactional @Override public String importCar(List carList, Boolean isUpdateSupport, SysUser user) { if (StringUtils.isNull(carList) || carList.size() == 0) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcRentCarRuleServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcRentCarRuleServiceImpl.java index 0cc910d..9755493 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcRentCarRuleServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/ZcRentCarRuleServiceImpl.java @@ -16,6 +16,7 @@ import com.ruoyi.operation.mapper.ZcRentCarRuleMapper; import com.ruoyi.operation.domain.ZcRentCarRule; import com.ruoyi.operation.service.IZcRentCarRuleService; import com.ruoyi.common.core.text.Convert; +import org.springframework.transaction.annotation.Transactional; /** * 租车计费规则Service业务层处理 @@ -97,6 +98,7 @@ public class ZcRentCarRuleServiceImpl implements IZcRentCarRuleService * @param zcRentCarRule 租车计费规则 * @return 结果 */ + @Transactional @Override public int updateZcRentCarRule(List carModelIds,ZcRentCarRule zcRentCarRule) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java index 6038bfc..b1e1864 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java @@ -164,6 +164,9 @@ public class ZcOrderMain extends BaseEntity /** 删除标志（0代表存在 2代表删除） */ private String delFlag; + /** 订单是否已分成 */ + private Integer distribed; + /** 租车子订单信息 */ private List zcOrderSubList; @@ -525,6 +528,14 @@ public class ZcOrderMain extends BaseEntity this.zcOrderCarImgList = zcOrderCarImgList; } + public Integer getDistribed() { + return distribed; + } + + public void setDistribed(Integer distribed) { + this.distribed = distribed; + } + @Override public String toString() { return new ToStringBuilder(this) diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml index 252bac6..4731db5 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletChangeMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,31 +17,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + - 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 + select a.id, a.user_id, a.change_type, a.change_status, a.pay_type, a.change_time, a.change_amount, a.referral_order_no, a.del_flag, a.create_time, a.update_time, + s.id as store_id, + s.name as store_name, + s.contact_person as store_contact_person, + s.phone as store_phone, + s.operating_nature as store_operating_nature, + s.zuche_ratio as store_zuche_ratio, + s.zudian_ratio as store_zudian_ratio, + s.daishou_ratio as store_daishou_ratio, + s.store_number as store_store_number + from zc_base_wallet_change a + left join zc_company_store s on a.user_id = s.id @@ -74,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_id = #{userId}, change_type = #{changeType}, + change_status = #{changeStatus}, pay_type = #{payType}, change_time = #{changeTime}, change_amount = #{changeAmount}, @@ -84,6 +108,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update zc_base_wallet_change + + change_status = #{changeStatus}, + update_time = #{updateTime}, + + where id = #{id} + delete from zc_base_wallet_change where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml index c0d7f96..c7a7976 100644 --- a/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/baseUser/ZcBaseWalletMapper.xml @@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select a.order_id, a.order_no, a.order_status, a.operator_id, a.store_id, a.vehicle_id, a.car_model_id, a.customer_id, a.customer_name, a.customer_phone, a.battery_type, a.rental_type, a.rental_days, a.rental_price, a.deposit_price, a.overdue_fee, a.overdue_type, a.is_deposit_free, a.is_auto_deduct, a.first_order_time, a.pick_car_time, a.start_rent_time, a.end_rent_time, a.req_end_rent_time, a.act_end_rent_time, a.overdue_days, a.renewal_times, a.charge_times, a.rent_car_rule_id, a.rent_battey_rule_id, a.damage_amount,a.damage_desc, a.order_amount, a.overdue_amount, a.end_order_time, a.del_flag, a.create_time, a.update_time, + select a.order_id, a.order_no, a.order_status, a.operator_id, a.store_id, a.vehicle_id, a.car_model_id, a.customer_id, a.customer_name, a.customer_phone, a.battery_type, a.rental_type, a.rental_days, a.rental_price, a.deposit_price, a.overdue_fee, a.overdue_type, a.is_deposit_free, a.is_auto_deduct, a.first_order_time, a.pick_car_time, a.start_rent_time, a.end_rent_time, a.req_end_rent_time, a.act_end_rent_time, a.overdue_days, a.renewal_times, a.charge_times, a.rent_car_rule_id, a.rent_battey_rule_id, a.damage_amount,a.damage_desc, a.order_amount, a.overdue_amount, a.end_order_time,a.distribed, a.del_flag, a.create_time, a.update_time, c.company_name as operator_name,s.name as store_name,zc.license_plate as license_plate from zc_order_main a left join zc_company c on c.id = a.operator_id @@ -133,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- +
@@ -60,7 +60,7 @@ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/add.html b/ruoyi-admin/src/main/resources/templates/operation/store/add.html index 19e60c9..4a3f1b4 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/add.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/add.html @@ -48,7 +48,7 @@
- diff --git a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html index 1420e75..9634d74 100644 --- a/ruoyi-admin/src/main/resources/templates/operation/store/edit.html +++ b/ruoyi-admin/src/main/resources/templates/operation/store/edit.html @@ -49,7 +49,7 @@
-