merchant测试

miaoguoxin
1 parent c5984e0d
Showing 16 changed files with 241 additions and 140 deletions
pom.xml
src/main/java/com/diligrp/xtrade/product/domain/converter/MerchantConverter.java → src/main/java/com/diligrp/xtrade/product/domain/builder/MerchantBuilder.java
src/main/java/com/diligrp/xtrade/product/domain/dto/MerchantRequestDto.java
src/main/java/com/diligrp/xtrade/product/domain/emuns/AccountType.java
src/main/java/com/diligrp/xtrade/product/domain/emuns/IKeyGeneratorKeys.java
src/main/java/com/diligrp/xtrade/product/repository/AccountRepository.java
src/main/java/com/diligrp/xtrade/product/service/impl/AccountServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/CategoryServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/MerchantServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/ProductServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/ShopServiceImpl.java
src/main/resources/ValidationMessages.properties
src/main/resources/mapping/com/diligrp/xtrade/product/MerchantDao.xml
src/test/java/com/diligrp/BaseTests.java
src/test/java/com/diligrp/xtrade/product/controllor/MerchantControllerTest.java
src/test/java/com/diligrp/xtrade/product/service/MerchantServiceTest.java
@@ -26,7 +26,7 @@
 	</properties>
 	<dependencies>
-	
+
 		<dependency>
 			<groupId>com.diligrp</groupId>
 			<artifactId>xtrade-shared-spring-boot-starter</artifactId>
@@ -38,7 +38,7 @@
        		<artifactId>xxl-job-core</artifactId>
        		<version>${xxl-job.version}</version>
  		</dependency> -->
