Explorar el Código

//legionActivity

release_toaliyun_real
xiaohu hace 1 año
padre
commit
09d899842f
Se han modificado 3 ficheros con 14 adiciones y 10 borrados
  1. +6
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java

+ 6
- 4
mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java Ver fichero

@@ -22,12 +22,14 @@ public class LegionActivityMerchantStatistics implements Serializable {
private Integer orderCount; private Integer orderCount;
// @Excel(name="带单数量",width = 20,orderNum = "5") // @Excel(name="带单数量",width = 20,orderNum = "5")
private Integer sellOrderCount; private Integer sellOrderCount;
@Excel(name="军团带单",width = 20,orderNum = "6")
@Excel(name="外部军团带单",width = 20,orderNum = "6")
private Integer difLegion; private Integer difLegion;
@Excel(name="非原军团内部带单",width = 20,orderNum = "7")
@Excel(name="内部军团不同联盟带单",width = 20,orderNum = "7")
private Integer difUnion; private Integer difUnion;
@Excel(name="原军团内部带单",width = 20,orderNum = "8")
@Excel(name="内部军团相同联盟带单",width = 20,orderNum = "8")
private Integer eqUnion; 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; private Double totalScore;
} }

+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java Ver fichero

@@ -363,7 +363,8 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe
result.put("sellOrderCount",dif_legion+dif_union+eq_union+not_union); result.put("sellOrderCount",dif_legion+dif_union+eq_union+not_union);
result.put("difLegion",dif_legion); result.put("difLegion",dif_legion);
result.put("eqUnion",eq_union); 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() Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder()
+dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder() +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.setSellOrderCount(dif_legion+dif_union+eq_union+not_union);
merchantS.setDifLegion(dif_legion); merchantS.setDifLegion(dif_legion);
merchantS.setEqUnion(eq_union); 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() Double total_score = userCount*activity.getSellingCard()+order_count*activity.getSignOrder()
+dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder() +dif_legion*activity.getDifLegionOrder()+dif_union*activity.getDifUnionOrder()


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java Ver fichero

@@ -179,10 +179,10 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{
wxLegionActivityMapper.insert(wxLegionActivity); wxLegionActivityMapper.insert(wxLegionActivity);
} }
else{ 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); wxLegionActivity.setUpdateDate(now);
wxLegionActivityMapper.updateById(wxLegionActivity); wxLegionActivityMapper.updateById(wxLegionActivity);
} }


Cargando…
Cancelar
Guardar