From a86ee29b07050180f8de4343971a230ea9a3e2b4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 10:35:04 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml | 10 +++++-----
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java | 3 +++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 5 +++--
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java | 3 ++-
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
index bbddb84..afc33b3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyOrderDto.java
@@ -21,4 +21,7 @@
@ApiModelProperty(value = "实收金额")
private BigDecimal relReceiveMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relPayMoney;
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 567cf17..0c6a023 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -524,14 +524,15 @@
public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto){
String orderId = merVerifyOrderDto.getOrderId();
BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
+ BigDecimal relPayMoney = merVerifyOrderDto.getRelPayMoney();
Date nowTime = new Date();
//更新订单信息
Order order = this.getById(orderId);
order.setOrderStatus(3);
order.setUseTime(nowTime);
order.setUseUserId(merVerifyOrderDto.getUserId());
- order.setOfflinePayMoney(relReceiveMoney);
- order.setPayMoney(order.getPayMoney().add(relReceiveMoney));
+ order.setOfflinePayMoney(relPayMoney);
+ order.setPayMoney(relReceiveMoney.add(relPayMoney));
order.setCloseFlag(1);
this.saveOrUpdate(order);
//创建服务商品
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
index 3261eb4..18f1c45 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java
@@ -43,7 +43,8 @@
*/
@Override
public List<MerAgencyTaskPageVo> pageMerAgencyTask(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
- merAgencyTaskPageDto.setNowDay(DateUtils.parseDateToStr("YYYY-MM-DD",new Date()));
+ String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
+ merAgencyTaskPageDto.setNowDay(nowDay);
List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskMapper.pageMerAgencyTask(page, merAgencyTaskPageDto);
return merAgencyTaskPageVoList;
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml
index 24871b8..bcc970a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskMapper.xml
@@ -13,23 +13,23 @@
<result property="taskStatus" column="task_status" />
</resultMap>
- <select id="pageMerAgencyTask" resultType="com.ruoyi.shop.domain.vo.MerAgencyPageVo">
+ <select id="pageMerAgencyTask" resultType="com.ruoyi.shop.domain.vo.MerAgencyTaskPageVo">
SELECT
task_id taskId,
task_date taskDate,
task_content taskContent
FROM t_agency_task tat
WHERE del_flag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
- <if test="param.taskStatus!=null and param.taskStatus!=null == 0">
+ <if test="param.taskStatus!=null and param.taskStatus == 0">
AND task_status = 0 AND task_date < #{param.nowDay}
</if>
- <if test="param.taskStatus!=null and param.taskStatus!=null == 1">
+ <if test="param.taskStatus!=null and param.taskStatus == 1">
AND task_status = 0 AND task_date = #{param.nowDay}
</if>
- <if test="param.taskStatus!=null and param.taskStatus!=null == 2">
+ <if test="param.taskStatus!=null and param.taskStatus == 2">
AND task_status = 2
</if>
- <if test="param.taskStatus!=null and param.taskStatus!=null == 3">
+ <if test="param.taskStatus!=null and param.taskStatus == 3">
AND task_status = 0 AND task_date > #{param.nowDay}
</if>
ORDER BY task_date DESC
--
Gitblit v1.7.1