Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git

zhangxing
2 parents d7415b50 e7afe41d
Showing 11 changed files with 101 additions and 73 deletions
src/main/java/com/diligrp/xtrade/product/dao/ShopDao.java
src/main/java/com/diligrp/xtrade/product/domain/builder/MerchantAccountBuilder.java
src/main/java/com/diligrp/xtrade/product/domain/builder/MerchantBuilder.java
src/main/java/com/diligrp/xtrade/product/repository/AccountRepository.java
src/main/java/com/diligrp/xtrade/product/repository/MerchantRepository.java
src/main/java/com/diligrp/xtrade/product/service/AccountService.java
src/main/java/com/diligrp/xtrade/product/service/ShopService.java
src/main/java/com/diligrp/xtrade/product/service/impl/AccountServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/MerchantServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/ShopServiceImpl.java
src/main/resources/mapping/com/diligrp/xtrade/product/ShopDao.xml
@@ -6,24 +6,26 @@ import org.apache.ibatis.annotations.Mapper;
 import com.diligrp.xtrade.product.domain.dto.ShopQueryDto;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
+import org.apache.ibatis.annotations.Param;
+
 /**
- * 
+ * @author yangfan
  * @ClassName: ShopDao
  * @Description 店铺dao
- * @author yangfan
  * @date 2020年4月21日
  */
 @Mapper
 public interface ShopDao {
-	
-	void insert(ShopDo shop);
-	
-	void update(ShopDo shop);
-	
-	ShopDo selectByShopId(Long shopId);
-	
-	List<ShopDo> selectByMerId(Long merId);
-	
-	List<ShopDo> selectShop(ShopQueryDto shopQueryDto);
-	
+
+    void insert(ShopDo shop);
+
+    void update(ShopDo shop);
+
+    ShopDo selectByShopId(Long shopId);
+
+    List<ShopDo> selectByMerId(Long merId);
+
+    List<ShopDo> selectShop(ShopQueryDto shopQueryDto);
+
+    void updateTypeByMerId(@Param("type") Integer type, @Param("merId") Long merId);
 }
