Merge remote-tracking branch 'origin/dev' into dev

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/type/ItemTypeEnum.java

+package com.upyuns.platform.rs.website.type;
+
+/**
+ * @ClassName : ItemTypeEnum
+ * @Description : 商品类型
+ * @Author : jiaoruizhen
+ * @Date: 2020-12-24 14:32
+ */
+public enum  ItemTypeEnum {
+
+	STANDARD_DATA(1, "标准数据"),
+	INDUSTRY_INFO(3, "行业应用"),
+	IMAGE_STORAGE(2, "影像图库");
+	private Integer type;
+	private String msg;
+
+	ItemTypeEnum(Integer type, String msg) {
+		this.type = type;
+		this.msg = msg;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+
+	public static <T extends ItemTypeEnum> String getType(Integer code, Class<T> t) {
+		for (T item : t.getEnumConstants()) {
+			if (item.getType().equals(code)) {
+				return item.getMsg();
+			}
+		}
+		return "";
+	}
+
+	public static ItemTypeEnum getByCode(Integer code) {
+		for (ItemTypeEnum v : values()) {
+			if (v.getType() == code) {
+				return v;
+			}
+		}
+		return null;
+	}
+
+	public static String getProductStatusEnum(Integer code) {
+		return getType(code, ItemTypeEnum.class);
+	}
+
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ImageImgStorageBiz.java

@@ -138,15 +138,30 @@ public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgSt
 		return ObjectRestResponse.succ(imageImgStorage);
 	}
 
-	public ObjectRestResponse getAll(Integer type) {
+	public ObjectRestResponse<List<ImageImgStorage>> getAll(Integer type, String name) {
 		Example example = new Example(ImageImgStorage.class);
 		Example.Criteria criteria = example.createCriteria();
 		criteria.andEqualTo("isDel", 0).andEqualTo("status", 1);
 		if (type != null) {
 			criteria.andEqualTo("type", type);
 		}
+		if (StringUtils.isNotBlank(name)) {
+			criteria.andLike("name", "%" + name + "%");
+		}
 		example.orderBy("updTime").desc();
-		return ObjectRestResponse.succ(mapper.selectByExample(example));
+		List<ImageImgStorage> list = mapper.selectByExample(example);
+		if (list != null && list.size() > 0) {
+			list.parallelStream().forEach(imageImgStorage -> {
+				List<ImageInfoRelation> imageInfoRelationList = imageInfoRelationBiz.getAllById(imageImgStorage.getId(), 1);
+				if (imageInfoRelationList != null) {
+					imageImgStorage.setImageInfoRelationList(imageInfoRelationList);
+				}
+				if (StringUtils.isNotBlank(imageImgStorage.getRelatedIds())) {
+					imageImgStorage.setSimilarImageList(imageInfoRelationBiz.getAllByIds(imageImgStorage.getRelatedIds()));
+				}
+			});
+		}
+		return ObjectRestResponse.succ(list);
 	}
 
 	/**

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/IndustryApplicationInfoBiz.java

@@ -12,6 +12,7 @@ import com.upyuns.platform.rs.website.entity.IndustryApplicationInfo;
 import com.upyuns.platform.rs.website.entity.IndustryApplicationType;
 import com.upyuns.platform.rs.website.mapper.IndustryApplicationInfoMapper;
 import com.upyuns.platform.rs.website.vo.IndustryTypeVo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -122,4 +123,18 @@ public class IndustryApplicationInfoBiz extends BaseBiz<IndustryApplicationInfoM
 		return mapper.selectByExample(example);
 	}
 
+	/**
+	 * 获取所有行业应用
+	 * @return
+	 */
+	public List<IndustryApplicationInfo> getAllData(String name) {
+		Example example = new Example(IndustryApplicationInfo.class);
+		Example.Criteria criteria = example.createCriteria();
+		if (StringUtils.isNotBlank(name)) {
+			criteria.andLike("title", "%" + name + "");
+		}
+		criteria.andEqualTo("isDel", 0).andEqualTo("status", 1);
+		return mapper.selectByExample(example);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -18,10 +18,7 @@ import com.upyuns.platform.rs.universal.feign.ThirdFeign;
 import com.upyuns.platform.rs.website.dto.*;
 import com.upyuns.platform.rs.website.entity.*;
 import com.upyuns.platform.rs.website.mapper.OrderItemMapper;
-import com.upyuns.platform.rs.website.type.OrderInvoiceStatusEnum;
-import com.upyuns.platform.rs.website.type.OrderShippingStatusEnum;
-import com.upyuns.platform.rs.website.type.OrderStatusEnum;
-import com.upyuns.platform.rs.website.type.OrderTypeEnum;
+import com.upyuns.platform.rs.website.type.*;
 import com.upyuns.platform.rs.website.vo.ItemInfoVo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.regexp.RE;
@@ -163,6 +160,12 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) {
 			orderInfoCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
 		}
+		if (StringUtils.isNotBlank(userOrderDto.getKeywords())) {
+			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getKeywords() + "%")
+					.orLike("realName", "%" + userOrderDto.getKeywords() + "%")
+					.orLike("phone", "%" +userOrderDto.getKeywords()+ "%")
+					.orLike("orderNo", "%" +userOrderDto.getKeywords()+ "%");
+		}
 		orderInfoCriteria.andNotEqualTo("status", -1);
 		example.orderBy("updTime").desc();
 		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
@@ -871,4 +874,58 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		return ObjectRestResponse.succ();
 	}
 
