Procházet zdrojové kódy

//legionActivity

release_toaliyun_real
xiaohu před 1 rokem
rodič
revize
6bf595dbf9
1 změnil soubory, kde provedl 14 přidání a 10 odebrání
  1. +14
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java

+ 14
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java Zobrazit soubor

@@ -185,27 +185,31 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe
wxLegionActivityOrder.setUnionId(0L); wxLegionActivityOrder.setUnionId(0L);
} }
if(wxLegionActivityOrder.getMerchantId().equals(user.getMerchantId())){ if(wxLegionActivityOrder.getMerchantId().equals(user.getMerchantId())){
//用户和订单同一个商户(签单不算带单)
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.SIGN_ORDER.getCode()); wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.SIGN_ORDER.getCode());
} }
else if(wxLegionActivityOrder.getLegionId().equals(0L) || user.getLegionId().equals(0L)){ else if(wxLegionActivityOrder.getLegionId().equals(0L) || user.getLegionId().equals(0L)){
//未参加活动 提交订单(外部军团带单)
//未参加活动(外部军团带单)
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.DIF_LEGION.getCode()); wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.DIF_LEGION.getCode());
}else if(wxLegionActivityOrder.getLegionId().equals(user.getLegionId())){ }else if(wxLegionActivityOrder.getLegionId().equals(user.getLegionId())){
//订单军团与用户军团一致
if(wxLegionActivityOrder.getUnionId().equals(0L) || user.getUnionId().equals(0L)){
//订单/用户无联盟(内部军团无联盟带单)
//订单军团与用户军团一致(团内)
if(user.getUnionId().equals(0L)){
//用户无联盟(内部军团无联盟带单)
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.NOT_UNION.getCode()); wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.NOT_UNION.getCode());
}else if(wxLegionActivityOrder.getUnionId().equals(user.getUnionId())){
}
// if(wxLegionActivityOrder.getUnionId().equals(0L) || user.getUnionId().equals(0L)){
// //订单/用户无联盟(内部军团无联盟带单)
// wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.NOT_UNION.getCode());
// }
else if(wxLegionActivityOrder.getUnionId().equals(user.getUnionId())){
//内部相同联盟带单
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.EQ_UNION.getCode()); wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.EQ_UNION.getCode());
}else{ }else{
//内部不同联盟带单
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.DIF_UNION.getCode()); wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.DIF_UNION.getCode());
} }
}else{ }else{
if(wxLegionActivityOrder.getUnionId().equals(0L) || user.getUnionId().equals(0L)){
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.NOT_UNION.getCode());
}else{
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.DIF_LEGION.getCode());
}
wxLegionActivityOrder.setOrderType(EnumLegionActivityOrderType.DIF_LEGION.getCode());
} }


Date now = new Date(); Date now = new Date();


Načítá se…
Zrušit
Uložit