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

src/main/java/com/uas/platform/b2c/advertise/ad/service/impl/AdvantageCommodityServiceImpl.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2c.advertise.ad.service.impl;
 import com.uas.platform.b2c.advertise.ad.model.AdvantageCommodity;
 import com.uas.platform.b2c.advertise.ad.service.AdvantageCommodityService;
 import com.uas.platform.b2c.core.config.MicroServicesConf;
+import com.uas.platform.b2c.core.config.MicroServicesConfMulti;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.utils.JacksonUtils;
 import com.uas.platform.b2c.trade.support.CodeType;
@@ -26,21 +27,24 @@ public class AdvantageCommodityServiceImpl implements AdvantageCommodityService
 
 	private final MicroServicesConf conf;
 
+	private final MicroServicesConfMulti confMulti;
+
 	private final RestTemplate restTemplate;
 
 	private final SysConf sysConf;
 
 	@Autowired
-	public AdvantageCommodityServiceImpl(MicroServicesConf conf, RestTemplate restTemplate, SysConf sysConf) {
+	public AdvantageCommodityServiceImpl(MicroServicesConf conf, RestTemplate restTemplate, SysConf sysConf, MicroServicesConfMulti confMulti) {
 		this.conf = conf;
 		this.restTemplate = restTemplate;
 		this.sysConf = sysConf;
+		this.confMulti = confMulti;
 	}
 
 	@Override
 	public List<AdvantageCommodity> findByStoreUuid(String storeUuid) {
 		if (StringUtils.hasText(storeUuid)) {
-			String url = conf.getRequestUrl(20100, "/store-cms/advantages?storeUuid=" + storeUuid);
+			String url = confMulti.getRecommendUrl( "/store-cms/advantages?storeUuid=" + storeUuid);
 			String result = restTemplate.getForEntity(url, String.class).getBody();
 			if (StringUtils.hasText(result)) {
 				return JacksonUtils.fromJsonArray(result, AdvantageCommodity.class);

src/main/java/com/uas/platform/b2c/core/constant/Status.java

@@ -373,6 +373,26 @@ public enum Status {
 	 * {@code 814 爬取失败}
 	 */
 	CROWLED_FAILED(814, "任务失败"),
+
+	/**
+	 * {@code 815, 正常}
+	 */
+	ACTIVE(815, "正常"),
+
+	/**
+	 * {@code 816, 即将停产}
+	 */
+	DISCONTINUED(816, "即将停产"),
+
+	/**
+	 * {@code 817, 停产}
+	 */
+	OBSOLETE(817, "停产"),
+
+	/**
+	 * {@code 818, 新品}
+	 */
+	PRELIMINARY(818, "新品"),
 	/**
 	 * {@code 1669 待入库 <b>待入库</b>}
 	 */

src/main/java/com/uas/platform/b2c/prod/product/component/modal/Component.java

@@ -109,6 +109,16 @@ public class Component implements Serializable {
 	@Column(name = "cmp_description", length = 4000)
 	private String description;
 
+	/**
+	 * 器件所处生命周期
+	 * ACTIVE 815 正常
+	 * DISCONTINUED 816 即将停产
+	 * OBSOLETE 817 停产
+	 * PRELIMINARY 818 新品
+	 */
+	@Column(name = "cmp_lifecycle")
+	private Integer lifecycle;
+
 	/**
 	 * 所属公司
 	 */