维多利亚

bladex/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserSearchServiceImpl.java

@@ -76,8 +76,8 @@ public class UserSearchServiceImpl extends BaseServiceImpl<UserMapper, User> imp
             return new HashMap<>();
         }
 
-        List<User> list = lambdaQuery().select(BaseEntity::getId, User::getName).in(User::getId, idList).list();
-        return list.stream().collect(Collectors.toMap(User::getId, User::getName));
+        List<User> list = lambdaQuery().select(BaseEntity::getId, User::getRealName).in(User::getId, idList).list();
+        return list.stream().collect(Collectors.toMap(User::getId, User::getRealName));
     }
 
     @Override

hx-common/common-tool/src/main/java/com/fjhx/base/BaseService.java

@@ -119,8 +119,8 @@ public interface BaseService<T> extends IService<T> {
     }
 
     default <K, V> Map<K, V> getKV(SFunction<T, K> kFun, SFunction<T, V> vFun, Consumer<LambdaQueryWrapper<T>> consumer) {
-        return list(Wrappers.<T>lambdaQuery().select(kFun, vFun).func(consumer))
-                .stream().collect(Collectors.toMap(kFun, vFun, (v1, v2) -> v2));
+        List<T> list = list(Wrappers.<T>lambdaQuery().select(kFun, vFun).func(consumer));
+        return list.stream().collect(Collectors.toMap(kFun, vFun, (v1, v2) -> v2));
     }
 
     default <K> Map<K, T> getKEntity(SFunction<T, K> kFun, Consumer<LambdaQueryWrapper<T>> consumer) {

hx-service/victoriatourist/src/main/java/com/fjhx/controller/purchase/PurchaseFlowController.java

@@ -56,8 +56,9 @@ public class PurchaseFlowController {
      */
     @PostMapping(value = "/details")
     public R details(@RequestBody Purchase entity) {
-        purchaseFlowService.details(entity);
-        return R.success();
+        Purchase details = purchaseFlowService.details(entity);
+        return R.success(details);
     }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -23,10 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -93,8 +90,8 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
         //查询快递100的物流信息
         JSONObject result = KD100Util.queryTrack(logisticsInfoVo.getLogisticsCompanyCode(), logisticsInfoVo.getCode());
         Integer state = result.getInteger("state");
-        if (state != LogisticsConstant.KD100Status.STATUS_3) {
-            //如果不是已签收状态，则开启订阅（物流状态跟踪并推送）
+        if (!Objects.equals(state, LogisticsConstant.KD100Status.STATUS_3)) {
+            // 如果不是已签收状态，则开启订阅（物流状态跟踪并推送）
             KD100Util.subscribe(logisticsInfoVo.getLogisticsCompanyCode(), logisticsInfoVo.getCode());
         }
         logisticsInfoVo.setLogisticsStatus(state);

hx-service/victoriatourist/src/main/java/com/fjhx/service/product/impl/ProductInfoServiceImpl.java

@@ -20,6 +20,7 @@ import com.fjhx.utils.Assert;
 import com.fjhx.utils.FileClientUtil;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import com.fjhx.utils.wrapperUtil.KeywordData;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
@@ -100,7 +101,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
 
         // 查询库存量
         if (Func.isNotEmpty(condition.get("warehouseId"))) {
-            //产品ID集合
+            // 产品ID集合
             List<Long> ids = page.getRecords().stream().map(item -> Convert.toLong(item.get("id"))).distinct().collect(Collectors.toList());
             List<Stock> stocks = stockService.lambdaQuery().eq(Stock::getWarehouseId, condition.get("warehouseId")).in(Stock::getGoodsId, ids).list();
             if (Func.isNotEmpty(stocks)) {
@@ -108,6 +109,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             }
         }
 
+        // 产品部门
         for (Map<String, Object> record : records) {
             Dept dept = deptMap.get(Convert.toLong(record.get("deptId")));
             record.put("deptName", dept == null ? "" : dept.getDeptName());
@@ -125,7 +127,14 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     @Override
     public void add(ProductInfoVo productInfoVo) {
 
+        Long deptId = 0L;
+        String deptIdStr = AuthUtil.getDeptId();
+        if (ObjectUtil.isNotEmpty(deptIdStr)) {
+            deptId = Convert.toLong(deptIdStr.split(",")[0]);
+        }
+
         productInfoVo.setComputingTime(new Date());
+        productInfoVo.setDeptId(deptId);
 
         synchronized (this) {
             if (productInfoVo.getDefinition() != null && productInfoVo.getDefinition().equals(1)) {

hx-service/victoriatourist/src/main/java/com/fjhx/service/product/impl/ProductSpuServiceImpl.java

@@ -59,9 +59,9 @@ public class ProductSpuServiceImpl extends ServiceImpl<ProductSpuMapper, Product
 
     @Override
     public void delete(ProductSpuVo productSpuVo) {
-        long count = productInfoService.count(q -> q
-                .eq(ProductInfo::getProductSpuId, productSpuVo.getId()));
-        Assert.eqZero(count, "此spu已关联产品，无法删除");
+        // long count = productInfoService.count(q -> q
+        //         .eq(ProductInfo::getProductSpuId, productSpuVo.getId()));
+        // Assert.eqZero(count, "此spu已关联产品，无法删除");
 
         removeById(productSpuVo.getId());
     }

hx-service/victoriatourist/src/main/java/com/fjhx/service/purchase/impl/PurchaseServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -93,7 +94,12 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
 
         // 供应商
         List<Long> supplierIdList = records.stream().map(Purchase::getSupplierId).filter(ObjectUtil::isNotEmpty).collect(Collectors.toList());
-        Map<Long, String> supplierIdNameMap = supplierService.getKV(Supplier::getId, Supplier::getName, q -> q.in(BaseEntity::getId, supplierIdList));
+        Map<Long, String> supplierIdNameMap;
+        if (supplierIdList.size() > 0) {
+            supplierIdNameMap = supplierService.getKV(Supplier::getId, Supplier::getName, q -> q.in(BaseEntity::getId, supplierIdList));
+        } else {
+            supplierIdNameMap = new HashMap<>();
+        }
 
         for (Purchase record : records) {
             // 赋值物流单号