|
|
|
@@ -1,6 +1,5 @@ |
|
|
|
package com.iformall.service.impl; |
|
|
|
|
|
|
|
import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
@@ -16,6 +15,7 @@ import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.*; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.transaction.annotation.Transactional; |
|
|
|
@@ -198,10 +198,10 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe |
|
|
|
if(!user.getPhone().equals(wxLegionActivityOrder.getCusPhone())){ |
|
|
|
throw new MallinkException(Result.ERROR,"用户信息错误"); |
|
|
|
} |
|
|
|
if(StringUtil.isBlank(wxLegionActivityOrder.getCusName())){ |
|
|
|
if(StringUtils.isBlank(wxLegionActivityOrder.getCusName())){ |
|
|
|
wxLegionActivityOrder.setCusName(user.getName()); |
|
|
|
} |
|
|
|
if(StringUtil.isBlank(wxLegionActivityOrder.getCusAddress())){ |
|
|
|
if(org.apache.commons.lang3.StringUtils.isBlank(wxLegionActivityOrder.getCusAddress())){ |
|
|
|
wxLegionActivityOrder.setCusAddress(user.getAddress()); |
|
|
|
} |
|
|
|
wxLegionActivityOrder.setCusMerchantId(user.getMerchantId()); |
|
|
|
|