Merge remote-tracking branch 'origin/master'

miaoguoxin
2 parents e1585fd2 63794f75
Showing 18 changed files with 377 additions and 78 deletions
src/main/java/com/diligrp/xtrade/order/controllor/OrderApiController.java
src/main/java/com/diligrp/xtrade/order/dao/OrderDao.java
src/main/java/com/diligrp/xtrade/order/domain/builder/OrderDataBuilder.java
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryRequestDto.java → src/main/java/com/diligrp/xtrade/order/domain/dto/OrderRequestDto.java
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryResponseDto.java → src/main/java/com/diligrp/xtrade/order/domain/dto/OrderResponseDto.java
src/main/java/com/diligrp/xtrade/order/domain/emuns/OrderStatus.java
src/main/java/com/diligrp/xtrade/order/exception/OrderError.java
src/main/java/com/diligrp/xtrade/order/exception/OrderException.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/common/utils/ImageUtil.java
src/main/java/com/diligrp/xtrade/product/controllor/CategoryController.java
src/main/java/com/diligrp/xtrade/product/domain/dto/CategoryDto.java
src/main/java/com/diligrp/xtrade/product/domain/dto/CategoryQueryDto.java
src/main/java/com/diligrp/xtrade/product/domain/entity/CategoryDo.java
src/main/java/com/diligrp/xtrade/product/exception/ExceptionEnum.java
src/main/java/com/diligrp/xtrade/product/exception/ProductException.java
src/main/java/com/diligrp/xtrade/product/service/impl/CategoryServiceImpl.java
 package com.diligrp.xtrade.order.controllor;
-import java.util.List;
-
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -11,10 +9,11 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
-import com.diligrp.xtrade.order.domain.dto.OrderQueryRequestDto;
-import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
+import com.diligrp.xtrade.order.domain.dto.OrderRequestDto;
+import com.diligrp.xtrade.order.domain.dto.OrderResponseDto;
 import com.diligrp.xtrade.order.service.OrderService;
 import com.diligrp.xtrade.shared.domain.Message;
+import com.diligrp.xtrade.shared.domain.Page;
 /**
  * 订单相关接口实现
@@ -41,7 +40,7 @@ public class OrderApiController {
 	 * 订单列表接口
 	 */
 	@RequestMapping(value = "/listOrders")
