From 5552778829a3ae48c2114ed5dd6600c28588bf5c Mon Sep 17 00:00:00 2001 From: 19173159168 Date: Sat, 23 Aug 2025 17:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E6=B6=A6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ZcOrderDistribController.java | 153 +++++++++ .../ruoyi/orders/domain/ZcOrderDistrib.java | 172 ++++++++++ .../com/ruoyi/orders/domain/ZcOrderSub.java | 32 ++ .../orders/mapper/ZcOrderDistribMapper.java | 70 +++++ .../service/IZcOrderDistribService.java | 71 +++++ .../impl/ZcOrderDistribServiceImpl.java | 104 +++++++ .../mapper/orders/ZcOrderDistribMapper.xml | 203 ++++++++++++ .../mapper/orders/ZcOrderMainMapper.xml | 6 +- .../mapper/orders/ZcOrderSubMapper.xml | 8 +- .../templates/orders/distrib/add.html | 73 +++++ .../templates/orders/distrib/distrib.html | 294 ++++++++++++++++++ .../templates/orders/distrib/edit.html | 68 ++++ .../templates/orders/order/edit.html | 13 +- .../templates/orders/orderSub/orderSub.html | 12 +- 14 files changed, 1273 insertions(+), 6 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderDistribController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderDistrib.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderDistribMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderDistribService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderDistribServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/orders/distrib/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/orders/distrib/distrib.html create mode 100644 ruoyi-admin/src/main/resources/templates/orders/distrib/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderDistribController.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderDistribController.java new file mode 100644 index 0000000..de08031 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderDistribController.java @@ -0,0 +1,153 @@ +package com.ruoyi.orders.controller; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.common.constant.UserConstants; +import com.ruoyi.operation.domain.Company; +import com.ruoyi.operation.service.ICompanyService; +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.orders.domain.ZcOrderDistrib; +import com.ruoyi.orders.service.IZcOrderDistribService; +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-20 + */ +@Controller +@RequestMapping("/orders/distrib") +public class ZcOrderDistribController extends BaseController +{ + private String prefix = "orders/distrib"; + + @Autowired + private IZcOrderDistribService zcOrderDistribService; + @Autowired + private ICompanyService companyService; + + @RequiresPermissions("orders:distrib:view") + @GetMapping() + public String distrib(ModelMap mmap, ZcOrderDistrib zcOrderDistrib) + { + List companyList = companyService.getCompanyList(new Company(),getSysUser()); // 获取运营商列表 + mmap.put("companyList", companyList); // 将运营商列表传递到前端 + mmap.put("zcOrderDistrib", zcOrderDistrib); + return prefix + "/distrib"; + } + + /** + * 查询订单分成统计列表 + */ + @RequiresPermissions("orders:distrib:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ZcOrderDistrib zcOrderDistrib) + { + startPage(); + // 运营者账号，只能查询所属商户数据 + if(UserConstants.USER_TYPE_02 .equals(getSysUser().getUserType())){ + zcOrderDistrib.setCompanyId(getSysUser().getGroupId()); + } + + List list = zcOrderDistribService.selectZcOrderDistribList(zcOrderDistrib); + return getDataTable(list); + } + + @PostMapping("/summary") + @ResponseBody + public Map getSummaryStats(ZcOrderDistrib zcOrderDistrib) { + Map summary = zcOrderDistribService.getSummaryStats(zcOrderDistrib); + return summary; + } + + /** + * 导出订单分成统计列表 + */ + @RequiresPermissions("orders:distrib:export") + @Log(title = "订单分成统计", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ZcOrderDistrib zcOrderDistrib) + { + // 运营者账号，只能查询所属商户数据 + if(UserConstants.USER_TYPE_02 .equals(getSysUser().getUserType())){ + zcOrderDistrib.setCompanyId(getSysUser().getGroupId()); + } + List list = zcOrderDistribService.selectZcOrderDistribList(zcOrderDistrib); + ExcelUtil util = new ExcelUtil(ZcOrderDistrib.class); + return util.exportExcel(list, "订单分成统计数据"); + } + + /** + * 新增订单分成统计 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存订单分成统计 + */ + @RequiresPermissions("orders:distrib:add") + @Log(title = "订单分成统计", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ZcOrderDistrib zcOrderDistrib) + { + return toAjax(zcOrderDistribService.insertZcOrderDistrib(zcOrderDistrib)); + } + + /** + * 修改订单分成统计 + */ + @RequiresPermissions("orders:distrib:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + ZcOrderDistrib zcOrderDistrib = zcOrderDistribService.selectZcOrderDistribById(id); + mmap.put("zcOrderDistrib", zcOrderDistrib); + return prefix + "/edit"; + } + + /** + * 修改保存订单分成统计 + */ + @RequiresPermissions("orders:distrib:edit") + @Log(title = "订单分成统计", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ZcOrderDistrib zcOrderDistrib) + { + return toAjax(zcOrderDistribService.updateZcOrderDistrib(zcOrderDistrib)); + } + + /** + * 删除订单分成统计 + */ + @RequiresPermissions("orders:distrib:remove") + @Log(title = "订单分成统计", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(zcOrderDistribService.deleteZcOrderDistribByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderDistrib.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderDistrib.java new file mode 100644 index 0000000..a57e046 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderDistrib.java @@ -0,0 +1,172 @@ +package com.ruoyi.orders.domain; + +import java.math.BigDecimal; +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_order_distrib + * + * @author ruoyi + * @date 2025-08-20 + */ +public class ZcOrderDistrib extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID（主键） */ + private Long id; + + /** 关联的订单ID（外键） */ + @Excel(name = "关联的订单ID", readConverterExp = "外=键") + private Long orderId; + + /** 订单编号 */ + @Excel(name = "订单编号") + private String orderNo; + + /** 运营商id */ + private Long companyId; + + /** 门店 */ + private Long storeId; + + + /** 引荐人id */ + private Long referralUserId; + + /** 分配类型:company运营商，store门店，referral推荐人，platform平台 */ + private String distribType; + + /** 分配比例 */ + private BigDecimal distribRate; + + /** 分配金额 */ + private BigDecimal distribAmount; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + @Transient + private ZcOrderMain zcOrderMain; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setOrderId(Long orderId) + { + this.orderId = orderId; + } + + public Long getOrderId() + { + return orderId; + } + public void setOrderNo(String orderNo) + { + this.orderNo = orderNo; + } + + public String getOrderNo() + { + return orderNo; + } + public void setCompanyId(Long companyId) + { + this.companyId = companyId; + } + + public Long getCompanyId() + { + return companyId; + } + public void setStoreId(Long storeId) + { + this.storeId = storeId; + } + + public Long getStoreId() + { + return storeId; + } + public void setReferralUserId(Long referralUserId) + { + this.referralUserId = referralUserId; + } + + public Long getReferralUserId() + { + return referralUserId; + } + public void setDistribType(String distribType) + { + this.distribType = distribType; + } + + public String getDistribType() + { + return distribType; + } + public void setDistribRate(BigDecimal distribRate) + { + this.distribRate = distribRate; + } + + public BigDecimal getDistribRate() + { + return distribRate; + } + public void setDistribAmount(BigDecimal distribAmount) + { + this.distribAmount = distribAmount; + } + + public BigDecimal getDistribAmount() + { + return distribAmount; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + public ZcOrderMain getZcOrderMain() { + return zcOrderMain; + } + + public void setZcOrderMain(ZcOrderMain zcOrderMain) { + this.zcOrderMain = zcOrderMain; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orderId", getOrderId()) + .append("orderNo", getOrderNo()) + .append("companyId", getCompanyId()) + .append("storeId", getStoreId()) + .append("referralUserId", getReferralUserId()) + .append("distribType", getDistribType()) + .append("distribRate", getDistribRate()) + .append("distribAmount", getDistribAmount()) + .append("delFlag", getDelFlag()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} 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 c5534ae..a020a9d 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 @@ -61,6 +61,14 @@ public class ZcOrderSub extends BaseEntity /** 删除标志（0代表存在 2代表删除） */ private String delFlag; + @Excel(name = "支付状态") + private String payStatus; + /**平台支付流水号*/ + @Excel(name = "平台支付流水号") + private String transactionId; + + private Long bOrderId; + public void setSuborderId(Long suborderId) { this.suborderId = suborderId; @@ -161,6 +169,30 @@ public class ZcOrderSub extends BaseEntity return delFlag; } + public String getPayStatus() { + return payStatus; + } + + public void setPayStatus(String payStatus) { + this.payStatus = payStatus; + } + + public String getTransactionId() { + return transactionId; + } + + public void setTransactionId(String transactionId) { + this.transactionId = transactionId; + } + + public Long getbOrderId() { + return bOrderId; + } + + public void setbOrderId(Long bOrderId) { + this.bOrderId = bOrderId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderDistribMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderDistribMapper.java new file mode 100644 index 0000000..2bbe03a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderDistribMapper.java @@ -0,0 +1,70 @@ +package com.ruoyi.orders.mapper; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.orders.domain.ZcOrderDistrib; + +/** + * 订单分成统计Mapper接口 + * + * @author ruoyi + * @date 2025-08-20 + */ +public interface ZcOrderDistribMapper +{ + /** + * 查询订单分成统计 + * + * @param id 订单分成统计主键 + * @return 订单分成统计 + */ + public ZcOrderDistrib selectZcOrderDistribById(Long id); + + /** + * 查询订单分成统计列表 + * + * @param zcOrderDistrib 订单分成统计 + * @return 订单分成统计集合 + */ + public List selectZcOrderDistribList(ZcOrderDistrib zcOrderDistrib); + + /** + * 查询汇总统计信息 + * @param zcOrderDistrib 查询条件 + * @return 汇总统计结果 + */ + Map selectZcOrderDistribSummary(ZcOrderDistrib zcOrderDistrib); + + /** + * 新增订单分成统计 + * + * @param zcOrderDistrib 订单分成统计 + * @return 结果 + */ + public int insertZcOrderDistrib(ZcOrderDistrib zcOrderDistrib); + + /** + * 修改订单分成统计 + * + * @param zcOrderDistrib 订单分成统计 + * @return 结果 + */ + public int updateZcOrderDistrib(ZcOrderDistrib zcOrderDistrib); + + /** + * 删除订单分成统计 + * + * @param id 订单分成统计主键 + * @return 结果 + */ + public int deleteZcOrderDistribById(Long id); + + /** + * 批量删除订单分成统计 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteZcOrderDistribByIds(String[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderDistribService.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderDistribService.java new file mode 100644 index 0000000..d81147a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderDistribService.java @@ -0,0 +1,71 @@ +package com.ruoyi.orders.service; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.orders.domain.ZcOrderDistrib; + +/** + * 订单分成统计Service接口 + * + * @author ruoyi + * @date 2025-08-20 + */ +public interface IZcOrderDistribService +{ + /** + * 查询订单分成统计 + * + * @param id 订单分成统计主键 + * @return 订单分成统计 + */ + public ZcOrderDistrib selectZcOrderDistribById(Long id); + + /** + * 查询订单分成统计列表 + * + * @param zcOrderDistrib 订单分成统计 + * @return 订单分成统计集合 + */ + public List selectZcOrderDistribList(ZcOrderDistrib zcOrderDistrib); + + /** + * 获取汇总统计信息 + * @param zcOrderDistrib 查询条件 + * @return 汇总统计结果 + */ + Map getSummaryStats(ZcOrderDistrib zcOrderDistrib); + + + /** + * 新增订单分成统计 + * + * @param zcOrderDistrib 订单分成统计 + * @return 结果 + */ + public int insertZcOrderDistrib(ZcOrderDistrib zcOrderDistrib); + + /** + * 修改订单分成统计 + * + * @param zcOrderDistrib 订单分成统计 + * @return 结果 + */ + public int updateZcOrderDistrib(ZcOrderDistrib zcOrderDistrib); + + /** + * 批量删除订单分成统计 + * + * @param ids 需要删除的订单分成统计主键集合 + * @return 结果 + */ + public int deleteZcOrderDistribByIds(String ids); + + /** + * 删除订单分成统计信息 + * + * @param id 订单分成统计主键 + * @return 结果 + */ + public int deleteZcOrderDistribById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderDistribServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderDistribServiceImpl.java new file mode 100644 index 0000000..a627a0b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderDistribServiceImpl.java @@ -0,0 +1,104 @@ +package com.ruoyi.orders.service.impl; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.orders.mapper.ZcOrderDistribMapper; +import com.ruoyi.orders.domain.ZcOrderDistrib; +import com.ruoyi.orders.service.IZcOrderDistribService; +import com.ruoyi.common.core.text.Convert; + +/** + * 订单分成统计Service业务层处理 + * + * @author ruoyi + * @date 2025-08-20 + */ +@Service +public class ZcOrderDistribServiceImpl implements IZcOrderDistribService +{ + @Autowired + private ZcOrderDistribMapper zcOrderDistribMapper; + + /** + * 查询订单分成统计 + * + * @param id 订单分成统计主键 + * @return 订单分成统计 + */ + @Override + public ZcOrderDistrib selectZcOrderDistribById(Long id) + { + return zcOrderDistribMapper.selectZcOrderDistribById(id); + } + + /** + * 查询订单分成统计列表 + * + * @param zcOrderDistrib 订单分成统计 + * @return 订单分成统计 + */ + @Override + public List selectZcOrderDistribList(ZcOrderDistrib zcOrderDistrib) + { + return zcOrderDistribMapper.selectZcOrderDistribList(zcOrderDistrib); + } + + @Override + public Map getSummaryStats(ZcOrderDistrib zcOrderDistrib) { + return zcOrderDistribMapper.selectZcOrderDistribSummary(zcOrderDistrib); + } + + /** + * 新增订单分成统计 + * + * @param zcOrderDistrib 订单分成统计 + * @return 结果 + */ + @Override + public int insertZcOrderDistrib(ZcOrderDistrib zcOrderDistrib) + { + zcOrderDistrib.setCreateTime(DateUtils.getNowDate()); + return zcOrderDistribMapper.insertZcOrderDistrib(zcOrderDistrib); + } + + /** + * 修改订单分成统计 + * + * @param zcOrderDistrib 订单分成统计 + * @return 结果 + */ + @Override + public int updateZcOrderDistrib(ZcOrderDistrib zcOrderDistrib) + { + zcOrderDistrib.setUpdateTime(DateUtils.getNowDate()); + return zcOrderDistribMapper.updateZcOrderDistrib(zcOrderDistrib); + } + + /** + * 批量删除订单分成统计 + * + * @param ids 需要删除的订单分成统计主键 + * @return 结果 + */ + @Override + public int deleteZcOrderDistribByIds(String ids) + { + return zcOrderDistribMapper.deleteZcOrderDistribByIds(Convert.toStrArray(ids)); + } + + /** + * 删除订单分成统计信息 + * + * @param id 订单分成统计主键 + * @return 结果 + */ + @Override + public int deleteZcOrderDistribById(Long id) + { + return zcOrderDistribMapper.deleteZcOrderDistribById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml new file mode 100644 index 0000000..dfe1602 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderDistribMapper.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select a.id, a.order_id, a.order_no, a.company_id, a.store_id, a.referral_user_id, a.distrib_type, a.distrib_rate, a.distrib_amount, a.del_flag, a.create_time, a.update_time, + b.order_status as main_order_status, b.vehicle_id as main_vehicle_id, b.car_model_id as main_car_model_id, b.customer_id as main_customer_id, b.customer_name as main_customer_name, b.customer_phone as main_customer_phone, + b.battery_type as main_battery_type, b.rental_type as main_rental_type, b.rental_days as main_rental_days, b.rental_price as main_rental_price, b.deposit_price as main_deposit_price, b.overdue_fee as main_overdue_fee, + b.overdue_type as main_overdue_type, b.is_deposit_free as main_is_deposit_free, b.is_auto_deduct as main_is_auto_deduct, b.first_order_time as main_first_order_time, b.pick_car_time as main_pick_car_time, b.start_rent_time as main_start_rent_time, + b.end_rent_time as main_end_rent_time, b.req_end_rent_time as main_req_end_rent_time, b.act_end_rent_time as main_act_end_rent_time, b.overdue_days as main_overdue_days, b.renewal_times as main_renewal_times, b.charge_times as main_charge_times, + b.rent_car_rule_id as main_rent_car_rule_id, b.rent_battey_rule_id as main_rent_battey_rule_id, b.damage_amount as main_damage_amount,b.damage_desc as main_damage_desc, b.order_amount as main_order_amount, b.overdue_amount as main_overdue_amount, + b.end_order_time as main_end_order_time, b.create_time as main_create_time, b.update_time as main_update_time , + c.company_name as main_operator_name, + s.name as main_store_name, + zc.license_plate as main_license_plate + from zc_order_distrib a + left join zc_order_main b on a.order_id = b.order_id + left join zc_company c on c.id = a.company_id + left join zc_company_store s on s.id = a.store_id + left join zc_car zc on zc.id = b.vehicle_id + + + + + + + + + + + + + insert into zc_order_distrib + + order_id, + order_no, + company_id, + store_id, + referral_user_id, + distrib_type, + distrib_rate, + distrib_amount, + del_flag, + create_time, + update_time, + + + #{orderId}, + #{orderNo}, + #{companyId}, + #{storeId}, + #{referralUserId}, + #{distribType}, + #{distribRate}, + #{distribAmount}, + #{delFlag}, + #{createTime}, + #{updateTime}, + + + + + update zc_order_distrib + + order_id = #{orderId}, + order_no = #{orderNo}, + company_id = #{companyId}, + store_id = #{storeId}, + referral_user_id = #{referralUserId}, + distrib_type = #{distribType}, + distrib_rate = #{distribRate}, + distrib_amount = #{distribAmount}, + del_flag = #{delFlag}, + create_time = #{createTime}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from zc_order_distrib where id = #{id} + + + + delete from zc_order_distrib 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 1d71d2c..034c39a 100644 --- a/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/orders/ZcOrderMainMapper.xml @@ -63,6 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -123,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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') @@ -132,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -37,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and created_at = #{createdAt} and payment_id = #{paymentId} and paid_at = #{paidAt} + and pay_status = #{payStatus} + and transaction_id = #{transactionId} and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') @@ -97,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" created_at = #{createdAt}, payment_id = #{paymentId}, paid_at = #{paidAt}, + pay_status = #{payStatus}, + transaction_id = #{transactionId}, remark = #{remark}, del_flag = #{delFlag}, create_time = #{createTime}, diff --git a/ruoyi-admin/src/main/resources/templates/orders/distrib/add.html b/ruoyi-admin/src/main/resources/templates/orders/distrib/add.html new file mode 100644 index 0000000..f5a4b03 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/orders/distrib/add.html @@ -0,0 +1,73 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/orders/distrib/distrib.html b/ruoyi-admin/src/main/resources/templates/orders/distrib/distrib.html new file mode 100644 index 0000000..5c976e4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/orders/distrib/distrib.html @@ -0,0 +1,294 @@ + + + + + + + +
+
+
+
+
+
    + + +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+ + + + +
+
+ + 分成收益 +
+
+
+
订单总数
+
0笔
+
+
+
订单金额
+
0元
+
+
+
分成金额
+
0元
+
+
+
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/orders/distrib/edit.html b/ruoyi-admin/src/main/resources/templates/orders/distrib/edit.html new file mode 100644 index 0000000..a999e58 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/orders/distrib/edit.html @@ -0,0 +1,68 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/orders/order/edit.html b/ruoyi-admin/src/main/resources/templates/orders/order/edit.html index 41c35a0..f7d29aa 100644 --- a/ruoyi-admin/src/main/resources/templates/orders/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/orders/order/edit.html @@ -252,9 +252,18 @@ { field: 'paymentId', align: 'center', - title: '支付' + title: '支付ID' + }, + { + field: 'transactionId', + align: 'center', + title: '平台支付流水号' + }, + { + field: 'payStatus', + align: 'center', + title: '支付状态' }, - { field: 'paidAt', align: 'center', 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 ab95966..ab85daf 100644 --- a/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html +++ b/ruoyi-admin/src/main/resources/templates/orders/orderSub/orderSub.html @@ -119,7 +119,17 @@ }, { field: 'paymentId', - title: '支付方式' + title: '支付ID' + }, + { + field: 'transactionId', + align: 'center', + title: '平台支付流水号' + }, + { + field: 'payStatus', + align: 'center', + title: '支付状态' }, { field: 'paidAt',