+package com.diligrp.xtrade.product.domain.builder;
+
+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.entity.AccountDo;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Auther: miaoguoxin
+ * @Date: 2020/4/23 09:23
+ */
+public class MerchantAccountBuilder {
+
+    public static AccountDo buildDoFromMerchant(MerchantRequestDto requestDto, Long merId) {
+        String password = String.format("%s_%s",
+                requestDto.getAccountName(), requestDto.getPassword());
+        AccountDo newAccountDo = new AccountDo();
+        newAccountDo.setName(requestDto.getAccountName());
+        newAccountDo.setRealName(requestDto.getRealName());
+        newAccountDo.setPassword(Md5Utils.getMD5(password, "UTF-8"));
+        newAccountDo.setMobile(requestDto.getMobile());
+        newAccountDo.setStatus(AccountStatus.NORMAL.getCode());
+        newAccountDo.setIsAdmin(1);
+        newAccountDo.setMerId(merId);
+        newAccountDo.setCreatedTime(LocalDateTime.now());
+        return newAccountDo;
+    }
+}
@@ -16,7 +16,7 @@ import java.util.Optional;
  */
 public class MerchantBuilder {
-    public static MerchantDo request2Entity(MerchantRequestDto requestDto) {
+    public static MerchantDo buildDoFromRequest(MerchantRequestDto requestDto) {
         Integer type = Optional.ofNullable(requestDto.getAccountType())
                 .map(AccountType::getCode)
                 .orElse(0);
@@ -30,7 +30,7 @@ public class MerchantBuilder {
         return merchantDo;
     }
-    public static MerchantResponseDto entity2Response(MerchantDo merchantDo){
+    public static MerchantResponseDto buildResponseFromDo(MerchantDo merchantDo){
         MerchantResponseDto responseDto = new MerchantResponseDto();
         BeanUtils.copyProperties(merchantDo,responseDto);
         responseDto.setType(AccountType.getAccountType(merchantDo.getType()));
 package com.diligrp.xtrade.product.repository;
+import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
 import com.diligrp.xtrade.product.domain.entity.AccountDo;
 import com.diligrp.xtrade.product.domain.entity.OperatorDo;
+import com.diligrp.xtrade.shared.sequence.IKeyGenerator;
+import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import java.util.ArrayList;
@@ -15,6 +19,8 @@ import java.util.List;
 @Repository
 public class AccountRepository implements IAccountRepository {
     private final static List<AccountDo> ACCOUNT_DOS = new ArrayList<>();
+    @Autowired
+    private KeyGeneratorManager keyGeneratorManager;
     @Override
     public OperatorDo getOperator() {
         OperatorDo operatorDo = new OperatorDo();
@@ -35,6 +41,8 @@ public class AccountRepository implements IAccountRepository {
     @Override
     public void add(AccountDo accountDo) {
+        IKeyGenerator keyGenerator = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.ACCOUNT_SEQUENCE);
+        accountDo.setId(keyGenerator.nextId());
         ACCOUNT_DOS.add(accountDo);
     }
 }
@@ -48,10 +48,6 @@ public class MerchantRepository implements IMerchantRepository {
     @Override
     public void update(MerchantDo merchantDo) {
-        merchantDo.setModifiedTime(LocalDateTime.now());
-        ShopDo shopDo = new ShopDo();
-        shopDo.setType(AccountType.PUBLIC.getCode());
-        shopDo.setMerId(merchantDo.getMerId());
-        shopDao.update(shopDo);
+
     }
 }
@@ -10,7 +10,5 @@ import com.diligrp.xtrade.product.domain.entity.MerchantDo;
  */
 public interface AccountService {
-    AccountDo build(MerchantRequestDto requestDto, MerchantDo merchantDo) throws Exception;
-
-    void create(MerchantRequestDto requestDto, MerchantDo merchantDo) throws Exception;
+    void create(MerchantRequestDto requestDto, MerchantDo merchantDo);
 }
@@ -4,10 +4,11 @@ import java.util.List;
 import com.diligrp.xtrade.product.domain.dto.ShopDto;
 import com.diligrp.xtrade.product.domain.dto.ShopQueryDto;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
 public interface ShopService {
-	
+
 	/**
 	 * @Title insert
 	 * @Description 保存shop
@@ -15,18 +16,18 @@ public interface ShopService {
 	 * @throws
 	 */
 	void insert(ShopDto shop);
-	
+
 	/**
-	 * 
+	 *
 	 * @Title update
 	 * @Description 修改
 	 * @param shop
 	 * @throws
 	 */
 	void update(ShopDto shop);
-	
+
 	/**
-	 * 
+	 *
 	 * @Title selectByMerId
 	 * @Description 店铺id查询
 	 * @param merId
@@ -34,9 +35,9 @@ public interface ShopService {
 	 * @throws
 	 */
 	ShopDo selectByShopId(Long shopId);
-	
+
 	/**
-	 * 
+	 *
 	 * @Title selectByMerId
 	 * @Description 根据商户id获取名下全部商铺
 	 * @param merId
@@ -44,9 +45,9 @@ public interface ShopService {
 	 * @throws
 	 */
 	List<ShopDo> selectShopByMerId(Long merId);
-	
+
 	/**
-	 * 
+	 *
 	 * @Title selectShop
 	 * @Description 商铺查询
 	 * @param shopQuery
@@ -54,4 +55,6 @@ public interface ShopService {
 	 * @throws
 	 */
 	List<ShopDo> selectShop(ShopQueryDto shopQuery);
+
+	void updateShopTypeWithMerchant(MerchantDo merchantDo);
 }
 package com.diligrp.xtrade.product.service.impl;
-import com.alibaba.nacos.common.utils.Md5Utils;
+import com.diligrp.xtrade.product.domain.builder.MerchantAccountBuilder;
 import com.diligrp.xtrade.product.domain.dto.MerchantRequestDto;
-import com.diligrp.xtrade.product.domain.emuns.AccountStatus;
-import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
 import com.diligrp.xtrade.product.domain.entity.AccountDo;
 import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 import com.diligrp.xtrade.product.repository.IAccountRepository;
 import com.diligrp.xtrade.product.service.AccountService;
-import com.diligrp.xtrade.shared.sequence.IKeyGenerator;
-import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
-
 /**
  * @Auther: miaoguoxin
  * @Date: 2020/4/22 11:10
@@ -23,30 +17,10 @@ import java.time.LocalDateTime;
 public class AccountServiceImpl implements AccountService {
     @Autowired
     private IAccountRepository accountRepository;
-    @Autowired
-    private KeyGeneratorManager keyGeneratorManager;
-
-    @Override
-    public AccountDo build(MerchantRequestDto requestDto, MerchantDo merchantDo) throws Exception {
-        String password = String.format("%s_%s",
-                requestDto.getAccountName(), requestDto.getPassword());
-        AccountDo newAccountDo = new AccountDo();
-        newAccountDo.setName(requestDto.getAccountName());
-        newAccountDo.setRealName(requestDto.getRealName());
-        newAccountDo.setPassword(Md5Utils.getMD5(password, "UTF-8"));
-        newAccountDo.setMobile(requestDto.getMobile());
-        newAccountDo.setStatus(AccountStatus.NORMAL.getCode());
-        newAccountDo.setIsAdmin(1);
-        newAccountDo.setMerId(merchantDo.getMerId());
-        newAccountDo.setCreatedTime(LocalDateTime.now());
-        IKeyGenerator keyGenerator = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.ACCOUNT_SEQUENCE);
-        newAccountDo.setId(keyGenerator.nextId());
-        return newAccountDo;
-    }
     @Override
-    public void create(MerchantRequestDto requestDto, MerchantDo merchantDo) throws Exception {
-        AccountDo newAccountDo = this.build(requestDto, merchantDo);
+    public void create(MerchantRequestDto requestDto, MerchantDo merchantDo) {
+        AccountDo newAccountDo = MerchantAccountBuilder.buildDoFromMerchant(requestDto, merchantDo.getMerId());
         accountRepository.add(newAccountDo);
     }
@@ -13,6 +13,7 @@ import com.diligrp.xtrade.product.repository.IAccountRepository;
 import com.diligrp.xtrade.product.repository.IMerchantRepository;
 import com.diligrp.xtrade.product.service.AccountService;
 import com.diligrp.xtrade.product.service.MerchantService;
+import com.diligrp.xtrade.product.service.ShopService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,8 @@ public class MerchantServiceImpl implements MerchantService {
     private IMerchantRepository merchantRepository;
     @Autowired
     private AccountService accountService;
+    @Autowired
+    private ShopService shopService;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -38,17 +41,17 @@ public class MerchantServiceImpl implements MerchantService {
         }
         MerchantDo merchantDo = merchantRepository.getByAccountId(requestDto.getAccountId());
         if (merchantDo == null){
-            merchantDo = MerchantBuilder.request2Entity(requestDto);
+            merchantDo = MerchantBuilder.buildDoFromRequest(requestDto);
             merchantRepository.add(merchantDo);
         } else {
             if (AccountType.PERSONAL.getCode() != merchantDo.getType()){
                 throw new ProductException(ExceptionEnum.CARD_MERCHANT_CREATED);
             }
-            merchantRepository.update(merchantDo);
+            shopService.updateShopTypeWithMerchant(merchantDo);
         }
         //创建市场管理员账户
         accountService.create(requestDto, merchantDo);
-        return MerchantBuilder.entity2Response(merchantDo);
+        return MerchantBuilder.buildResponseFromDo(merchantDo);
     }
 }
 package com.diligrp.xtrade.product.service.impl;
+import java.time.LocalDateTime;
 import java.util.List;
+import com.diligrp.xtrade.product.domain.emuns.AccountType;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -68,4 +71,9 @@ public class ShopServiceImpl implements ShopService {
 		return shops;
 	}
+	@Override
+	public void updateShopTypeWithMerchant(MerchantDo merchantDo) {
+		shopDao.updateTypeByMerId(AccountType.PUBLIC.getCode(), merchantDo.getMerId());
+	}
+
 }
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diligrp.xtrade.product.dao.ShopDao">
- 
+
  	<sql id="QUERY_COLUMN_LIST">
 		<![CDATA[
 		`id`, `shop_id` AS shopId, `shop_name` AS shopName, `address`, `mer_id` AS merId, `type`, `status`,
@@ -33,7 +33,7 @@
 			<if test="selfShop != null and selfShop != ''"><![CDATA[AND self_shop = #{selfShop}]]></if>
 		</where>
 	</sql>
-	
+
 	<insert id="insert" parameterType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[
 			INSERT INTO `xt_shop`(`id`, `shop_id`, `shop_name`, `self_shop`, `mer_id`, `main_biz`, `type`, `status`, `address`, `description`, `created_time`, `modified_time`)
@@ -42,21 +42,27 @@
 	</insert>
 	<select id="selectByShopId" parameterType="long" resultType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[
-			SELECT 
+			SELECT
 		]]>
 			<include refid="QUERY_COLUMN_LIST" />
 		<![CDATA[
 			FROM `xt_shop` WHERE shop_id = #{shopId}
 		]]>
 	</select>
-	<update id="update" parameterType="com.diligrp.xtrade.product.domain.entity.ShopDo"> 
+	<update id="update" parameterType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[UPDATE `xt_shop`]]>
 		<include refid="UPDATE_COLUMN_SET" />
 		<![CDATA[WHERE shop_id = #{shopId}]]>
 	</update>
- 	<select id="selectByMerId" parameterType="long" resultType="com.diligrp.xtrade.product.domain.entity.ShopDo">
+	<update id="updateTypeByMerId">
+		UPDATE xt_shop
+		SET type          = #{type},
+			modified_time = now()
+		WHERE mer_id = #{merId}
+	</update>
+	<select id="selectByMerId" parameterType="long" resultType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[
-			SELECT 
+			SELECT
 		]]>
 			<include refid="QUERY_COLUMN_LIST" />
 		<![CDATA[
@@ -65,12 +71,12 @@
 	</select>
 	<select id="selectShop" parameterType="com.diligrp.xtrade.product.domain.dto.ShopQueryDto" resultType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[
-			SELECT 
+			SELECT
 		]]>
 			<include refid="QUERY_COLUMN_LIST" />
 		<![CDATA[
-			FROM `xt_shop` 
+			FROM `xt_shop`
 		]]>
 			<include refid="QUERY_WHERE_CLAUSE" />
 	</select>
-</mapper>
 \ No newline at end of file
+</mapper>