-	public Message<List<OrderQueryResponseDto>> listOrders(@RequestBody OrderQueryRequestDto orderQueryRequestDto) {
+	public Message<Page<OrderResponseDto>> listOrders(@RequestBody OrderRequestDto orderQueryRequestDto) {
 		return Message.success(orderservice.orderLists(orderQueryRequestDto));
 	}
@@ -49,7 +48,16 @@ public class OrderApiController {
 	 * 订单详情
 	 */
 	@RequestMapping(value = "/orderDetail")
-	public Message<OrderQueryResponseDto> orderDetail(@RequestBody @Validated OrderQueryRequestDto orderQueryRequestDto) {
+	public Message<OrderResponseDto> orderDetail(@RequestBody @Validated OrderRequestDto orderQueryRequestDto) {
 		return Message.success(orderservice.orderDetail(orderQueryRequestDto.getOrderId()));
 	}
+	
+	/**
+	 * 订单详情
+	 */
+	@RequestMapping(value = "/updateBuyer")
+	public Message<Boolean> updateBuyer(@RequestBody @Validated OrderRequestDto orderQueryRequestDto) {
+		orderservice.updateBuyer(orderQueryRequestDto);
+		return Message.success(Boolean.TRUE);
+	}
 }
@@ -66,8 +66,8 @@ public interface OrderDao {
 	 * @return
 	 * @throws
 	 */
-	int updateBuyerInfo(@Param("baccount") Long baccount, @Param("bcardNo") Long bcardNo,
-			@Param("bcardType") Long bcardType, @Param("bname") Long bname, @Param("bmobile") Long bmobile);
+	int updateBuyerInfo(@Param("baccount") Long baccount, @Param("bcardNo") String bcardNo,
+			@Param("bcardType") Integer bcardType, @Param("bname") String bname, @Param("bmobile") String bmobile);
 	/**
 	 * 
@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.beans.BeanUtils;
 import com.diligrp.xtrade.order.domain.dto.OrderItemDto;
-import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
+import com.diligrp.xtrade.order.domain.dto.OrderResponseDto;
 import com.diligrp.xtrade.order.domain.entity.OrderDo;
 import com.diligrp.xtrade.order.domain.entity.OrderItemDo;
@@ -21,8 +21,8 @@ public class OrderDataBuilder {
 	/**
 	 * 构建基本的订单详情数据 TODO need modify because of change
 	 */
-	public static OrderQueryResponseDto buildOrderDetail(OrderDo order, List<OrderItemDo> orderItem) {
-		OrderQueryResponseDto orderResponseDto = new OrderQueryResponseDto();
+	public static OrderResponseDto buildOrderDetail(OrderDo order, List<OrderItemDo> orderItem) {
+		OrderResponseDto orderResponseDto = new OrderResponseDto();
 		BeanUtils.copyProperties(order, orderResponseDto);
 		for (OrderItemDo orderItemDo : orderItem) {
 			OrderItemDto orderItemDto = new OrderItemDto();
@@ -2,6 +2,9 @@ package com.diligrp.xtrade.order.domain.dto;
 import java.time.LocalDateTime;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
 import com.diligrp.xtrade.shared.domain.BaseDo;
 /**
@@ -11,9 +14,11 @@ import com.diligrp.xtrade.shared.domain.BaseDo;
  * @author zhangxing
  * @date 2020年4月21日
  */
-public class OrderQueryRequestDto extends BaseDo{
+public class OrderRequestDto extends BaseDo{
 	// 订单业务id
+	@NotNull(message = "订单号不能为空")
+	@Min(message = "订单号非法", value = 1)
 	private Long orderId;
 	// 卖家账号
@@ -10,7 +10,7 @@ import java.util.List;
  * @author zhangxing
  * @date 2020年4月21日
  */
-public class OrderQueryResponseDto {
+public class OrderResponseDto {
 	//订单业务id
@@ -11,7 +11,9 @@ public enum OrderStatus {
 	/**
 	 * 未支付
 	 */
-	UNPAIED(1, "未支付");
+	UNPAIED(1, "未支付"),
+	
+	PAIED(3, "未支付");
 	// 编码
 	private int code;
+package com.diligrp.xtrade.order.exception;
+
+import java.util.Arrays;
+
+import com.diligrp.xtrade.shared.type.IEnumType;
+
+/**
+ * 订单错误信息描述
+ */
+public enum OrderError implements IEnumType{
+	
+	ORDER_NOT_EXIST(300001, "订单不存在"),
+	ORDER_IS_PAIED(300002, "订单已支付"),
+	ORDER_IS_CLOSED(300003, "订单已关闭"),
+	SELLER_EQUAL_BUYER(300004, "买卖家相同");
+	
+	private int code;
+	private String name;
+	
+	OrderError(int code, String name) {
+		this.setCode(code);
+		this.name = name;
+	}
+
+	public static OrderError getByType(int code) {
+        return Arrays.stream(values())
+                .filter(e -> e.getCode() == code)
+                .findFirst()
+                .orElse(null);
+    }
+
+    public static String getName(int index) {
+        return Arrays.stream(OrderError.values())
+                .filter(e -> e.getCode() == index)
+                .findFirst().map(e -> e.name)
+                .orElse(null);
+    }
+
+
+	@Override
+	public int getCode() {
+		return this.code;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+	
+}
-package com.diligrp.xtrade.order.exception;
-
-public class OrderException extends RuntimeException{
-
-	private static final long serialVersionUID = 1L;
-	
-	private static final int DEFAULT_CODE = 1000;
-	
-	private int code;
-	
-	public OrderException() {
-		super();
-	}
-	
-	public OrderException(String message, int code){
-		super(message);
-		this.code = code;
-	}
-	
-	public OrderException(String message) {
-		this(message, DEFAULT_CODE);
-	}
-	
-	public OrderException(String message, Throwable cause) {
-		super(message, cause);
-		this.code = DEFAULT_CODE;
-	}
-	
-	public OrderException(Throwable cause) {
-		super(cause);
-		this.code = DEFAULT_CODE;
-	}
-
-	public int getCode() {
-		return code;
-	}
-
-	public void setCode(int code) {
-		this.code = code;
-	}
-	
-}
+package com.diligrp.xtrade.order.exception;
+
+public class OrderException extends RuntimeException{
+
+	private static final long serialVersionUID = 1L;
+	
+	private static final int DEFAULT_CODE = 1000;
+	
+	private int code;
+	
+	public OrderException() {
+		super();
+	}
+	
+	public OrderException(String message, int code){
+		super(message);
+		this.code = code;
+	}
+	
+	public OrderException(OrderError orderError){
+		super(orderError.getName());
+		this.code = orderError.getCode();
+	}
+	
+	public OrderException(String message) {
+		this(message, DEFAULT_CODE);
+	}
+	
+	public OrderException(String message, Throwable cause) {
+		super(message, cause);
+		this.code = DEFAULT_CODE;
+	}
+	
+	public OrderException(Throwable cause) {
+		super(cause);
+		this.code = DEFAULT_CODE;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+	
+}
 package com.diligrp.xtrade.order.service;
 import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
-import com.diligrp.xtrade.order.domain.dto.OrderQueryRequestDto;
-import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
+import com.diligrp.xtrade.order.domain.dto.OrderRequestDto;
+import com.diligrp.xtrade.order.domain.dto.OrderResponseDto;
 import com.diligrp.xtrade.shared.domain.Page;
 /**
@@ -24,11 +24,18 @@ public interface OrderService {
 	 * @Title orderLists
 	 * @Description 获取订单列表
 	 */
-	Page<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto);
+	Page<OrderResponseDto> orderLists(OrderRequestDto orderQueryRequestDto);
 	/**
 	 * @Title orderDetail
 	 * @Description 获取订单详情
 	 */
-	OrderQueryResponseDto orderDetail(Long orderId);
+	OrderResponseDto orderDetail(Long orderId);
+
+	/**
+	 * 
+	 * @Title updateBuyer
+	 * @Description 更新买家信息
+	 */
+	void updateBuyer(OrderRequestDto orderQueryRequestDto);
 }
@@ -16,10 +16,13 @@ import com.diligrp.xtrade.order.domain.builder.OrderDataBuilder;
 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.dto.OrderRequestDto;
+import com.diligrp.xtrade.order.domain.dto.OrderResponseDto;
 import com.diligrp.xtrade.order.domain.emuns.IdGenerator;
+import com.diligrp.xtrade.order.domain.emuns.OrderStatus;
 import com.diligrp.xtrade.order.domain.entity.OrderDo;
+import com.diligrp.xtrade.order.exception.OrderError;
+import com.diligrp.xtrade.order.exception.OrderException;
 import com.diligrp.xtrade.order.rpc.feign.AccountResolver;
 import com.diligrp.xtrade.order.service.OrderService;
 import com.diligrp.xtrade.shared.domain.Page;
@@ -68,9 +71,29 @@ public class OrderServiceImpl implements OrderService {
 	// TODO need modify because of change
 	@Override
-	public Page<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto) {
-		Page<OrderQueryResponseDto> orderPage = new Page<OrderQueryResponseDto>();
-		List<OrderQueryResponseDto> roResponseDtos = new ArrayList<OrderQueryResponseDto>();
+	public void updateBuyer(OrderRequestDto orderRequestDto) {
+		OrderDo orderDo = orderDao.selectEntityByOrderId(orderRequestDto.getOrderId());
+		if (orderDo == null) {
+			throw new OrderException(OrderError.ORDER_NOT_EXIST);
+		}
+		if (orderDo.getOrderStatus() == OrderStatus.PAIED.getCode()) {
+			throw new OrderException(OrderError.ORDER_IS_PAIED);
+		}
+
+		AccountDto buyer = accountResolver.getAccount(orderRequestDto.getBaccount());
+		if (orderDo.getSaccount().equals(orderRequestDto.getBaccount())
+				|| orderDo.getSaccount().equals(buyer.getParentAccountId())) {
+			throw new OrderException(OrderError.SELLER_EQUAL_BUYER);
+		}
+		orderDao.updateBuyerInfo(buyer.getAccountId(), buyer.getCardNo(), buyer.getType(), buyer.getAccountName(),
+				buyer.getMobile());
+	}
+
+	// TODO need modify because of change
+	@Override
+	public Page<OrderResponseDto> orderLists(OrderRequestDto orderQueryRequestDto) {
+		Page<OrderResponseDto> orderPage = new Page<OrderResponseDto>();
+		List<OrderResponseDto> roResponseDtos = new ArrayList<OrderResponseDto>();
 		orderPage.setData(roResponseDtos);
 		OrderDo order = new OrderDo();
 		BeanUtils.copyProperties(orderQueryRequestDto, order);
@@ -80,7 +103,7 @@ public class OrderServiceImpl implements OrderService {
 		}
 		List<OrderDo> orderDos = orderDao.selectEntryList(order);
 		for (OrderDo orderDo : orderDos) {
-			OrderQueryResponseDto orderQueryResponseDto = new OrderQueryResponseDto();
+			OrderResponseDto orderQueryResponseDto = new OrderResponseDto();
 			BeanUtils.copyProperties(orderDo, orderQueryResponseDto);
 			roResponseDtos.add(orderQueryResponseDto);
 		}
@@ -89,9 +112,9 @@ public class OrderServiceImpl implements OrderService {
 	// TODO need modify because of change
 	@Override
-	public OrderQueryResponseDto orderDetail(Long orderId) {
-		OrderQueryResponseDto orderResponseDto = OrderDataBuilder
-				.buildOrderDetail(orderDao.selectEntityByOrderId(orderId), orderItemDao.selectItemsByOrderId(orderId));
+	public OrderResponseDto orderDetail(Long orderId) {
+		OrderResponseDto orderResponseDto = OrderDataBuilder.buildOrderDetail(orderDao.selectEntityByOrderId(orderId),
+				orderItemDao.selectItemsByOrderId(orderId));
 		return orderResponseDto;
 	}
+package com.diligrp.xtrade.product.common.utils;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import javax.imageio.ImageIO;
+
+import com.diligrp.xtrade.product.exception.ExceptionEnum;
+import com.diligrp.xtrade.product.exception.ProductException;
+
+
+/**
+ * 
+ * <B>Description</B> 图片工具类 <br />
+ * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
+ * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
+ * <B>Company</B> 地利集团
+ * @createTime 2015年4月24日 上午11:30:36
+ * @author celine
+ */
+public class ImageUtil {
+
+    /**
+     * 检测文件是否是图片
+     * @param inputStream
+     * @return
+     * @createTime 2015年4月24日 上午11:35:29
+     * @author celine
+     */
+    public static Boolean isImage(InputStream inputStream) {
+        try {
+            BufferedImage bi = ImageIO.read(inputStream);
+            return null == bi ? false : true;
+        } catch (IOException e) {
+            throw new ProductException(ExceptionEnum.FILE_UP_ERROR);		
+        }
+    }
+
+    public static Boolean checkImageSize(InputStream inputStream, int maxWidth, int maxHeight, int minWidth,
+            int minHeight) {
+        try {
+            BufferedImage bi = ImageIO.read(inputStream);
+            if (bi != null) {
+                if (bi.getWidth() <= maxWidth && bi.getHeight() <= maxHeight && bi.getWidth() >= minWidth
+                        && bi.getHeight() >= minHeight) {
+                    return true;
+                }
+            }
+            return false;
+        } catch (IOException e) {
+        	throw new ProductException(ExceptionEnum.FILE_UP_ERROR);	
+        }
+    }
+
+    public static String getMd5(byte[] imgBytes) {
+        if (imgBytes != null && imgBytes.length > 0) {
+            StringBuilder sb = new StringBuilder();
+            MessageDigest md5;
+            try {
+                md5 = MessageDigest.getInstance("MD5");
+            } catch (NoSuchAlgorithmException e) {
+            	throw new ProductException(ExceptionEnum.FILE_UP_ERROR);	
+            }
+            md5.update(imgBytes);
+            for (byte by : md5.digest()) {
+                sb.append(String.format("%02X", by));
+            }
+            return sb.toString();
+        }
+        return "";
+    }
+
+}
 package com.diligrp.xtrade.product.controllor;
+import java.io.IOException;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.diligrp.xtrade.product.common.utils.ImageUtil;
 import com.diligrp.xtrade.product.domain.dto.CategoryDto;
 import com.diligrp.xtrade.product.domain.entity.CategoryDo;
+import com.diligrp.xtrade.product.exception.ExceptionEnum;
+import com.diligrp.xtrade.product.exception.ProductException;
 import com.diligrp.xtrade.product.service.CategoryService;
 import com.diligrp.xtrade.shared.domain.Message;
@@ -21,7 +30,15 @@ import com.diligrp.xtrade.shared.domain.Message;
 @RestController
 @RequestMapping("sapi/category/")
 public class CategoryController {
+	
+	@Value("${max.file.size}")
+	private int MAX_FILE_SIZE;
+	private final Integer MAX_WIDTH = 300;
+	private final Integer MAX_HEIGHT = 300;
+	private final Integer MIN_WIDTH = 200;
+	private final Integer MIN_HEIGHT = 200;
+	
 	@Autowired
 	private CategoryService categoryService;
@@ -33,7 +50,14 @@ public class CategoryController {
 	 * @return
 	 * @throws
 	 */
-	public Message<?> save(CategoryDto categoryDTO) {
+	@RequestMapping("save")
+	public Message<?> save(@RequestBody CategoryDto categoryDTO,@RequestParam(value = "file",required = false) MultipartFile file) {
+		checkImageFile(file);
+		try {
+			categoryDTO.setImage(file.getBytes());
+		} catch (IOException e) {
+			throw new ProductException(ExceptionEnum.FILE_UP_ERROR);
+		}
 		categoryService.insert(categoryDTO);
 		return Message.success();
 	}
@@ -93,4 +117,29 @@ public class CategoryController {
 		List<CategoryDo> categoryDos = categoryService.selectCateChild(cateCode);
 		return Message.success(categoryDos);
 	}
+	
+	/**
+	 * 
+	 * @Title checkImageFile
+	 * @Description 文件检查
+	 * @param file
+	 * @throws
+	 */
+	private void checkImageFile(MultipartFile file) {
+		try {
+			if (!ImageUtil.isImage(file.getInputStream())) {
+				throw new ProductException(ExceptionEnum.NOT_IMAGE);
+			}
+			if (!ImageUtil.checkImageSize(file.getInputStream(), MAX_WIDTH, MAX_HEIGHT, MIN_WIDTH, MIN_HEIGHT)) {
+				
+				throw new ProductException(200005,"上传图片长宽超过限制，请保证图片大小范围为" + MIN_WIDTH + "*" + MIN_HEIGHT + "到" + MAX_WIDTH + "*"
+						+ MAX_HEIGHT);
+			}
+			if (file.getBytes().length > MAX_FILE_SIZE) {
+				new ProductException(200005,"上传图片大小超过限制,请保证图片不超过256K");
+			}
+		} catch (IOException e) {
+			throw new ProductException(ExceptionEnum.FILE_UP_ERROR);
+		}
+	}
 }
@@ -37,7 +37,7 @@ public class CategoryDto{
 	/**
 	 * 图片
 	 */
-	private String image;
+	private byte[] image;
 	/**
 	 * 品类有效期
 	 */
@@ -50,7 +50,10 @@ public class CategoryDto{
 	 * 品类等级
 	 */
 	private Integer level;
-	
+	/**
+	 * 市场id
+	 */
+	private Integer marketId;
 	public String getParentId() {
 		return parentId;
 	}
@@ -93,10 +96,11 @@ public class CategoryDto{
 	public void setIcon(String icon) {
 		this.icon = icon;
 	}
-	public String getImage() {
+	
+	public byte[] getImage() {
 		return image;
 	}
-	public void setImage(String image) {
+	public void setImage(byte[] image) {
 		this.image = image;
 	}
 	public Integer getValidDay() {
@@ -117,5 +121,11 @@ public class CategoryDto{
 	public void setLevel(Integer level) {
 		this.level = level;
 	}
+	public Integer getMarketId() {
+		return marketId;
+	}
+	public void setMarketId(Integer marketId) {
+		this.marketId = marketId;
+	}
 }
@@ -34,6 +34,10 @@ public class CategoryQueryDto{
 	 * 品类等级
 	 */
 	private Integer level;
+	/**
+	 * 市场id
+	 */
+	private Integer marketId;
 	private Integer currentPage;
@@ -79,5 +83,11 @@ public class CategoryQueryDto{
 	public void setCurrentPage(Integer currentPage) {
 		this.currentPage = currentPage;
 	}
+	public Integer getMarketId() {
+		return marketId;
+	}
+	public void setMarketId(Integer marketId) {
+		this.marketId = marketId;
+	}
 }
@@ -36,7 +36,7 @@ public class CategoryDo extends BaseDo{
 	/**
 	 * 图片
 	 */
-	private String image;
+	private byte[] image;
 	/**
 	 * 品类有效期
 	 */
@@ -49,6 +49,10 @@ public class CategoryDo extends BaseDo{
 	 * 品类等级
 	 */
 	private Integer level;
+	/**
+	 * 市场id
+	 */
+	private Integer marketId;
 	public String getCateCode() {
 		return cateCode;
@@ -86,10 +90,11 @@ public class CategoryDo extends BaseDo{
 	public void setIcon(String icon) {
 		this.icon = icon;
 	}
-	public String getImage() {
+	
+	public byte[] getImage() {
 		return image;
 	}
-	public void setImage(String image) {
+	public void setImage(byte[] image) {
 		this.image = image;
 	}
 	public Integer getValidDay() {
@@ -110,5 +115,11 @@ public class CategoryDo extends BaseDo{
 	public void setLevel(Integer level) {
 		this.level = level;
 	}
+	public Integer getMarketId() {
+		return marketId;
+	}
+	public void setMarketId(Integer marketId) {
+		this.marketId = marketId;
+	}
 }
@@ -14,6 +14,9 @@ public enum ExceptionEnum implements IEnumType {
 	SHOP_NOT_EXISTENCE(200001, "SHOP_NOT_EXISTENCE"),
 	MERCHANT_ACCOUNT_EXIST(200002,"商户账号已存在"),
 	CARD_MERCHANT_CREATED(200003,"该卡已创建商户，请使用用户名密码登录"),
+	CATE_EXISTENCE(200004,"品类已存在"),
+	FILE_UP_ERROR(200005,"文件上传失败"),
+	NOT_IMAGE(200006,"只能上传图片")
 	;
 	private int code;
@@ -8,4 +8,7 @@ public class ProductException extends BaseBusinessException {
     public ProductException(IEnumType type) {
         super(type);
     }
+    public ProductException(int code, String message) {
+        super(code,message);
+    }
 }
@@ -7,11 +7,14 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.diligrp.xtrade.product.common.utils.ImageUtil;
 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.exception.ExceptionEnum;
+import com.diligrp.xtrade.product.exception.ProductException;
 import com.diligrp.xtrade.product.service.CategoryService;
 import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
@@ -29,9 +32,15 @@ public class CategoryServiceImpl implements CategoryService {
 	@Autowired
 	private CategoryDao categoryDao;
+	private static String ICON_PREFIX = "/mobile/category/getImageByIcon/";
+	
 	@Override
 	public void insert(CategoryDto category) {
 		CategoryDo categoryDo = new CategoryDo();
+		// 查询品类名是否存在
+		if(categoryIsExit(category)) {
+			throw new ProductException(ExceptionEnum.CATE_EXISTENCE);
+		}
 		BeanUtils.copyProperties(category, categoryDo);
 		long id = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.CATEGORY_SEQUENCE).nextId();
 		String cateCode = ""+id;
@@ -41,12 +50,17 @@ public class CategoryServiceImpl implements CategoryService {
 			cateCode = String.format("%s_%d", pCategoryDo.getCateCode(),id);
 		}
 		categoryDo.setCateCode(cateCode);
+		category.setIcon(ICON_PREFIX + ImageUtil.getMd5(categoryDo.getImage()) + id);
 		categoryDao.insert(categoryDo);
 	} 
 	@Override
 	public void update(CategoryDto category) {
 		CategoryDo categoryDo = new CategoryDo();
+		// 查询品类名是否存在
+		if(categoryIsExit(category)) {
+			throw new ProductException(ExceptionEnum.CATE_EXISTENCE);
+		}
 		BeanUtils.copyProperties(category, categoryDo);
 		categoryDao.update(categoryDo);
 	}
@@ -70,5 +84,24 @@ public class CategoryServiceImpl implements CategoryService {
 	public List<CategoryDo> selectCateChild(String cateCode) {
 		return categoryDao.selectCateChild(cateCode);
 	}
-
+	
+	/**
+	 * 根据品类名称,等级,市场查询品类名是否重复
+	 * @Title categoryIsExit
+	 * @Description 根据品类名称,等级,市场查询品类名是否重复
+	 * @param category
+	 * @return true/false
+	 * @throws
+	 */
+	private boolean categoryIsExit(CategoryDto category) {
+		CategoryQueryDto categoryQueryDto = new CategoryQueryDto();
+		categoryQueryDto.setCname(category.getCname());
+		categoryQueryDto.setLevel(category.getLevel());
+		categoryQueryDto.setMarketId(category.getMarketId());
+		List<CategoryDo> categorys = categoryDao.selectList(categoryQueryDto);
+		if(categorys != null && categorys.size() > 0) {
+			return true;
+		}
+		return false;
+	}
 }