java/zhihuishenqu.git

			@@ -5,6 +5,7 @@
			import static org.apache.commons.lang3.StringUtils.isNotBlank;

			import java.text.SimpleDateFormat;
			import java.time.Instant;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			@@ -12,6 +13,7 @@

			import javax.annotation.Resource;

			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -62,6 +64,7 @@
			* @date: 2021/09/16 16:14
			*/
			@Service
			@Slf4j
			public class ConvenientMerchantServiceImpl extends ServiceImpl<ConvenientMerchantDAO, ConvenientMerchantDO> implements ConvenientMerchantService {

			@Resource
			@@ -80,6 +83,7 @@
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R addMerchant(ConvenientMerchantDTO convenientMerchantDTO) {
			log.error("catTimeStamp开始执行addMerchant", Instant.now().toEpochMilli());
			ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
			ConvenientMerchantDO convenientMerchantDO = new ConvenientMerchantDO();
			BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
			@@ -99,6 +103,7 @@
			});
			}
			}
			log.error("catTimeStamp商家创建完成开始添加用户", Instant.now().toEpochMilli());
			//添加user
			R addUserResult = userService.addConvenientMerchantUser(convenientMerchantDTO);
			if (R.isOk(addUserResult)) {
			@@ -108,6 +113,7 @@
			} else {
			throw new ServiceException("406", addUserResult.getMsg());
			}
			log.error("catTimeStamp全部完成", Instant.now().toEpochMilli());
			return R.ok();
			}