Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
f4e5037bb8
3 измененных файлов: 23 добавлений и 16 удалений
  1. +6
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/LegionActivityMerchantStatistics.java
  2. +13
    -8
      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 Просмотреть файл

@@ -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;
}

+ 13
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java Просмотреть файл

@@ -302,13 +302,16 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe
wxLegionActivityOrder.setAuditBy(userId);
wxLegionActivityOrderMapper.updateAuditStatus(wxLegionActivityOrder);

//同步订单
WxLegionActivityOrder legionActivityOrder = wxLegionActivityOrderMapper.selectById(wxLegionActivityOrder.getId(), wxLegionActivityOrder.getTenantId());
WxLegionActivityUser user = wxLegionActivityUserMapper.selectById(legionActivityOrder.getCusId(), legionActivityOrder.getTenantId());
legionActivityOrder.setCusPhone(user.getPhone());
legionActivityOrder.setCusVipNum(user.getVipNum());
if(EnumLegionActivityOrderStatus.AUDI_SUCCESS.getCode().equals(wxLegionActivityOrder.getAuditStatus())){
//同步订单
WxLegionActivityOrder legionActivityOrder = wxLegionActivityOrderMapper.selectById(wxLegionActivityOrder.getId(), wxLegionActivityOrder.getTenantId());
WxLegionActivityUser user = wxLegionActivityUserMapper.selectById(legionActivityOrder.getCusId(), legionActivityOrder.getTenantId());
legionActivityOrder.setCusPhone(user.getPhone());
legionActivityOrder.setCusVipNum(user.getVipNum());

wxLegionActivityOfflineConfigService.syncOfflineActivityRecord(legionActivityOrder);
}

wxLegionActivityOfflineConfigService.syncOfflineActivityRecord(legionActivityOrder);
}

@Override
@@ -360,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()
@@ -430,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()


+ 4
- 4
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);
}


Загрузка…
Отмена
Сохранить