+
+	/**
+	 * 根据类型查询商品信息
+	 * @param type
+	 * @param name
+	 * @return
+	 */
+	public ObjectRestResponse getItemByType(Integer type, String name) {
+		if (type == null) {
+			return ObjectRestResponse.paramIsEmpty();
+		}
+		List<ItemInfoVo> itemInfoVoList = new ArrayList<>();
+		switch (ItemTypeEnum.getByCode(type)) {
+			case IMAGE_STORAGE:
+				List<ImageImgStorage> imageImgStorageList = imageImgStorageBiz.getAll(null, name).getData();
+				if (imageImgStorageList != null && imageImgStorageList.size() > 0) {
+					imageImgStorageList.parallelStream().forEach(imageImgStorage -> {
+						List<ImageInfoRelation> imageInfoRelationList = imageImgStorage.getImageInfoRelationList();
+						if (imageInfoRelationList != null && imageInfoRelationList.size() > 0) {
+							imageInfoRelationList.parallelStream().forEach(imageInfoRelation -> {
+								ItemInfoVo itemInfoVo = new ItemInfoVo();
+								itemInfoVo.setName(imageImgStorage.getName() + imageInfoRelation.getFileWidth());
+								itemInfoVo.setId(Long.parseLong(String.valueOf(imageInfoRelation.getId())));
+								itemInfoVo.setType(ItemTypeEnum.IMAGE_STORAGE.getType());
+								itemInfoVoList.add(itemInfoVo);
+							});
+						} else {
+							ItemInfoVo itemInfoVo = new ItemInfoVo();
+							itemInfoVo.setName(imageImgStorage.getName());
+							itemInfoVo.setId(Long.parseLong(String.valueOf(imageImgStorage.getId())));
+							itemInfoVo.setType(ItemTypeEnum.IMAGE_STORAGE.getType());
+							itemInfoVoList.add(itemInfoVo);
+						}
+					});
+				}
+				break;
+			case INDUSTRY_INFO:
+				List<IndustryApplicationInfo> industryApplicationInfoList = industryApplicationInfoBiz.getAllData(name);
+				if (industryApplicationInfoList != null && industryApplicationInfoList.size() > 0) {
+					industryApplicationInfoList.parallelStream().forEach(industryApplicationInfo -> {
+						ItemInfoVo itemInfoVo = new ItemInfoVo();
+						itemInfoVo.setName(industryApplicationInfo.getTitle());
+						itemInfoVo.setId(Long.parseLong(String.valueOf(industryApplicationInfo.getId())));
+						itemInfoVo.setType(ItemTypeEnum.INDUSTRY_INFO.getType());
+						itemInfoVoList.add(itemInfoVo);
+					});
+				}
+			case STANDARD_DATA:
+
+				break;
+		}
+		return ObjectRestResponse.succ(itemInfoVoList);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderInfoController.java

@@ -52,4 +52,9 @@ public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo>
 		return baseBiz.setOrderItem(orderInfoDto);
 	}
 
+	@GetMapping(value = "getItemByType")
+	public ObjectRestResponse getItemByType(Integer type, String name) {
+		return baseBiz.getItemByType(type, name);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/ImageImgStorageWebController.java

@@ -21,7 +21,7 @@ public class ImageImgStorageWebController extends BaseController<ImageImgStorage
 	@GetMapping(value = "/app/unauth/getAll")
 	@IgnoreUserToken
 	public ObjectRestResponse getAll(Integer type) {
-		return baseBiz.getAll(type);
+		return baseBiz.getAll(type, "");
 	}
 
 	@GetMapping(value = "/app/unauth/getList")