|
@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.chelvc.cloud.user.client.UserClient;
|
|
|
import com.chelvc.cloud.user.client.model.Scope;
|
|
|
import com.chelvc.cloud.vehicle.client.dto.MerchantAuthDTO;
|
|
|
+import com.chelvc.cloud.vehicle.client.dto.MerchantDTO;
|
|
|
import com.chelvc.cloud.vehicle.client.param.MerchantAuthModifyParam;
|
|
|
import com.chelvc.cloud.vehicle.client.param.MerchantAuthPagingParam;
|
|
|
import com.chelvc.cloud.vehicle.client.param.MerchantModifyParam;
|
|
|
import com.chelvc.cloud.vehicle.server.copier.MerchantAuthCopier;
|
|
|
import com.chelvc.cloud.vehicle.server.dao.MerchantAuthMapper;
|
|
|
+import com.chelvc.cloud.vehicle.server.entity.Merchant;
|
|
|
import com.chelvc.cloud.vehicle.server.entity.MerchantAuth;
|
|
|
import com.chelvc.cloud.vehicle.server.service.MerchantAuthService;
|
|
|
import com.chelvc.cloud.vehicle.server.service.MerchantService;
|
|
@@ -20,6 +22,7 @@ import com.chelvc.framework.common.util.StringUtils;
|
|
|
import com.chelvc.framework.database.context.DatabaseContextHolder;
|
|
|
import lombok.NonNull;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
@@ -67,7 +70,13 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
|
|
|
param1.setMainBusiness(param.getMainBusiness());
|
|
|
param1.setAncillaryBusiness(param.getAncillaryBusiness());
|
|
|
param1.setBanners(param.getStoreInnerImage());
|
|
|
- this.merchantService.addMerchant(param1);
|
|
|
+ MerchantDTO merchant = this.merchantService.getMerchantByUserId(userId);
|
|
|
+ if (ObjectUtils.isEmpty(merchant)){
|
|
|
+ this.merchantService.addMerchant(param1);
|
|
|
+ }else{
|
|
|
+ this.merchantService.updateMerchant(merchant.getId(),param1);
|
|
|
+ }
|
|
|
+
|
|
|
return merchantAuth.getId();
|
|
|
}
|
|
|
|