Skip to content

P
pica-cloud-account
提交 0433d008 编写于 作者: peijun.zhao's avatar peijun.zhao
浏览文件
操作

Merge branch 'dev-0831' into release 

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/service/CircleAccountService.java
#	server/src/main/java/com/pica/cloud/account/account/server/service/impl/CircleAccountServiceImpl.java
上级 042e186a adee2ab2
流水线 #29670 已失败 于阶段
    in 0 second
    隐藏空白字符变更
    内嵌 并排
    正在显示 包含 155 行增加 和 8 行删除
    client/pom.xml
    浏览文件 @ 0433d008
    ......@@ -11,7 +11,7 @@
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-client</artifactId>
    <version>1.0.3.6</version>
    <version>1.0.3.8</version>
    <name>pica-cloud-account-client</name>
    <packaging>jar</packaging>
    ......@@ -28,7 +28,7 @@
    <dependency>
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.0.1.6</version>
    <version>1.0.1.7</version>
    </dependency>
    <dependency>
    <groupId>org.springframework.cloud</groupId>
    ......@@ -71,7 +71,8 @@
    <repository>
    <id>nexus</id>
    <name>Pica 3rdParty Repository</name>
    <url>http://192.168.141.133:8082/repository/pica-3rdParty/</url>
    <!-- <url>http://192.168.141.133:8082/repository/pica-3rdParty/</url>-->
    <url>http://nexus.picahealth.com:8082/repository/pica-3rdParty/</url>
    </repository>
    </distributionManagement>
    ......
    client/src/main/java/com/pica/cloud/account/account/client/RegisterClient.java
    浏览文件 @ 0433d008
    ......@@ -4,6 +4,7 @@ import com.pica.cloud.account.account.common.req.EncryptEntity;
    import com.pica.cloud.account.account.common.req.LoginResult;
    import com.pica.cloud.account.account.common.req.OCINRequest;
    import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
    import com.pica.cloud.account.account.common.req.shop.ShopAcctInitReq;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import org.springframework.cloud.netflix.feign.FeignClient;
    import org.springframework.web.bind.annotation.PostMapping;
    ......@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
    import org.springframework.web.bind.annotation.RequestHeader;
    import java.util.List;
    import java.util.Map;
    /**
    * Created on 2019/10/16 17:28
    ......@@ -29,5 +31,8 @@ public interface RegisterClient {
    @PostMapping(value = "/account/circle/acct")
    PicaResponse<List<Integer>> register(@RequestBody CircleAcctInitReq circleAcctInitReq, @RequestHeader(value = "token") String token);
    @PostMapping(value = "/account/shop/acct")
    PicaResponse<Map<String,Integer>> shopRegister(@RequestBody ShopAcctInitReq shopAcctInitReq, @RequestHeader(value = "token") String token);
    }
    \ No newline at end of file
    common/pom.xml
    浏览文件 @ 0433d008
    ......@@ -11,7 +11,7 @@
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.0.1.6</version>
    <version>1.0.1.7</version>
    <name>pica-cloud-account-common</name>
    <packaging>jar</packaging>
    ......@@ -34,7 +34,8 @@
    <repository>
    <id>nexus</id>
    <name>Pica 3rdParty Repository</name>
    <url>http://192.168.141.133:8082/repository/pica-3rdParty/</url>
    <!-- <url>http://192.168.141.133:8082/repository/pica-3rdParty/</url>-->
    <url>http://nexus.picahealth.com:8082/repository/pica-3rdParty/</url>
    </repository>
    </distributionManagement>
    ......
    common/src/main/java/com/pica/cloud/account/account/common/req/shop/ShopAcctInit.java 0 → 100644
    浏览文件 @ 0433d008
    package com.pica.cloud.account.account.common.req.shop;
    /**
    * @DESCRIPTOIN:
    * @AUTHOR: joy
    * @DATE:2020/6/21 11:01 上午
    */
    public class ShopAcctInit {
    private String userName;
    public String getUserName() {
    return userName;
    }
    public void setUserName(String userName) {
    this.userName = userName;
    }
    private String mobile;
    public String getMobile() {
    return mobile;
    }
    public void setMobile(String mobile) {
    this.mobile = mobile;
    }
    }
    common/src/main/java/com/pica/cloud/account/account/common/req/shop/ShopAcctInitReq.java 0 → 100644
    浏览文件 @ 0433d008
    package com.pica.cloud.account.account.common.req.shop;
    import java.util.List;
    /**
    * @DESCRIPTOIN:
    * @AUTHOR: joy
    * @DATE:2020/6/21 11:02 上午
    */
    public class ShopAcctInitReq {
    private List<ShopAcctInit> shopAcctInitList;
    private Integer registerSource; // 1 安卓 2 ios 3 web 4 h5 5 admin
    public Integer getRegisterSource() {
    return registerSource;
    }
    public void setRegisterSource(Integer registerSource) {
    this.registerSource = registerSource;
    }
    public List<ShopAcctInit> getShopAcctInitList() {
    return shopAcctInitList;
    }
    public void setShopAcctInitList(List<ShopAcctInit> shopAcctInitList) {
    this.shopAcctInitList = shopAcctInitList;
    }
    }
    server/pom.xml
    浏览文件 @ 0433d008
    ......@@ -138,7 +138,7 @@
    <dependency>
    <groupId>com.pica.cloud.account</groupId>
    <artifactId>pica-cloud-account-common</artifactId>
    <version>1.0.1.6</version>
    <version>1.0.1.7</version>
    </dependency>
    <dependency>
    ......@@ -251,7 +251,8 @@
    <repositories>
    <repository>
    <id>nexus</id>
    <url>http://192.168.141.133:8082/repository/maven-public/</url>
    <!-- <url>http://192.168.141.133:8082/repository/maven-public/</url>-->
    <url>http://nexus.picahealth.com:8082/repository/maven-public/</url>
    <releases>
    <enabled>true</enabled>
    <updatePolicy>never</updatePolicy>
    ......@@ -266,7 +267,8 @@
    <pluginRepositories>
    <pluginRepository>
    <id>nexus</id>
    <url>http://192.168.141.133:8082/repository/maven-public/</url>
    <!-- <url>http://192.168.141.133:8082/repository/maven-public/</url>-->
    <url>http://nexus.picahealth.com:8082/repository/maven-public/</url>
    <releases>
    <enabled>true</enabled>
    <updatePolicy>never</updatePolicy>
    ......
    server/src/main/java/com/pica/cloud/account/account/server/controller/ShopUserController.java 0 → 100644
    浏览文件 @ 0433d008
    package com.pica.cloud.account.account.server.controller;
    import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
    import com.pica.cloud.account.account.common.req.shop.ShopAcctInitReq;
    import com.pica.cloud.account.account.server.service.CircleAccountService;
    import com.pica.cloud.foundation.entity.PicaResponse;
    import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidate;
    import io.swagger.annotations.Api;
    import org.slf4j.Logger;
    import org.slf4j.LoggerFactory;
    import org.springframework.beans.factory.annotation.Autowired;
    import org.springframework.web.bind.annotation.PostMapping;
    import org.springframework.web.bind.annotation.RequestBody;
    import org.springframework.web.bind.annotation.RequestMapping;
    import org.springframework.web.bind.annotation.RestController;
    import java.util.List;
    @Api(description = "")
    @RestController
    @RequestMapping("/shop")
    public class ShopUserController {
    private Logger logger = LoggerFactory.getLogger(ShopUserController.class);
    @Autowired
    private CircleAccountService circleAccountService;
    @PostMapping("/acct")
    @EnabledLoginValidate
    public PicaResponse<List<Integer>> shopUserInit(@RequestBody ShopAcctInitReq shopAcctInitReq) {
    return PicaResponse.toResponse(circleAccountService.createShopAccount(shopAcctInitReq));
    }
    }
    server/src/main/java/com/pica/cloud/account/account/server/service/CircleAccountService.java
    浏览文件 @ 0433d008
    ......@@ -2,6 +2,7 @@ package com.pica.cloud.account.account.server.service;
    import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
    import com.pica.cloud.account.account.common.req.shop.ShopAcctInitReq;
    import com.pica.cloud.account.account.common.req.circle.DiyAcctInitReq;
    import com.pica.cloud.account.account.server.entity.Account;
    import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
    ......@@ -21,4 +22,6 @@ public interface CircleAccountService {
    //批量创建用户- 手机号，姓名
    List<Integer> createDiyAccount(DiyAcctInitReq diyAcctInitReq);
    Map<String,Integer> createShopAccount(ShopAcctInitReq shopAcctInitReq);
    }
    server/src/main/java/com/pica/cloud/account/account/server/service/impl/CircleAccountServiceImpl.java
    浏览文件 @ 0433d008
    ......@@ -3,6 +3,8 @@ package com.pica.cloud.account.account.server.service.impl;
    import com.alibaba.fastjson.JSONObject;
    import com.pica.cloud.account.account.common.req.circle.CircleAcctInit;
    import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
    import com.pica.cloud.account.account.common.req.shop.ShopAcctInit;
    import com.pica.cloud.account.account.common.req.shop.ShopAcctInitReq;
    import com.pica.cloud.account.account.common.req.circle.DiyAcctInit;
    import com.pica.cloud.account.account.common.req.circle.DiyAcctInitReq;
    import com.pica.cloud.account.account.server.entity.Account;
    ......@@ -19,7 +21,9 @@ import org.springframework.stereotype.Service;
    import org.springframework.transaction.annotation.Transactional;
    import java.util.ArrayList;
    import java.util.HashMap;
    import java.util.List;
    import java.util.Map;
    /**
    ......@@ -98,4 +102,39 @@ public class CircleAccountServiceImpl implements CircleAccountService {
    return savedIds;
    }
    @Override
    public Map<String,Integer> createShopAccount(ShopAcctInitReq shopAcctInitReq) {
    Map<String,Integer> rtnMap = new HashMap();
    logger.info("createShopAccount:{}", JSONObject.toJSONString(shopAcctInitReq));
    List<ShopAcctInit> shopAcctInits = shopAcctInitReq.getShopAcctInitList();
    // List<Integer> savedIds = new ArrayList<>();
    try {
    for(ShopAcctInit acct : shopAcctInits){
    String encryMobile = EncryptUtils.encryptContent(acct.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE);
    Account dbAcct = accountMapper.getByMobilePhone(encryMobile); //获取医生表账号信息
    if(null == dbAcct){
    Account account = new Account();
    account.setName(acct.getUserName());
    account.setNickname(acct.getUserName());
    account.setMobilePhone(encryMobile);
    account.setRegisterSource(shopAcctInitReq.getRegisterSource());
    accountService.createAccount(account,AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode());
    // savedIds.add(account.getId().intValue());
    logger.info("createShopAccount insert {}",account.getId().intValue());
    rtnMap.put(acct.getMobile(),account.getId().intValue());
    }else {
    // savedIds.add(dbAcct.getId().intValue());
    logger.info("createShopAccount exist {}",dbAcct.getId().intValue());
    rtnMap.put(acct.getMobile(),dbAcct.getId().intValue());
    }
    }
    }catch (Exception e){
    logger.error("createShopAccount error:{}",e.getMessage());
    throw e;
    }
    return rtnMap;
    }
    }
    Markdown 格式
    0% or
    您添加了 0 人 到此讨论。请谨慎行事。
    先完成此消息的编辑！
    想要评论请 注册 或