From 09d899842fac63244d74e1cc6e061c7e38bdb385 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Wed, 2 Oct 2024 11:33:55 +0800 Subject: [PATCH] //legionActivity --- .../domain/vo/LegionActivityMerchantStatistics.java | 10 ++++++---- .../service/impl/WxLegionActivityOrderServiceImpl.java | 6 ++++-- .../service/impl/WxLegionActivityServiceImpl.java | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java index 1bcdf3244..11908df33 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java @@ -22,12 +22,14 @@ public class LegionActivityMerchantStatistics implements Serializable { private Integer orderCount; // @Excel(name="带单数量",width = 20,orderNum = "5") private Integer sellOrderCount; - @Excel(name="军团外带单",width = 20,orderNum = "6") + @Excel(name="外部军团带单",width = 20,orderNum = "6") private Integer difLegion; - @Excel(name="非原军团内部带单",width = 20,orderNum = "7") + @Excel(name="内部军团不同联盟带单",width = 20,orderNum = "7") private Integer difUnion; - @Excel(name="原军团内部带单",width = 20,orderNum = "8") + @Excel(name="内部军团相同联盟带单",width = 20,orderNum = "8") private Integer eqUnion; - @Excel(name="得分",width = 20,orderNum = "9") + @Excel(name="内部军团无联盟带单",width = 20,orderNum = "9") + private Integer notUnion; + @Excel(name="得分",width = 20,orderNum = "10") private Double totalScore; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java index 9abd67d25..70f9d1dac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -363,7 +363,8 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe result.put("sellOrderCount",dif_legion+dif_union+eq_union+not_union); result.put("difLegion",dif_legion); result.put("eqUnion",eq_union); - result.put("difUnion",dif_union+not_union); + result.put("difUnion",dif_union); + result.put("notUnion",not_union); Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder() +dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder() @@ -433,7 +434,8 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe merchantS.setSellOrderCount(dif_legion+dif_union+eq_union+not_union); merchantS.setDifLegion(dif_legion); merchantS.setEqUnion(eq_union); - merchantS.setDifUnion(dif_union+not_union); + merchantS.setDifUnion(dif_union); + merchantS.setNotUnion(not_union); Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder() +dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder() diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java index 8535de949..79e66cb40 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java @@ -179,10 +179,10 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ wxLegionActivityMapper.insert(wxLegionActivity); } else{ - WxLegionActivity activity = wxLegionActivityMapper.selectById(wxLegionActivity.getId(), wxLegionActivity.getTenantId()); - if(!EnumLegionActivityStatus.DRAFT.getCode().equals(activity.getStatus())){ - throw new MallinkException(Result.ERROR,"活动状态不允许修改"); - } +// WxLegionActivity activity = wxLegionActivityMapper.selectById(wxLegionActivity.getId(), wxLegionActivity.getTenantId()); +// if(!EnumLegionActivityStatus.DRAFT.getCode().equals(activity.getStatus())){ +// throw new MallinkException(Result.ERROR,"活动状态不允许修改"); +// } wxLegionActivity.setUpdateDate(now); wxLegionActivityMapper.updateById(wxLegionActivity); }