Merge branch 'develop' into develop-kjf

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/constant/ServiceNameConstants.java

@@ -3,6 +3,8 @@
 package com.kxs.common.core.constant;
 
 
+import java.time.Duration;
+
 /**
  * 服务名称
  *
@@ -13,6 +15,12 @@ public interface ServiceNameConstants {
 
 	String CLIENT_NAME = "http://";
 
+	/**
+	 * 请求超时时间
+	 * 单位：秒
+	 */
+	Duration REQ_TIMEOUT = Duration.ofSeconds(30);
+
 	/**
 	 * 系统模块
 	 */
@@ -32,6 +40,7 @@ public interface ServiceNameConstants {
 	 * 仓库模块
 	 */
 	String STORE_SERVICE = "kxs-store-biz";
+
 	/**
 	 * 统计模块
 	 */

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/valid/Sn.java

@@ -1,6 +1,5 @@
 package com.kxs.common.core.valid;
 
-import com.kxs.common.core.valid.impl.PhoneValidator;
 import com.kxs.common.core.valid.impl.SnValidator;
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/valid/impl/NormMonthValidator.java

@@ -27,7 +27,7 @@ public class NormMonthValidator implements ConstraintValidator<NormMonth, String
 
     @Override
     public boolean isValid(String value, ConstraintValidatorContext context) {
-        if (value == null || value.equals("")){
+        if (value == null || value.isEmpty()){
             return false;
         }
         // 获取【Phone】对象的手机格式验证表达式

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/valid/impl/PhoneValidator.java

@@ -26,7 +26,7 @@ public class PhoneValidator implements ConstraintValidator<Phone, String> {
 
     @Override
     public boolean isValid(String value, ConstraintValidatorContext context) {
-        if (value == null || value.equals("")){
+        if (value == null || value.isEmpty()){
             return false;
         }
         // 获取【Phone】对象的手机格式验证表达式

kxs-common/kxs-common-core/src/main/java/com/kxs/common/core/valid/impl/SnValidator.java

@@ -26,7 +26,7 @@ public class SnValidator implements ConstraintValidator<Sn, String> {
 
     @Override
     public boolean isValid(String value, ConstraintValidatorContext context) {
-        if (value == null || value.equals("")){
+        if (value == null || value.isEmpty()){
             return false;
         }
         // 获取【sn】对象的手机格式验证表达式

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/feign/config/KxsStatFeignClientConfiguration.java

@@ -72,13 +72,13 @@ public class KxsStatFeignClientConfiguration {
 	}
 
 	/**
-	 * 远程仓库模块服务
+	 * 远程统计模块服务
 	 * @param client 客户端
-	 * @return 远程仓库模块服务
+	 * @return 远程统计模块服务
 	 */
 	@Bean
 	RemoteKxsStatService remoteKxsStatService(@Qualifier("kxsStatFeignClient") WebClient client) {
-		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).build();
+		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).blockTimeout(ServiceNameConstants.REQ_TIMEOUT).build();
 		return factory.createClient(RemoteKxsStatService.class);
 	}
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/config/KxsSystemFeignClientConfiguration.java

@@ -18,6 +18,8 @@ import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.reactive.function.client.support.WebClientAdapter;
 import org.springframework.web.service.invoker.HttpServiceProxyFactory;
 
+import java.time.Duration;
+
 /**
  * <p>
  * 当前服务的webClient配置

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsShopGoodsServiceImpl.java

@@ -13,6 +13,7 @@ import com.kxs.common.core.util.RetOps;
 import com.kxs.product.api.model.KxsShopGoods;
 import com.kxs.product.api.model.KxsShopGoodsPic;
 import com.kxs.product.api.model.KxsShopGoodsSku;
+import com.kxs.product.api.model.KxsShopGoodsSpec;
 import com.kxs.transfer.api.mapper.product.KxsShopGoodsMapper;
 import com.kxs.transfer.api.mapper.product.KxsShopGoodsPicMapper;
 import com.kxs.transfer.api.mapper.product.KxsShopGoodsSkuMapper;
@@ -29,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -43,6 +45,7 @@ import java.util.Map;
 public class KxsShopGoodsServiceImpl extends ServiceImpl<KxsShopGoodsMapper, KxsShopGoods> implements KxsShopGoodsService {
 
     private final KxsShopGoodsSkuService kxsShopGoodsSkuService;
+    private final KxsShopGoodsSpecService kxsShopGoodsSpecService;
 
     private final KxsShopGoodsPicService kxsShopGoodsPicService;
 
@@ -206,6 +209,26 @@ public class KxsShopGoodsServiceImpl extends ServiceImpl<KxsShopGoodsMapper, Kxs
                 kxsShopGoodsPicService.save(shopGoodsPic);
             }
         }
+        if(StrUtil.isNotBlank(goods.getSpecList())){
+            kxsShopGoodsSpecService.remove(Wrappers.<KxsShopGoodsSpec>lambdaQuery().eq(KxsShopGoodsSpec::getGoodsId, goods.getId()));
+
+            JSONArray goodsSpecs = JSON.parseArray(goods.getSpecList());
+            for (Object goodsSpec : goodsSpecs) {
+                KxsShopGoodsSpec kxsShopGoodsSpec = new KxsShopGoodsSpec();
+                kxsShopGoodsSpec.setGoodsId(goods.getId());
+                JSONObject jsonObject = JSON.parseObject(goodsSpec.toString());
+                kxsShopGoodsSpec.setSpecification(jsonObject.getString("name"));
+
+                JSONArray vallist = jsonObject.getJSONArray("vallist");
+                JSONArray skus = new JSONArray();
+                for (Object val : vallist) {
+                    JSONObject valSku = JSON.parseObject(val.toString());
+                    skus.add(valSku.getString("name"));
+                }
+                kxsShopGoodsSpec.setValue(skus.toJSONString());
+                kxsShopGoodsSpecService.save(kxsShopGoodsSpec);
+            }
+        }
         //获取sku列表
         FieldData fieldData = fieldDataMap.get("NormJson");
         if(fieldData.getValue() != null && StrUtil.isNotBlank(fieldData.getValue().toString()) && fieldData.getValue().toString().contains("#cut#") ){

kxs-user/kxs-user-api/src/main/java/com/kxs/user/api/dto/kxsapp/userAccount/UserAmountVariationListDTO.java

@@ -1,10 +1,7 @@
 package com.kxs.user.api.dto.kxsapp.userAccount;
 
 import com.kxs.common.core.valid.NormMonth;
-import com.kxs.common.core.valid.Phone;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.util.List;