From 06690ccffe1f72660891e79abf67f39075b18d85 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Wed, 25 Sep 2024 17:24:24 +0800 Subject: [PATCH] //legionActivity 0.0 --- .../com/iformall/domain/po/WxLegionActivity.java | 12 ++++++------ .../domain/vo/LegionActivityMerchantStatistics.java | 2 +- .../iformall/domain/vo/LegionActivitySellOrder.java | 2 +- .../impl/WxLegionActivityOrderServiceImpl.java | 4 ++-- .../service/impl/WxLegionActivityServiceImpl.java | 12 ++++++------ .../main/resources/mapper/WxLegionActivityMapper.xml | 12 ++++++------ 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java index 8204efa3d..e3f9b0234 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java @@ -56,42 +56,42 @@ public class WxLegionActivity extends TenantEntity { */ @io.swagger.annotations.ApiModelProperty(value="售卡积分",name="sellingCard") @TableField(value = "selling_card") - private Integer sellingCard; + private Double sellingCard; /** * 签单积分 */ @io.swagger.annotations.ApiModelProperty(value="签单积分",name="signOrder") @TableField(value = "sign_order") - private Integer signOrder; + private Double signOrder; /** * 外部军团带单 */ @io.swagger.annotations.ApiModelProperty(value="外部军团带单",name="difLegionOrder") @TableField(value = "dif_legion_order") - private Integer difLegionOrder; + private Double difLegionOrder; /** * 内部军团不同联盟带单 */ @io.swagger.annotations.ApiModelProperty(value="内部军团不同联盟带单",name="difUnionOrder") @TableField(value = "dif_union_order") - private Integer difUnionOrder; + private Double difUnionOrder; /** * 内部军团相同联盟带单 */ @io.swagger.annotations.ApiModelProperty(value="内部军团相同联盟带单",name="eqUnionOrder") @TableField(value = "eq_union_order") - private Integer eqUnionOrder; + private Double eqUnionOrder; /** * 内部军团无联盟带单 */ @io.swagger.annotations.ApiModelProperty(value="内部军团无联盟带单",name="notUnionOrder") @TableField(value = "not_union_order") - private Integer notUnionOrder; + private Double notUnionOrder; /** * 状态 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 fdfae9349..1bcdf3244 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java @@ -29,5 +29,5 @@ public class LegionActivityMerchantStatistics implements Serializable { @Excel(name="原军团内部带单",width = 20,orderNum = "8") private Integer eqUnion; @Excel(name="得分",width = 20,orderNum = "9") - private Integer totalScore; + private Double totalScore; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java index 300a6993c..dc3c7bc9e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java @@ -56,5 +56,5 @@ public class LegionActivitySellOrder implements Serializable { private Date orderCreateDate; @Excel(name = "带单积分", width = 20, orderNum = "16") - private Integer score; + private Double score; } 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 daee1d4a7..95e982fb0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -349,7 +349,7 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe result.put("eqUnion",eq_union); result.put("difUnion",dif_union+not_union); - Integer total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder() + Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder() +dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder() +eq_union*activity.getEqUnionOrder()+not_union*activity.getNotUnionOrder(); result.put("totalScore",total_score); @@ -419,7 +419,7 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe merchantS.setEqUnion(eq_union); merchantS.setDifUnion(dif_union+not_union); - Integer total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder() + Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder() +dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder() +eq_union*activity.getEqUnionOrder()+not_union*activity.getNotUnionOrder(); merchantS.setTotalScore(total_score); 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 3c55faf2a..f3f59b249 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java @@ -147,22 +147,22 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ public void saveOrUpdate(WxLegionActivity wxLegionActivity) { Date now = new Date(); if(wxLegionActivity.getSellingCard() == null){ - wxLegionActivity.setSellingCard(0); + wxLegionActivity.setSellingCard(0d); } if(wxLegionActivity.getSignOrder() == null){ - wxLegionActivity.setSignOrder(0); + wxLegionActivity.setSignOrder(0d); } if(wxLegionActivity.getDifLegionOrder() == null){ - wxLegionActivity.setDifLegionOrder(0); + wxLegionActivity.setDifLegionOrder(0d); } if(wxLegionActivity.getDifUnionOrder() == null){ - wxLegionActivity.setDifUnionOrder(0); + wxLegionActivity.setDifUnionOrder(0d); } if(wxLegionActivity.getEqUnionOrder() == null){ - wxLegionActivity.setEqUnionOrder(0); + wxLegionActivity.setEqUnionOrder(0d); } if(wxLegionActivity.getNotUnionOrder() == null){ - wxLegionActivity.setNotUnionOrder(0); + wxLegionActivity.setNotUnionOrder(0d); } if(wxLegionActivity.getId() == null){ final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml index 32d07207e..a1cfd35f0 100644 --- a/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml @@ -11,12 +11,12 @@ - - - - - - + + + + + +