diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java index bf2232e66..efc15d807 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java @@ -153,8 +153,9 @@ public class WxLegionActivityOrderController extends BaseController { if(wxLegionActivityOrder.getActivityId() == null){ return new ResultData(Result.ERROR,"活动ID不能为空"); } - if(StringUtil.isBlank(wxLegionActivityOrder.getCusPhone())){ - return new ResultData(Result.ERROR,"请输入用户手机号"); + if(StringUtil.isBlank(wxLegionActivityOrder.getCusPhone()) + && StringUtil.isBlank(wxLegionActivityOrder.getCusVipNum())){ + return new ResultData(Result.ERROR,"请输入用户手机号或vip卡号"); } TenantEntity tenantInfo = getTenantInfo(); 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 1d9fc62d8..f6716f747 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -301,10 +301,12 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0; BigDecimal sum_success = BigDecimal.ZERO, sum_fail = BigDecimal.ZERO; - if(StringUtils.isNotBlank(wxLegionActivityOrder.getCusPhone())){ + if(StringUtils.isNotBlank(wxLegionActivityOrder.getCusPhone()) + || StringUtils.isNotBlank(wxLegionActivityOrder.getCusVipNum())){ WxLegionActivityUser activityUserQ = new WxLegionActivityUser(); activityUserQ.setActivityId(wxLegionActivityOrder.getActivityId()); activityUserQ.setPhone(wxLegionActivityOrder.getCusPhone()); + activityUserQ.setVipNum(wxLegionActivityOrder.getCusVipNum()); WxLegionActivityUser user = wxLegionActivityUserMapper.selectLimitOne(activityUserQ); if(user == null){ result.put("cus_name","查无此人");