|
@@ -3,6 +3,7 @@ package com.chelvc.cloud.vehicle.server.service.impl;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.chelvc.cloud.vehicle.client.constant.TradeConstant;
|
|
@@ -67,7 +68,7 @@ public class MerchantRelationServiceImpl extends ServiceImpl<MerchantRelationMap
|
|
|
baseInfo.put("businessAddressArea", merchant.getDistrict());
|
|
|
baseInfo.put("businessAddress", merchant.getAddress());
|
|
|
baseInfo.put("contactName", merchant.getLiaison());
|
|
|
- baseInfo.put("contactEmail", merchantAuth.getEmail());
|
|
|
+ baseInfo.put("contactEmail", StringUtils.isNotBlank(merchantAuth.getEmail()) ? merchantAuth.getEmail() : merchant.getMobile() + "@qq.com");
|
|
|
baseInfo.put("contactPhone", merchant.getMobile());
|
|
|
jsonObject.put("baseInfo", baseInfo);
|
|
|
|
|
@@ -178,7 +179,7 @@ public class MerchantRelationServiceImpl extends ServiceImpl<MerchantRelationMap
|
|
|
baseInfo.put("businessAddressArea", userAuth.getDistrict()); //区
|
|
|
baseInfo.put("businessAddress", userAuth.getAddress()); //经营地址
|
|
|
baseInfo.put("contactName", userAuth.getUserName()); //联系人姓名
|
|
|
- baseInfo.put("contactEmail", userAuth.getEmail()); //联系人邮箱
|
|
|
+ baseInfo.put("contactEmail", StringUtils.isNotBlank(userAuth.getEmail()) ? userAuth.getEmail() : userAuth.getPhone() + "@qq.com"); //联系人邮箱
|
|
|
baseInfo.put("contactPhone", userAuth.getPhone()); //联系人电话
|
|
|
jsonObject.put("baseInfo", baseInfo);
|
|
|
|