Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-28 b35154180e1d327650b9f46bd6420cc2a7d760dc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java

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