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

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

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
212a676215
2 измененных файлов: 6 добавлений и 3 удалений
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java

+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxLegionActivityOrderController.java Просмотреть файл

@@ -153,8 +153,9 @@ public class WxLegionActivityOrderController extends BaseController {
if(wxLegionActivityOrder.getActivityId() == null){ if(wxLegionActivityOrder.getActivityId() == null){
return new ResultData(Result.ERROR,"活动ID不能为空"); 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(); TenantEntity tenantInfo = getTenantInfo();


+ 3
- 1
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; Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0;
BigDecimal sum_success = BigDecimal.ZERO, sum_fail = BigDecimal.ZERO; 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(); WxLegionActivityUser activityUserQ = new WxLegionActivityUser();
activityUserQ.setActivityId(wxLegionActivityOrder.getActivityId()); activityUserQ.setActivityId(wxLegionActivityOrder.getActivityId());
activityUserQ.setPhone(wxLegionActivityOrder.getCusPhone()); activityUserQ.setPhone(wxLegionActivityOrder.getCusPhone());
activityUserQ.setVipNum(wxLegionActivityOrder.getCusVipNum());
WxLegionActivityUser user = wxLegionActivityUserMapper.selectLimitOne(activityUserQ); WxLegionActivityUser user = wxLegionActivityUserMapper.selectLimitOne(activityUserQ);
if(user == null){ if(user == null){
result.put("cus_name","查无此人"); result.put("cus_name","查无此人");


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