diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index 14bcab51e..53ab2da36 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -124,16 +124,10 @@ public class MkDistributionUserServiceImpl extends ServiceImpl unActivates = mapper.selectUnDistributionShops(userId); for (DistributionCenterShopVO unActivate : unActivates) { - - //'pay购买开通 auto自动开通 manual手动开通' - if ("pay".equals(unActivate.getOpenType())) { - if (unActivate.getShopUser() == 1) { - unActivate.setLabelContent("曾进入过店铺"); - } - } else if ("auto".equals(unActivate.getOpenType())) { - if (unActivate.getOrderCount() == 1) { - unActivate.setLabelContent("在本店下单过"); - } + if (unActivate.getOrderCount() == 1) { + unActivate.setLabelContent("在本店下单过"); + }else if (unActivate.getShopUser() == 1) { + unActivate.setLabelContent("曾进入过店铺"); } // else if("manual".equals(unActivate.getOpenType())){ // unActivate.setLabelContent("manual手动开通");,