Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
7dc2e74c
Commit
7dc2e74c
authored
Nov 11, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
0ea0ca39
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
CouponsGiftServiceImpl.java
...pplication/market/coupon/impl/CouponsGiftServiceImpl.java
+1
-1
CouponsForConsumptionMapper.xml
...rces/mapper/market/coupon/CouponsForConsumptionMapper.xml
+9
-0
No files found.
src/main/java/com/gogirl/application/market/coupon/impl/CouponsGiftServiceImpl.java
View file @
7dc2e74c
...
@@ -80,7 +80,7 @@ public class CouponsGiftServiceImpl extends ServiceImpl<CouponsGiftMapper, Coupo
...
@@ -80,7 +80,7 @@ public class CouponsGiftServiceImpl extends ServiceImpl<CouponsGiftMapper, Coupo
}
}
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"行为触发发券失败"
);
log
.
error
(
"行为触发发券失败"
+
e
.
getMessage
()
);
}
}
}
}
}
}
src/main/resources/mapper/market/coupon/CouponsForConsumptionMapper.xml
View file @
7dc2e74c
...
@@ -8,11 +8,15 @@
...
@@ -8,11 +8,15 @@
LEFT JOIN coupons_for_consumption t2 on t2.order_amount_type = 1
LEFT JOIN coupons_for_consumption t2 on t2.order_amount_type = 1
and t1.total_price
<
= t2.order_amount_up
and t1.total_price
<
= t2.order_amount_up
and t1.total_price
>
t2.order_amount_down
and t1.total_price
>
t2.order_amount_down
<if
test=
"t2.order_serve_type != null"
>
LEFT JOIN order_serve t3 on t1.id = t3.order_id and t2.order_serve_type = t3.serve_type_id
LEFT JOIN order_serve t3 on t1.id = t3.order_id and t2.order_serve_type = t3.serve_type_id
</if>
where t1.id = #{orderId}
where t1.id = #{orderId}
and t2.id is not null
and t2.id is not null
and t1.department_id = t2.store_id
and t1.department_id = t2.store_id
<if
test=
"t2.order_serve_type != null"
>
and t3.id is not null
and t3.id is not null
</if>
union
union
SELECT t2.*
SELECT t2.*
from order_manage t1
from order_manage t1
...
@@ -20,12 +24,17 @@
...
@@ -20,12 +24,17 @@
and t1.total_payment_amount
<
= t2.order_amount_up
and t1.total_payment_amount
<
= t2.order_amount_up
and t1.total_payment_amount
>
= t2.order_amount_down
and t1.total_payment_amount
>
= t2.order_amount_down
and t1.department_id = t2.store_id
and t1.department_id = t2.store_id
<if
test=
"t2.order_serve_type != null"
>
LEFT JOIN order_serve t3 on t1.id = t3.order_id and t2.order_serve_type = t3.serve_type_id
LEFT JOIN order_serve t3 on t1.id = t3.order_id and t2.order_serve_type = t3.serve_type_id
</if>
where t1.id = #{orderId}
where t1.id = #{orderId}
and t2.id is not null
and t2.id is not null
<if
test=
"t2.order_serve_type != null"
>
and t3.id is not null
and t3.id is not null
</if>
and t1.department_id = t2.store_id
and t1.department_id = t2.store_id
order by orders
order by orders
limit 1
limit 1
</select>
</select>
</mapper>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment