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 a7e9e8980..300a6993c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/LegionActivitySellOrder.java @@ -26,8 +26,9 @@ public class LegionActivitySellOrder implements Serializable { @Excel(name = "卡属军团", width = 20, orderNum = "2") private String cusLegionName; private Long cusUnionId; -// @Excel(name = "卡属派系", width = 20, orderNum = "3") private String cusUnionName; + @Excel(name = "卡属派系", width = 20, orderNum = "3", replace = {"原联盟_1", "非联盟_0"}) + private Integer cusUnionType; private Date cusCreateDate; @@ -45,8 +46,9 @@ public class LegionActivitySellOrder implements Serializable { @Excel(name = "订单军团", width = 20, orderNum = "11") private String orderLegionName; private Long orderUnionId; -// @Excel(name = "订单派系", width = 20, orderNum = "12") private String orderUnionName; + @Excel(name = "订单派系", width = 20, orderNum = "12", replace = {"原联盟_1", "非联盟_0"}) + private Integer orderUnionType; private Integer orderType; 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 98f6c3518..008e4fb79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -472,6 +472,12 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe }else{ sellOrder.setCusLegionName(legionConfigMap.get(sellOrder.getCusLegionId())); } + if(sellOrder.getCusUnionId() == null || sellOrder.getCusUnionId().equals(0L)){ + sellOrder.setCusUnionType(EnumYesOrNo.NO.getCode()); + }else{ + sellOrder.setCusUnionType(EnumYesOrNo.YES.getCode()); + } + sellOrder.setOrderMerchantName(idAndNamesMap.get(sellOrder.getOrderMerchantId())); sellOrder.setOrderShopNumber(merchantShopNumberMap.get(sellOrder.getOrderMerchantId())); if(sellOrder.getOrderLegionId().equals(0L)){ @@ -479,6 +485,11 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe }else{ sellOrder.setOrderLegionName(legionConfigMap.get(sellOrder.getOrderLegionId())); } + if(sellOrder.getOrderUnionId() == null || sellOrder.getOrderUnionId().equals(0L)){ + sellOrder.setOrderUnionType(EnumYesOrNo.NO.getCode()); + }else{ + sellOrder.setOrderUnionType(EnumYesOrNo.YES.getCode()); + } if(EnumLegionActivityOrderType.DIF_LEGION.getCode().equals(sellOrder.getOrderType())){ sellOrder.setScore(activity.getDifLegionOrder());