-		
+
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
@@ -54,13 +54,13 @@
 			<artifactId>nacos-client</artifactId>
 			<version>${nacos-client.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.alibaba.nacos</groupId>
 			<artifactId>nacos-api</artifactId>
 			<version>${nacos-client.version}</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
@@ -118,12 +118,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 	</dependencies>
-package com.diligrp.xtrade.product.domain.converter;
+package com.diligrp.xtrade.product.domain.builder;
 import com.diligrp.xtrade.product.domain.dto.MerchantRequestDto;
 import com.diligrp.xtrade.product.domain.dto.MerchantResponseDto;
@@ -15,23 +15,23 @@ import java.util.Optional;
  * @Date: 2020/4/22 09:10
  * @Description: 用于merchant的实体转换
  */
-@Component
-public class MerchantConverter {
+public class MerchantBuilder {
-    public Merchant request2Entity(MerchantRequestDto requestDto) {
+    public static Merchant request2Entity(MerchantRequestDto requestDto) {
         Integer type = Optional.ofNullable(requestDto.getAccountType())
                 .map(AccountType::getCode)
                 .orElse(0);
         Merchant merchant = new Merchant();
         merchant.setMerName(requestDto.getMerchantName());
         merchant.setAccountId(requestDto.getAccountId());
+        merchant.setAccountName(requestDto.getAccountName());
         merchant.setType(type);
         merchant.setDescription(requestDto.getAddress());
         merchant.setStatus(MerchantStatus.NORMAL.getType());
         return merchant;
     }
-    public MerchantResponseDto entity2Response(Merchant merchant){
+    public static MerchantResponseDto entity2Response(Merchant merchant){
         MerchantResponseDto responseDto = new MerchantResponseDto();
         BeanUtils.copyProperties(merchant,responseDto);
         responseDto.setType(AccountType.getAccountType(merchant.getType()));
@@ -18,12 +18,15 @@ public class MerchantRequestDto implements Serializable {
     /**真实名字*/
     private transient String realName;
     /**用户名字*/
-    @NotBlank(message = "{merchant.user_name.not.blank}", groups = Constant.InsertGroup.class)
+    @NotBlank(message = "{account_name.not.blank}", groups = Constant.InsertGroup.class)
     @Pattern(regexp = "^[a-zA-Z0-9\u4E00-\u9FA5._,:-]*$",message = "{illegal.pattern}",groups = Constant.InsertGroup.class)
-    private String userName;
+    private String accountName;
     /**密码*/
+    @NotBlank(message = "{account_password.not.blank}", groups = Constant.InsertGroup.class)
+    @Pattern(regexp = "^[a-zA-Z0-9\u4E00-\u9FA5._,:-]*$",message = "{illegal.pattern}",groups = Constant.InsertGroup.class)
     private String password;
     /**电话*/
+    @Pattern(regexp = "^[1][3,4,5,8][0-9]{9}$",message = "{phone.pattern}",groups = Constant.InsertGroup.class)
     private String mobile;
     /**账户类型*/
     @NotNull(message = "{account_type.not.null}", groups = Constant.InsertGroup.class)
@@ -51,12 +54,12 @@ public class MerchantRequestDto implements Serializable {
         this.accountId = accountId;
     }
-    public String getUserName() {
-        return userName;
+    public String getAccountName() {
+        return accountName;
     }
-    public void setUserName(String userName) {
-        this.userName = userName;
+    public void setAccountName(String accountName) {
+        this.accountName = accountName;
     }
     public String getPassword() {
@@ -16,7 +16,7 @@ public enum  AccountType implements IEnumType {
     PUBLIC(20, "对公账户"),
     /**临时卡用*/
-    Anonymous(30, "不记名");
+    ANONYMOUS(30, "不记名");
     private int code;
     private String name;
@@ -8,6 +8,7 @@ package com.diligrp.xtrade.product.domain.emuns;
  * @date 2020年4月21日
  */
 public enum IKeyGeneratorKeys {
+	CATEGORY_SEQUENCE("category_sequence","品类id"),
 	SHOP_SEQUENCE("SHOP_SEQUENCE","店铺id"),
 	MERCHANT_SEQUENCE("MERCHANT_SEQUENCE","市场id"),
 	ACCOUNT_SEQUENCE("ACCOUNT_SEQUENCE","账号id")
@@ -17,7 +17,13 @@ public class AccountRepository implements IAccountRepository {
     private final static List<Account> ACCOUNTS = new ArrayList<>();
     @Override
     public Operator getOperator() {
-        return new Operator();
+        Operator operator = new Operator();
+        operator.setAccount("miao");
+        operator.setName("缪");
+        operator.setAccountId(1L);
+        operator.setMerAccountId(10000L);
+        operator.setAdmin(true);
+        return operator;
     }
     @Override
 package com.diligrp.xtrade.product.service.impl;
+import com.alibaba.nacos.common.utils.Md5Utils;
 import com.diligrp.xtrade.product.domain.dto.MerchantRequestDto;
 import com.diligrp.xtrade.product.domain.emuns.AccountStatus;
 import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
@@ -28,11 +29,12 @@ public class AccountServiceImpl implements AccountService {
     @Override
     public Account build(MerchantRequestDto requestDto, Merchant merchant) throws Exception {
+        String password = String.format("%s_%s",
+                requestDto.getAccountName(), requestDto.getPassword());
         Account newAccount = new Account();
-        newAccount.setName(requestDto.getUserName());
+        newAccount.setName(requestDto.getAccountName());
         newAccount.setRealName(requestDto.getRealName());
-        newAccount.setPassword(PasswordUtils.encrypt(requestDto.getPassword(),
-                requestDto.getUserName()));
+        newAccount.setPassword(Md5Utils.getMD5(password, "UTF-8"));
         newAccount.setMobile(requestDto.getMobile());
         newAccount.setStatus(AccountStatus.NORMAL.getCode());
         newAccount.setIsAdmin(1);
@@ -48,4 +50,5 @@ public class AccountServiceImpl implements AccountService {
         Account newAccount = this.build(requestDto, merchant);
         accountRepository.add(newAccount);
     }
+
 }
-package com.diligrp.xtrade.product.service.impl;
-
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.diligrp.xtrade.product.dao.CategoryDao;
-import com.diligrp.xtrade.product.domain.dto.CategoryDto;
-import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
-import com.diligrp.xtrade.product.domain.entity.CategoryDo;
-import com.diligrp.xtrade.product.service.CategoryService;
-import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
-
-/**
- * @ClassName: CategoryServiceImpl
- * @Description TODO(用一句话描述该文件做什么)
- * @author yangfan
- * @date 2020年4月20日
- */
-@Service("categoryService")
-public class CategoryServiceImpl implements CategoryService {
-	
-	@Autowired
-	private KeyGeneratorManager keyGeneratorManager;
-	@Autowired
-	private CategoryDao categoryDao;
-	
-	@Override
-	public void insert(CategoryDto category) {
-		CategoryDo categoryDo = new CategoryDo();
-		BeanUtils.copyProperties(category, categoryDo);
-		long id = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.CATEGORY_SEQUENCE).nextId();
-		String cateCode = ""+id;
-		if (StringUtils.isNotBlank(category.getParentId())) {
-			CategoryDo pCategoryDo =  selectEntityById(Long.valueOf(category.getParentId()));
-			cateCode = String.format("%s_%d", pCategoryDo.getCateCode(),id);
-		}
-		categoryDo.setCateCode(cateCode);
-		categoryDao.insert(categoryDo);
-	} 
-	
-	@Override
-	public void update(CategoryDto category) {
-		CategoryDo categoryDo = new CategoryDo();
-		BeanUtils.copyProperties(category, categoryDo);
-		categoryDao.update(categoryDo);
-	}
-
-	@Override
-	public void delectById(Long id) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public CategoryDo selectEntityById(Long id) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public List<CategoryDo> selectList(CategoryDto category) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
+package com.diligrp.xtrade.product.service.impl;
+
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.diligrp.xtrade.product.dao.CategoryDao;
+import com.diligrp.xtrade.product.domain.dto.CategoryDto;
+import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
+import com.diligrp.xtrade.product.domain.entity.CategoryDo;
+import com.diligrp.xtrade.product.service.CategoryService;
+import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
+
+/**
+ * @ClassName: CategoryServiceImpl
+ * @Description TODO(用一句话描述该文件做什么)
+ * @author yangfan
+ * @date 2020年4月20日
+ */
+@Service("categoryService")
+public class CategoryServiceImpl implements CategoryService {
+
+	@Autowired
+	private KeyGeneratorManager keyGeneratorManager;
+	@Autowired
+	private CategoryDao categoryDao;
+
+	@Override
+	public void insert(CategoryDto category) {
+		CategoryDo categoryDo = new CategoryDo();
+		BeanUtils.copyProperties(category, categoryDo);
+		long id = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.CATEGORY_SEQUENCE).nextId();
+		String cateCode = ""+id;
+		if (StringUtils.isNotBlank(category.getParentId())) {
+			CategoryDo pCategoryDo =  selectEntityById(Long.valueOf(category.getParentId()));
+			cateCode = String.format("%s_%d", pCategoryDo.getCateCode(),id);
+		}
+		categoryDo.setCateCode(cateCode);
+		categoryDao.insert(categoryDo);
+	}
+
+	@Override
+	public void update(CategoryDto category) {
+		CategoryDo categoryDo = new CategoryDo();
+		BeanUtils.copyProperties(category, categoryDo);
+		categoryDao.update(categoryDo);
+	}
+
+	@Override
+	public void delectById(Long id) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public CategoryDo selectEntityById(Long id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<CategoryDo> selectList(CategoryDto category) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
 package com.diligrp.xtrade.product.service.impl;
-import com.diligrp.xtrade.product.domain.converter.MerchantConverter;
+import com.diligrp.xtrade.product.domain.builder.MerchantBuilder;
 import com.diligrp.xtrade.product.domain.dto.MerchantRequestDto;
 import com.diligrp.xtrade.product.domain.dto.MerchantResponseDto;
 import com.diligrp.xtrade.product.domain.emuns.AccountType;
@@ -24,8 +24,6 @@ public class MerchantServiceImpl implements MerchantService {
     @Autowired
     private IMerchantRepository merchantRepository;
     @Autowired
-    private MerchantConverter merchantConverter;
-    @Autowired
     private AccountService accountService;
     @Override
@@ -34,13 +32,13 @@ public class MerchantServiceImpl implements MerchantService {
         Operator operator = accountRepository.getOperator();
         requestDto.setAccountId(operator.getAccountId());
         requestDto.setRealName(operator.getName());
-        Account account = accountRepository.getAccountByName(requestDto.getUserName());
+        Account account = accountRepository.getAccountByName(requestDto.getAccountName());
         if (account != null) {
             throw new ProductException(ResponseCode.ACCOUNT_EXIST);
         }
         Merchant merchant = merchantRepository.getByAccountId(requestDto.getAccountId());
         if (merchant == null){
-            merchant = merchantConverter.request2Entity(requestDto);
+            merchant = MerchantBuilder.request2Entity(requestDto);
             merchantRepository.add(merchant);
         } else {
             if (AccountType.PERSONAL.getCode() != merchant.getType()){
@@ -50,7 +48,7 @@ public class MerchantServiceImpl implements MerchantService {
         }
         //创建市场管理员账户
         accountService.create(requestDto,merchant);
-        return merchantConverter.entity2Response(merchant);
+        return MerchantBuilder.entity2Response(merchant);
     }
 }
@@ -14,7 +14,7 @@ public class ProductServiceImpl implements ProductService {
 	@Override
 	public void createProduct(ProductCreateRequestDto productCreateRequestDto) {
-		
+
 	}
 	@Override
@@ -20,7 +20,7 @@ public class ShopServiceImpl implements ShopService {
 	private ShopDao shopDao;
 	@Autowired
 	private KeyGeneratorManager KeyGeneratorManager;
-	
+
 	@Override
 	public void insert(ShopDto shop) {
 		ShopDo shopDo = new ShopDo();
+illegal.pattern=\u542B\u6709\u975E\u6CD5\u5B57\u7B26
+phone.pattern=\u7535\u8BDD\u53F7\u7801\u4E0D\u6B63\u786E
+account_name.not.blank=\u8D26\u6237\u540D\u5B57\u4E0D\u80FD\u4E3A\u7A7A
+account_password.not.blank=\u8D26\u6237\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
+account_type.not.null=\u8D26\u6237\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+merchant_name.not.blank=\u5E02\u573A\u540D\u5B57\u4E0D\u80FD\u4E3A\u7A7A
@@ -28,37 +28,67 @@
         created_time,
         modified_time
     </sql>
-    <sql id="Base_Condition_Column">
-        <if test="merId != null">
+    <sql id="UPDATE_Column">
+        <set> <if test="merId != null">
             mer_id = #{merId},
         </if>
-        <if test="merName != null and merName != ''">
-            mer_name = #{merName},
-        </if>
-        <if test="marketId != null and marketId != ''">
-            market_id = #{marketId},
-        </if>
-        <if test="accountId != null">
-            account_id = #{accountId},
-        </if>
-        <if test="accountName != null and accountName != ''">
-            account_name = #{accountName},
-        </if>
-        <if test="type != null">
-            type = #{type},
-        </if>
-        <if test="status != null">
-            `status` = #{status},
-        </if>
-        <if test="description != null and description != ''">
-            `description` = #{description},
-        </if>
-        <if test="createdTime != null">
-            created_time = #{createdTime},
-        </if>
-        <if test="modifiedTime != null">
-            modified_time = #{modifiedTime},
-        </if>
+            <if test="merName != null and merName != ''">
+                mer_name = #{merName},
+            </if>
+            <if test="marketId != null and marketId != ''">
+                market_id = #{marketId},
+            </if>
+            <if test="accountId != null">
+                account_id = #{accountId},
+            </if>
+            <if test="accountName != null and accountName != ''">
+                account_name = #{accountName},
+            </if>
+            <if test="type != null">
+                type = #{type},
+            </if>
+            <if test="status != null">
+                `status` = #{status},
+            </if>
+            <if test="description != null and description != ''">
+                `description` = #{description},
+            </if>
+            <if test="createdTime != null">
+                created_time = #{createdTime},
+            </if>
+            <if test="modifiedTime != null">
+                modified_time = #{modifiedTime},
+            </if>
+        </set>
+    </sql>
+
+    <sql id="WHERE_COLUMN">
+        <where>
+            <if test="merId != null">
+                and mer_id = #{merId}
+            </if>
+            <if test="merName != null and merName != ''">
+                and mer_name = #{merName}
+            </if>
+            <if test="marketId != null and marketId != ''">
+                and market_id = #{marketId}
+            </if>
+            <if test="accountId != null">
+                and account_id = #{accountId}
+            </if>
+            <if test="accountName != null and accountName != ''">
+                and account_name = #{accountName}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+            <if test="status != null">
+                and `status` = #{status}
+            </if>
+            <if test="description != null and description != ''">
+                and `description` = #{description}
+            </if>
+        </where>
     </sql>
     <!--查询单个-->
@@ -81,15 +111,13 @@
         SELECT
         <include refid="Base_Column"/>
         from xt_merchant
-        <where>
-            <include refid="Base_Condition_Column"/>
-        </where>
+        <include refid="WHERE_COLUMN"/>
     </select>
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into xt_merchant(mer_id, mer_name, market_id, account_id, account_name, type, status, description,
-                                             created_time, modified_time)
+                                created_time, modified_time)
         values (#{merId}, #{merName}, #{marketId}, #{accountId}, #{accountName}, #{type}, #{status}, #{description},
                 #{createdTime}, #{modifiedTime})
     </insert>
@@ -97,9 +125,7 @@
     <!--通过主键修改数据-->
     <update id="update">
         update xt_merchant
-        <set>
-            <include refid="Base_Condition_Column"/>
-        </set>
+       <include refid="UPDATE_Column"/>
         where id = #{id}
     </update>
+package com.diligrp;
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @Auther: miaoguoxin
+ * @Date: 2019/7/18 21:42
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class BaseTests {
+
+}
+package com.diligrp.xtrade.product.controllor;
+
+import com.diligrp.BaseTests;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @Auther: miaoguoxin
+ * @Date: 2020/4/22 13:58
+ */
+class MerchantControllerTest extends BaseTests {
+
+    @Test
+    void save() {
+
+    }
+}
+package com.diligrp.xtrade.product.service;
+
+import com.diligrp.BaseTests;
+import com.diligrp.xtrade.product.domain.dto.MerchantRequestDto;
+import com.diligrp.xtrade.product.service.MerchantService;
+import com.diligrp.xtrade.shared.util.JsonUtils;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @Auther: miaoguoxin
+ * @Date: 2020/4/22 13:59
+ * @Description:
+ */
+class MerchantServiceTest extends BaseTests {
+    @Autowired
+    private MerchantService merchantService;
+    @Test
+    void create() throws Exception {
+        String mockJson = "{\n" +
+                "  \"accountName\": \"test1\",\n" +
+                "  \"password\": \"123456\",\n" +
+                "  \"mobile\": \"135446546546\",\n" +
+                "  \"accountType\": 20,\n" +
+                "  \"merchantName\": \"测试商户\",\n" +
+                "  \"address\": \"成都市\"\n" +
+                "}";
+        MerchantRequestDto requestDto = JsonUtils.fromJsonString(mockJson, MerchantRequestDto.class);
+        merchantService.create(requestDto);
+    }
+}