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

yangfan
2 parents 1f52991a 4833e3c3
Showing 34 changed files with 541 additions and 350 deletions
pom.xml
src/main/java/com/diligrp/xtrade/order/dao/OrderItemDao.java
src/main/java/com/diligrp/xtrade/order/domain/builder/DefaultOrderBuilder.java
src/main/java/com/diligrp/xtrade/order/domain/builder/DefaultOrderCreator.java
src/main/java/com/diligrp/xtrade/order/domain/entity/OrderDo.java
src/main/java/com/diligrp/xtrade/order/rpc/feign/AccountResolver.java
src/main/java/com/diligrp/xtrade/order/service/OrderService.java
src/main/java/com/diligrp/xtrade/order/service/impl/OrderServiceImpl.java
src/main/java/com/diligrp/xtrade/product/controllor/MerchantController.java
src/main/java/com/diligrp/xtrade/product/dao/MerchantDao.java
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/domain/entity/Account.java → src/main/java/com/diligrp/xtrade/product/domain/entity/AccountDo.java
src/main/java/com/diligrp/xtrade/product/domain/entity/Merchant.java → src/main/java/com/diligrp/xtrade/product/domain/entity/MerchantDo.java
src/main/java/com/diligrp/xtrade/product/domain/entity/Operator.java → src/main/java/com/diligrp/xtrade/product/domain/entity/OperatorDo.java
src/main/java/com/diligrp/xtrade/product/domain/entity/Product.java → src/main/java/com/diligrp/xtrade/product/domain/entity/ProductDo.java
src/main/java/com/diligrp/xtrade/product/repository/AccountRepository.java
src/main/java/com/diligrp/xtrade/product/repository/IAccountRepository.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>
@@ -44,7 +44,7 @@ public interface OrderItemDao {
 	 * @return
 	 * @throws
 	 */
-	List<OrderItemDo> selectOrderItemByOrderId(@Param("orderId") Long orderId);
+	List<OrderItemDo> selectItemsByOrderId(@Param("orderId") Long orderId);
 	/**
 	 * 
+package com.diligrp.xtrade.order.domain.builder;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+import com.diligrp.xtrade.order.domain.dto.AccountDto;
+import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
+import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
+import com.diligrp.xtrade.order.domain.emuns.OrderType;
+import com.diligrp.xtrade.order.domain.emuns.SaleUnit;
+import com.diligrp.xtrade.order.domain.emuns.TradeType;
+import com.diligrp.xtrade.order.domain.entity.OrderDo;
+import com.diligrp.xtrade.order.domain.entity.OrderItemDo;
+import com.diligrp.xtrade.order.exception.OrderException;
+
+/**
+ * @ClassName: DefaultOrderCreator
+ * @Description 订单实体相关模型
+ * @author zhangxing
+ * @date 2020年4月21日
+ */
+public class DefaultOrderBuilder {
+	
+	/**
+	 * 构建初始订单数据  TODO need modify because of change
+	 */
+	public static OrderDo initializeOrderBaseData(Long orderId, AccountDto saccountDto, Integer createSrc) {
+		OrderDo order = new OrderDo();
+		order.setOrderId(orderId);
+		order.setBaccount(saccountDto.getAccountId());
+		order.setSname(saccountDto.getAccountName());
+		order.setSmobile(saccountDto.getMobile());
+		order.setScardType(saccountDto.getType());
+		order.setCreatedSrc(createSrc);
+		order.setOrderType(OrderType.NORMAL.getCode());
+		order.setTradeType(TradeType.NORMAL.getCode());
+		order.setMarketCode("SYDEV");
+		return order;
+	}
+	
+	/**
+	 * 订单详情初始化数据 TODO need modify because of change
+	 */
+	public static OrderItemDo initializeItemData(Long itemId, Long orderId, OrderItemDto orderItem){
+		OrderItemDo orderItemDo = new OrderItemDo();
+		orderItemDo.setItemId(itemId);
+		orderItemDo.setOrderId(orderId);
+		orderItemDo.setProductId(orderItem.getPid());
+		orderItemDo.setProductName(orderItem.getPname());
+		// 销售单价
+		BigDecimal price = BigDecimal.valueOf(orderItem.getPrice());
+		// 销售数量
+		BigDecimal amount = BigDecimal.valueOf(orderItem.getAmount());
+
+		orderItemDo.setAmount(orderItem.getAmount());
+
+		BigDecimal tempWeight = BigDecimal.valueOf(0.0D);
+
+		if (SaleUnit.KILO.getCode() == orderItem.getSaleUnit()) {
+			tempWeight = BigDecimal.valueOf(orderItem.getAmount());
+		} else if (SaleUnit.PIECE.getCode() == orderItem.getSaleUnit()) {
+			if (orderItem.getUnitWeight() == null || orderItem.getUnitWeight() < 0) {
+				throw new OrderException(String.format("%s件重非法", orderItem.getPname()));
+			}
+			BigDecimal dKiloPerItem = BigDecimal.valueOf(orderItem.getUnitWeight());
+			tempWeight = amount.multiply(dKiloPerItem);
+		}
+		orderItemDo.setWeight(tempWeight.doubleValue());
+		Long itemMoney = price.multiply(amount).setScale(0, RoundingMode.HALF_UP).longValue();
+		orderItemDo.setMoney(itemMoney);
+		return orderItemDo;
+	}
+
+	/**
+	 * 构建基本的订单详情数据   TODO need modify because of change
+	 */
+	public static OrderQueryResponseDto buildOrderDetail(OrderDo order,
+			List<OrderItemDo> orderItem) {
+		OrderQueryResponseDto orderQueryResponseDto = new OrderQueryResponseDto();
+		return orderQueryResponseDto;
+	}
+	
+}
-package com.diligrp.xtrade.order.domain.builder;
-
-import org.springframework.beans.BeanUtils;
-
-import com.diligrp.xtrade.order.domain.dto.AccountDto;
-import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
-import com.diligrp.xtrade.order.domain.entity.OrderDo;
-
-/**
- * @ClassName: DefaultOrderCreator
- * @Description 订单实体相关模型
- * @author zhangxing
- * @date 2020年4月21日
- */
-public class DefaultOrderCreator {
-	
-	//最终订单数据
-	private OrderDo order;
-	
-	//订单创建请求实体
-	private OrderCreateRequestDto orderCreateRequestDto;
-	
-	//卖家实体
-	private AccountDto saccountDto;
-	
-	//买家实体
-	private AccountDto baccountDto;
-	
-	//无参构造器
-	public DefaultOrderCreator(){
-		
-	}
-	
-	public DefaultOrderCreator(OrderCreateRequestDto orderCreateRequestDto, AccountDto saccountDto, AccountDto baccountDto){
-		this.orderCreateRequestDto = orderCreateRequestDto;
-		this.baccountDto = baccountDto;
-		this.saccountDto = saccountDto;
-	}
-	
-	/**
-	 * 初始化订单数据用于后面的校验
-	 */
-	public void initialize() {
-		
-	}
-	
-	public OrderDo getOrder() {
-		return order;
-	}
-
-	public void setOrder(OrderDo order) {
-		this.order = order;
-	}
-
-	public OrderCreateRequestDto getOrderCreateRequestDto() {
-		return orderCreateRequestDto;
-	}
-
-	public void setOrderCreateRequestDto(OrderCreateRequestDto orderCreateRequestDto) {
-		this.orderCreateRequestDto = orderCreateRequestDto;
-	}
-
-	public AccountDto getSaccountDto() {
-		return saccountDto;
-	}
-
-	public void setSaccountDto(AccountDto saccountDto) {
-		this.saccountDto = saccountDto;
-	}
-
-	public AccountDto getBaccountDto() {
-		return baccountDto;
-	}
-
-	public void setBaccountDto(AccountDto baccountDto) {
-		this.baccountDto = baccountDto;
-	}
-	
-	public static OrderDo build(OrderCreateRequestDto orderCreateRequestDto) {
-		OrderDo orderDo = new OrderDo();
-		BeanUtils.copyProperties(orderCreateRequestDto, orderDo);
-		return orderDo;
-	}
-}
@@ -70,6 +70,9 @@ public class OrderDo extends BaseDo{
 	//订单类型
 	private Integer orderType;
+	
+	//订单类型
+	private Integer tradeType;
 	//支付方式
 	private Integer payType;
@@ -263,6 +266,14 @@ public class OrderDo extends BaseDo{
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
 	}
+
+	public Integer getTradeType() {
+		return tradeType;
+	}
+
+	public void setTradeType(Integer tradeType) {
+		this.tradeType = tradeType;
+	}
 }
+package com.diligrp.xtrade.order.rpc.feign;
+
+import javax.annotation.Resource;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+import com.diligrp.xtrade.order.domain.dto.AccountDto;
+import com.diligrp.xtrade.order.exception.OrderException;
+import com.diligrp.xtrade.shared.domain.Message;
+
+/**
+ * @ClassName: AccountResolver
+ * @Description 远程卡务调用解析
+ * @author zhangxing
+ * @date 2020年4月22日
+ */
+@Component
+public class AccountResolver {
+
+	@Resource
+	private AccountRPC accountRPC;
+
+	/**
+	 * 根据id获取账户信息
+	 */
+	public AccountDto getAccount(Long accountId) {
+		Message<AccountDto> message = accountRPC.getDltAccount(accountId);
+		if (!HttpStatus.OK.equals(message.getCode())) {
+			throw new OrderException(message.getMessage());
+		}
+		return message.getData();
+	}
+}
@@ -19,7 +19,7 @@ public interface OrderService {
 	 * @Title createOrder
 	 * @Description 创建订单
 	 */
-	void createOrder(OrderCreateRequestDto orderCreateRequestDto);
+	void createOrder(OrderCreateRequestDto orderCreateDto);
 	/**
 	 * @Title orderLists
 package com.diligrp.xtrade.order.service.impl;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -7,38 +8,66 @@ import javax.annotation.Resource;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import com.diligrp.xtrade.order.dao.OrderDao;
-import com.diligrp.xtrade.order.domain.builder.DefaultOrderCreator;
+import com.diligrp.xtrade.order.dao.OrderItemDao;
+import com.diligrp.xtrade.order.domain.builder.DefaultOrderBuilder;
+import com.diligrp.xtrade.order.domain.dto.AccountDto;
 import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
+import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
 import com.diligrp.xtrade.order.domain.dto.OrderQueryRequestDto;
 import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
 import com.diligrp.xtrade.order.domain.emuns.IdGenerator;
 import com.diligrp.xtrade.order.domain.entity.OrderDo;
+import com.diligrp.xtrade.order.domain.entity.OrderItemDo;
+import com.diligrp.xtrade.order.rpc.feign.AccountResolver;
 import com.diligrp.xtrade.order.service.OrderService;
 import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
 @Service("orderService")
 public class OrderServiceImpl implements OrderService {
-	
-	@Resource 
+
+	@Resource
 	private OrderDao orderDao;
-	
-	@Resource 
-	KeyGeneratorManager keyGeneratorManager;
-	
+
+	@Resource
+	private OrderItemDao orderItemDao;
+
+	@Resource
+	private KeyGeneratorManager keyGeneratorManager;
+
+	@Resource
+	private AccountResolver accountResolver;
+
+	// TODO need modify because of change
 	@Override
-	public void createOrder(OrderCreateRequestDto orderCreateRequestDto) {
-		OrderDo order = DefaultOrderCreator.build(orderCreateRequestDto);
-		order.setOrderId(keyGeneratorManager.getKeyGenerator(IdGenerator.ORDER_SEQUENCE).nextId());
+	@Transactional(rollbackFor = Exception.class)
+	public void createOrder(OrderCreateRequestDto orderCreateDto) {
+		Long orderId = getOrderKey();
+		AccountDto saccountDto = accountResolver.getAccount(orderCreateDto.getSaccount());
+		OrderDo order = DefaultOrderBuilder.initializeOrderBaseData(orderId, saccountDto,
+				orderCreateDto.getCreatedSrc());
+		Long totalMoney = 0L;
+		BigDecimal weight = BigDecimal.valueOf(0.0D);
+		List<OrderItemDo> orderItemDos = new ArrayList<OrderItemDo>();
+		for (OrderItemDto orderItem : orderCreateDto.getItems()) {
+			// 订单详情数据封装
+			OrderItemDo orderItemDo = DefaultOrderBuilder.initializeItemData(getOrderItemKey(), orderId, orderItem);
+			totalMoney += orderItemDo.getMoney();
+			weight = weight.add(BigDecimal.valueOf(orderItemDo.getWeight()));
+			orderItemDos.add(orderItemDo);
+		}
+		orderItemDao.insertBatch(orderItemDos);
 		orderDao.insertEntity(order);
 	}
+	// TODO need modify because of change
 	@Override
 	public List<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto) {
 		OrderDo order = new OrderDo();
 		BeanUtils.copyProperties(orderQueryRequestDto, order);
-		List<OrderDo>  orderDos = orderDao.selectEntryList(order);
+		List<OrderDo> orderDos = orderDao.selectEntryList(order);
 		List<OrderQueryResponseDto> roResponseDtos = new ArrayList<OrderQueryResponseDto>();
 		for (OrderDo orderDo : orderDos) {
 			OrderQueryResponseDto orderQueryResponseDto = new OrderQueryResponseDto();
@@ -48,12 +77,26 @@ public class OrderServiceImpl implements OrderService {
 		return roResponseDtos;
 	}
+	// TODO need modify because of change
 	@Override
 	public OrderQueryResponseDto orderDetail(Long orderId) {
-		OrderDo order = orderDao.selectEntityByOrderId(orderId);
-		OrderQueryResponseDto queryResponseDto = new OrderQueryResponseDto();
-		BeanUtils.copyProperties(order, queryResponseDto);
-		return queryResponseDto;
+		OrderQueryResponseDto orderQueryResponseDto = DefaultOrderBuilder
+				.buildOrderDetail(orderDao.selectEntityByOrderId(orderId), orderItemDao.selectItemsByOrderId(orderId));
+		return orderQueryResponseDto;
+	}
+
+	/**
+	 * 获取订单业务主键
+	 */
+	private Long getOrderKey() {
+		return keyGeneratorManager.getKeyGenerator(IdGenerator.ORDER_SEQUENCE).nextId();
+	}
+
+	/**
+	 * 获取订单详情主键
+	 */
+	private Long getOrderItemKey() {
+		return keyGeneratorManager.getKeyGenerator(IdGenerator.ORDER_ITEM_SEQUENCE).nextId();
 	}
 }
@@ -24,6 +24,11 @@ public class MerchantController {
     @Autowired
     private MerchantService merchantService;
+    /**
+    * 新建市场
+    * @author miaoguoxin
+    * @date 2020/4/22
+    */
     @PostMapping("/save")
     public Message<MerchantResponseDto> save(@RequestBody @Validated(Constant.InsertGroup.class)
                                                      MerchantRequestDto requestDto) throws Exception {
 package com.diligrp.xtrade.product.dao;
-import com.diligrp.xtrade.product.domain.entity.Merchant;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 public interface MerchantDao {
-    Merchant findById(Long id);
+    MerchantDo findById(Long id);
-    List<Merchant> findPage(@Param("offset") int offset, @Param("limit") int limit);
+    List<MerchantDo> findPage(@Param("offset") int offset, @Param("limit") int limit);
-    List<Merchant> findByCondition(Merchant xtMerchant);
+    List<MerchantDo> findByCondition(MerchantDo xtMerchantDo);
-    int insert(Merchant merchant);
+    int insert(MerchantDo merchantDo);
-    int update(Merchant xtMerchant);
+    int update(MerchantDo xtMerchantDo);
     int deleteById(Long id);
-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;
 import com.diligrp.xtrade.product.domain.emuns.AccountType;
 import com.diligrp.xtrade.product.domain.emuns.MerchantStatus;
-import com.diligrp.xtrade.product.domain.entity.Merchant;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
 import java.util.Optional;
@@ -15,26 +14,26 @@ 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 MerchantDo 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.setType(type);
-        merchant.setDescription(requestDto.getAddress());
-        merchant.setStatus(MerchantStatus.NORMAL.getType());
-        return merchant;
+        MerchantDo merchantDo = new MerchantDo();
+        merchantDo.setMerName(requestDto.getMerchantName());
+        merchantDo.setAccountId(requestDto.getAccountId());
+        merchantDo.setAccountName(requestDto.getAccountName());
+        merchantDo.setType(type);
+        merchantDo.setDescription(requestDto.getAddress());
+        merchantDo.setStatus(MerchantStatus.NORMAL.getType());
+        return merchantDo;
     }
-    public MerchantResponseDto entity2Response(Merchant merchant){
+    public static MerchantResponseDto entity2Response(MerchantDo merchantDo){
         MerchantResponseDto responseDto = new MerchantResponseDto();
-        BeanUtils.copyProperties(merchant,responseDto);
-        responseDto.setType(AccountType.getAccountType(merchant.getType()));
+        BeanUtils.copyProperties(merchantDo,responseDto);
+        responseDto.setType(AccountType.getAccountType(merchantDo.getType()));
         return responseDto;
     }
 }
@@ -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,10 +8,10 @@ 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"),
-	CATEGORY_SEQUENCE("CATEGORY_SEQUENCE","品类is")
 	;
 	private String code;
@@ -7,7 +7,7 @@ import com.diligrp.xtrade.shared.domain.BaseDo;
  * @Date: 2020/4/21 17:20
  * @Description: 账户实体
  */
-public class Account extends BaseDo {
+public class AccountDo extends BaseDo {
     private String name;
     private String password;
     private String realName;
@@ -6,7 +6,7 @@ import com.diligrp.xtrade.shared.domain.BaseDo;
 /**
  * 商户实体(xt_merchant)
  */
-public class Merchant extends BaseDo {
+public class MerchantDo extends BaseDo {
     //商户id
     private Long merId;
@@ -5,7 +5,7 @@ package com.diligrp.xtrade.product.domain.entity;
  * @Date: 2020/4/21 17:15
  * @Description: 操作员实体
  */
-public class Operator {
+public class OperatorDo {
     private Long accountId;
     private String account;
     private String name;
@@ -7,47 +7,47 @@ import com.diligrp.xtrade.shared.domain.BaseDo;
  * @author zhangxing
  *
  */
-public class Product extends BaseDo{
-	
+public class ProductDo extends BaseDo{
+
 	//商品业务id
 	private Long productId;
-	
+
 	//商品名称
 	private String productName;
-	
+
 	//品类id
 	private Long cateId;
-	
+
 	//品类名称
     private String cateName;
-    
+
     //账户Id
     private Long accountId;
-    
+
     //账户名称
     private String accountName;
-    
+
     //商品状态
     private Integer status;
-    
+
     //商品件重
     private Double unitWeight;
-    
+
     //商品单位
     private Integer unit;
-    
+
     //商品价格
     private Long price;
-    
+
     //商品数量
     private Double amount;
-    
+
     //商品重量
     private Double weight;
-    
+
     //商品产地
     private String place;
-    
+
     /**
      * 获取 分类ID
      * @return
 package com.diligrp.xtrade.product.repository;
-import com.diligrp.xtrade.product.domain.entity.Account;
-import com.diligrp.xtrade.product.domain.entity.Operator;
+import com.diligrp.xtrade.product.domain.entity.AccountDo;
+import com.diligrp.xtrade.product.domain.entity.OperatorDo;
 import org.springframework.stereotype.Repository;
 import java.util.ArrayList;
@@ -14,21 +14,27 @@ import java.util.List;
  */
 @Repository
 public class AccountRepository implements IAccountRepository {
-    private final static List<Account> ACCOUNTS = new ArrayList<>();
+    private final static List<AccountDo> ACCOUNT_DOS = new ArrayList<>();
     @Override
-    public Operator getOperator() {
-        return new Operator();
+    public OperatorDo getOperator() {
+        OperatorDo operatorDo = new OperatorDo();
+        operatorDo.setAccount("miao");
+        operatorDo.setName("缪");
+        operatorDo.setAccountId(1L);
+        operatorDo.setMerAccountId(10000L);
+        operatorDo.setAdmin(true);
+        return operatorDo;
     }
     @Override
-    public Account getAccountByName(String userName) {
-        Account account = new Account();
-        account.setName(userName);
+    public AccountDo getAccountByName(String userName) {
+        AccountDo accountDo = new AccountDo();
+        accountDo.setName(userName);
         return null;
     }
     @Override
-    public void add(Account account) {
-        ACCOUNTS.add(account);
+    public void add(AccountDo accountDo) {
+        ACCOUNT_DOS.add(accountDo);
     }
 }
 package com.diligrp.xtrade.product.repository;
-import com.diligrp.xtrade.product.domain.entity.Account;
-import com.diligrp.xtrade.product.domain.entity.Operator;
+import com.diligrp.xtrade.product.domain.entity.AccountDo;
+import com.diligrp.xtrade.product.domain.entity.OperatorDo;
 /**
  * @Auther: miaoguoxin
@@ -10,9 +10,9 @@ import com.diligrp.xtrade.product.domain.entity.Operator;
  */
 public interface IAccountRepository {
-    Operator getOperator();
+    OperatorDo getOperator();
-    Account getAccountByName(String userName);
+    AccountDo getAccountByName(String userName);
-    void add(Account account);
+    void add(AccountDo accountDo);
 }
 package com.diligrp.xtrade.product.repository;
-import com.diligrp.xtrade.product.domain.entity.Merchant;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 /**
  * @Auther: miaoguoxin
@@ -9,9 +9,9 @@ import com.diligrp.xtrade.product.domain.entity.Merchant;
  */
 public interface IMerchantRepository {
-    Merchant getByAccountId(Long accountId);
+    MerchantDo getByAccountId(Long accountId);
-    void add(Merchant merchant);
+    void add(MerchantDo merchantDo);
-    void update(Merchant merchant);
+    void update(MerchantDo merchantDo);
 }
@@ -4,7 +4,7 @@ import com.diligrp.xtrade.product.dao.MerchantDao;
 import com.diligrp.xtrade.product.dao.ShopDao;
 import com.diligrp.xtrade.product.domain.emuns.AccountType;
 import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
-import com.diligrp.xtrade.product.domain.entity.Merchant;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
 import com.diligrp.xtrade.shared.sequence.IKeyGenerator;
 import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
@@ -28,31 +28,31 @@ public class MerchantRepository implements IMerchantRepository {
     private KeyGeneratorManager keyGeneratorManager;
     @Override
-    public Merchant getByAccountId(Long accountId) {
-        Merchant merchant = new Merchant();
-        merchant.setAccountId(accountId);
-        List<Merchant> merchants = merchantDao.findByCondition(merchant);
-        if (merchants.isEmpty()){
+    public MerchantDo getByAccountId(Long accountId) {
+        MerchantDo merchantDo = new MerchantDo();
+        merchantDo.setAccountId(accountId);
+        List<MerchantDo> merchantDos = merchantDao.findByCondition(merchantDo);
+        if (merchantDos.isEmpty()){
             return null;
         }
-        return merchants.get(0);
+        return merchantDos.get(0);
     }
     @Override
-    public void add(Merchant newMerchant) {
+    public void add(MerchantDo newMerchantDo) {
         IKeyGenerator keyGenerator = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.MERCHANT_SEQUENCE);
-        newMerchant.setMerId(keyGenerator.nextId());
-        newMerchant.setMarketId("SY001");
-        newMerchant.setCreatedTime(LocalDateTime.now());
-        merchantDao.insert(newMerchant);
+        newMerchantDo.setMerId(keyGenerator.nextId());
+        newMerchantDo.setMarketId("SY001");
+        newMerchantDo.setCreatedTime(LocalDateTime.now());
+        merchantDao.insert(newMerchantDo);
     }
     @Override
-    public void update(Merchant merchant) {
-        merchant.setModifiedTime(LocalDateTime.now());
+    public void update(MerchantDo merchantDo) {
+        merchantDo.setModifiedTime(LocalDateTime.now());
         ShopDo shopDo = new ShopDo();
         shopDo.setType(AccountType.PUBLIC.getCode());
-        shopDo.setMerId(merchant.getMerId());
+        shopDo.setMerId(merchantDo.getMerId());
         shopDao.update(shopDo);
     }
 }
 package com.diligrp.xtrade.product.service;
 import com.diligrp.xtrade.product.domain.dto.MerchantRequestDto;
-import com.diligrp.xtrade.product.domain.entity.Account;
-import com.diligrp.xtrade.product.domain.entity.Merchant;
+import com.diligrp.xtrade.product.domain.entity.AccountDo;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
 /**
  * @Auther: miaoguoxin
@@ -10,7 +10,7 @@ import com.diligrp.xtrade.product.domain.entity.Merchant;
  */
 public interface AccountService {
-    Account build(MerchantRequestDto requestDto, Merchant merchant) throws Exception;
+    AccountDo build(MerchantRequestDto requestDto, MerchantDo merchantDo) throws Exception;
-    void create(MerchantRequestDto requestDto, Merchant merchant) throws Exception;
+    void create(MerchantRequestDto requestDto, MerchantDo merchantDo) throws Exception;
 }
 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;
-import com.diligrp.xtrade.product.domain.entity.Account;
-import com.diligrp.xtrade.product.domain.entity.Merchant;
+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.security.PasswordUtils;
 import com.diligrp.xtrade.shared.sequence.IKeyGenerator;
 import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,25 +27,27 @@ public class AccountServiceImpl implements AccountService {
     private KeyGeneratorManager keyGeneratorManager;
     @Override
-    public Account build(MerchantRequestDto requestDto, Merchant merchant) throws Exception {
-        Account newAccount = new Account();
-        newAccount.setName(requestDto.getUserName());
-        newAccount.setRealName(requestDto.getRealName());
-        newAccount.setPassword(PasswordUtils.encrypt(requestDto.getPassword(),
-                requestDto.getUserName()));
-        newAccount.setMobile(requestDto.getMobile());
-        newAccount.setStatus(AccountStatus.NORMAL.getCode());
-        newAccount.setIsAdmin(1);
-        newAccount.setMerId(merchant.getMerId());
-        newAccount.setCreatedTime(LocalDateTime.now());
+    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);
-        newAccount.setId(keyGenerator.nextId());
-        return newAccount;
+        newAccountDo.setId(keyGenerator.nextId());
+        return newAccountDo;
     }
     @Override
-    public void create(MerchantRequestDto requestDto, Merchant merchant) throws Exception {
-        Account newAccount = this.build(requestDto, merchant);
-        accountRepository.add(newAccount);
+    public void create(MerchantRequestDto requestDto, MerchantDo merchantDo) throws Exception {
+        AccountDo newAccountDo = this.build(requestDto, merchantDo);
+        accountRepository.add(newAccountDo);
     }
+
 }
-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.dto.CategoryQueryDto;
-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;
-		//cateCode 生成 子级品类继承上级品类cateCode 父code_子code 
-		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) {
-		categoryDao.delect(id);
-	}
-
-	@Override
-	public CategoryDo selectEntityById(Long id) {
-		return categoryDao.selectEntityById(id);
-	}
-
-	@Override
-	public List<CategoryDo> selectList(CategoryQueryDto categoryQueryDto) {
-		return categoryDao.selectList(categoryQueryDto);
-	}
-
-	@Override
-	public List<CategoryDo> selectCateChild(String cateCode) {
-		return categoryDao.selectCateChild(cateCode);
-	}
-
-}
+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.dto.CategoryQueryDto;
+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;
+		//cateCode 生成 子级品类继承上级品类cateCode 父code_子code 
+		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) {
+		categoryDao.delect(id);
+	}
+
+	@Override
+	public CategoryDo selectEntityById(Long id) {
+		return categoryDao.selectEntityById(id);
+	}
+
+	@Override
+	public List<CategoryDo> selectList(CategoryQueryDto categoryQueryDto) {
+		return categoryDao.selectList(categoryQueryDto);
+	}
+
+	@Override
+	public List<CategoryDo> selectCateChild(String cateCode) {
+		return categoryDao.selectCateChild(cateCode);
+	}
+
+}
 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;
 import com.diligrp.xtrade.product.domain.emuns.ResponseCode;
-import com.diligrp.xtrade.product.domain.entity.Account;
-import com.diligrp.xtrade.product.domain.entity.Merchant;
-import com.diligrp.xtrade.product.domain.entity.Operator;
+import com.diligrp.xtrade.product.domain.entity.AccountDo;
+import com.diligrp.xtrade.product.domain.entity.MerchantDo;
+import com.diligrp.xtrade.product.domain.entity.OperatorDo;
 import com.diligrp.xtrade.product.exception.ProductException;
 import com.diligrp.xtrade.product.repository.IAccountRepository;
 import com.diligrp.xtrade.product.repository.IMerchantRepository;
@@ -24,33 +24,31 @@ public class MerchantServiceImpl implements MerchantService {
     @Autowired
     private IMerchantRepository merchantRepository;
     @Autowired
-    private MerchantConverter merchantConverter;
-    @Autowired
     private AccountService accountService;
     @Override
     @Transactional
     public MerchantResponseDto create(MerchantRequestDto requestDto) throws Exception {
-        Operator operator = accountRepository.getOperator();
-        requestDto.setAccountId(operator.getAccountId());
-        requestDto.setRealName(operator.getName());
-        Account account = accountRepository.getAccountByName(requestDto.getUserName());
-        if (account != null) {
+        OperatorDo operatorDo = accountRepository.getOperator();
+        requestDto.setAccountId(operatorDo.getAccountId());
+        requestDto.setRealName(operatorDo.getName());
+        AccountDo accountDo = accountRepository.getAccountByName(requestDto.getAccountName());
+        if (accountDo != null) {
             throw new ProductException(ResponseCode.ACCOUNT_EXIST);
         }
-        Merchant merchant = merchantRepository.getByAccountId(requestDto.getAccountId());
-        if (merchant == null){
-            merchant = merchantConverter.request2Entity(requestDto);
-            merchantRepository.add(merchant);
+        MerchantDo merchantDo = merchantRepository.getByAccountId(requestDto.getAccountId());
+        if (merchantDo == null){
+            merchantDo = MerchantBuilder.request2Entity(requestDto);
+            merchantRepository.add(merchantDo);
         } else {
-            if (AccountType.PERSONAL.getCode() != merchant.getType()){
+            if (AccountType.PERSONAL.getCode() != merchantDo.getType()){
                 throw new ProductException(ResponseCode.CARD_MERCHANT_CREATED);
             }
-            merchantRepository.update(merchant);
+            merchantRepository.update(merchantDo);
         }
         //创建市场管理员账户
-        accountService.create(requestDto,merchant);
-        return merchantConverter.entity2Response(merchant);
+        accountService.create(requestDto, merchantDo);
+        return MerchantBuilder.entity2Response(merchantDo);
     }
 }
@@ -14,7 +14,7 @@ public class ProductServiceImpl implements ProductService {
 	@Override
 	public void createProduct(ProductCreateRequestDto productCreateRequestDto) {
-		
+
 	}
 	@Override
@@ -25,7 +25,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
@@ -13,7 +13,7 @@
 							VALUES (#{itemId}, #{orderId}, #{productName}, #{productId}, #{price}, #{amount}, #{saleUnit}, #{unitWeight}, #{scommission}, #{bcommission}, #{ruleid}, #{ruleRate}, #{}weight, #{totalMoney}, NOW(), NOW());
 	</insert>
- 	<select id="selectOrderItemByItemId" parameterType="long" resultType="orderItemDo">
+ 	<select id="selectItemsByOrderId" parameterType="long" resultType="orderItemDo">
  		SELECT 
 		<include refid="QUERY_COLUMN_LIST"/>
 		FROM `xt_order_item` 
@@ -2,7 +2,7 @@
 <!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.MerchantDao">
-    <resultMap type="com.diligrp.xtrade.product.domain.entity.Merchant" id="XtMerchantMap">
+    <resultMap type="com.diligrp.xtrade.product.domain.entity.MerchantDo" id="XtMerchantMap">
         <result property="id" column="id"/>
         <result property="merId" column="mer_id"/>
         <result property="merName" column="mer_name"/>
@@ -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>
     <!--查询单个-->
@@ -77,19 +107,17 @@
         limit #{offset}, #{limit}
     </select>
-    <select id="findByCondition" parameterType="com.diligrp.xtrade.product.domain.entity.Merchant" resultMap="XtMerchantMap">
+    <select id="findByCondition" parameterType="com.diligrp.xtrade.product.domain.entity.MerchantDo" resultMap="XtMerchantMap">
         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 MerchantDoControllerTest 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 MerchantDoServiceTest 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);
+    }
+}