记得上下班打卡 | git大法好,push需谨慎

Commit 859ef844 authored by zhengfuxin's avatar zhengfuxin

计算 代理抽成。

parent d59406f4
...@@ -32,6 +32,8 @@ public class SellDataOneVO implements Serializable { ...@@ -32,6 +32,8 @@ public class SellDataOneVO implements Serializable {
private BigDecimal commission; private BigDecimal commission;
@ApiModelProperty(value = "票id") @ApiModelProperty(value = "票id")
private String ticketId; private String ticketId;
@ApiModelProperty(value = "抽成总佣金")
private BigDecimal chouChengCommission;
private static final SellDataOneVO obj = new SellDataOneVO(); private static final SellDataOneVO obj = new SellDataOneVO();
......
...@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{ ...@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) { public static void main(String[] args) {
String[] keys = { String[] keys = {
"kylin:member:uid:809406", "smile:user977700554171514889825666",
}; };
for (String key : keys) { for (String key : keys) {
long value = key.hashCode(); long value = key.hashCode();
......
...@@ -46,6 +46,7 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> { ...@@ -46,6 +46,7 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
*/ */
Integer getOrderScore(@Param("uid") String uid); Integer getOrderScore(@Param("uid") String uid);
List<Map> getUserOrder(@Param("userId")String userId); List<Map> getUserOrder(@Param("userId")String userId);
Map getUserCommission(@Param("agentId")String agentId);
List<Map> getUserSellOneDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId); List<Map> getUserSellOneDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId);
Map getUserSellAllDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId); Map getUserSellAllDate(@Param("agentId")String agentId,@Param("performanceId")String performanceId);
List<Map> getUserSellDetail(@Param("agentId")String agentId,@Param("ticketId")String ticketId); List<Map> getUserSellDetail(@Param("agentId")String agentId,@Param("ticketId")String ticketId);
......
...@@ -91,6 +91,13 @@ ...@@ -91,6 +91,13 @@
LEFT JOIN kylin_performance_status s ON p.performances_id=s.performance_id where LEFT JOIN kylin_performance_status s ON p.performances_id=s.performance_id where
time_end>DATE_SUB(CURDATE(), INTERVAL 6 MONTH) and s.`status` in (3,6,7,8,9,10); time_end>DATE_SUB(CURDATE(), INTERVAL 6 MONTH) and s.`status` in (3,6,7,8,9,10);
</select> </select>
<select id="getUserCommission" parameterType="String" resultType="java.util.Map">
select SUM(r.agent_distributions_master * (o.price-o.price_refund)) as 'commiss'
from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
where r.agent_id_master=#{agentId} and s.pay_status='1'
</select>
<select id="getUserSellOneDate" parameterType="String" resultType="java.util.Map"> <select id="getUserSellOneDate" parameterType="String" resultType="java.util.Map">
select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi' select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi'
from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
......
...@@ -74,6 +74,7 @@ public class SellDataInfoImpl { ...@@ -74,6 +74,7 @@ public class SellDataInfoImpl {
//获取 该人 该演出 的所有订单 //获取 该人 该演出 的所有订单
List<Map> list2=orderTicketsMapper.getUserSellOneDate(smileUser.getUid(),performanceId); List<Map> list2=orderTicketsMapper.getUserSellOneDate(smileUser.getUid(),performanceId);
ArrayList<SellDataOneVO> listSellDataOneVo= ObjectUtil.getSellDataOneVOArrayList(); ArrayList<SellDataOneVO> listSellDataOneVo= ObjectUtil.getSellDataOneVOArrayList();
Map commission=orderTicketsMapper.getUserCommission(smileUser.getUid());
for(Map a1:list2){ for(Map a1:list2){
SellDataOneVO sellDataOneVO=SellDataOneVO.getNew(); SellDataOneVO sellDataOneVO=SellDataOneVO.getNew();
//票务类型 //票务类型
...@@ -87,6 +88,7 @@ public class SellDataInfoImpl { ...@@ -87,6 +88,7 @@ public class SellDataInfoImpl {
//佣金 //佣金
sellDataOneVO.setCommission(new BigDecimal(a1.get("commiss")==null?"0":a1.get("commiss").toString())); sellDataOneVO.setCommission(new BigDecimal(a1.get("commiss")==null?"0":a1.get("commiss").toString()));
sellDataOneVO.setTicketId(a1.get("ticketId")==null?"":a1.get("ticketId").toString()); sellDataOneVO.setTicketId(a1.get("ticketId")==null?"":a1.get("ticketId").toString());
sellDataOneVO.setChouChengCommission(new BigDecimal(commission.get("commiss")==null?"0":commission.get("commiss").toString()));
listSellDataOneVo.add(sellDataOneVO); listSellDataOneVo.add(sellDataOneVO);
if(StringUtils.isNotBlank(sellDataOneVO.getTicketId())){ if(StringUtils.isNotBlank(sellDataOneVO.getTicketId())){
setDataDetial(smileUser.getUid(),a1.get("ticketId").toString()); setDataDetial(smileUser.getUid(),a1.get("ticketId").toString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment