2022年10月13日19:11:17

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -285,13 +285,5 @@ public class GoodsDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "规格型号")
 	private String specificationAndModel;
-	/**
-	 * 出口价格库id集合(配件)
-	 */
-	@ApiModelProperty(value = "出口价格库id集合")
-	private String partsIds;
-
-	@TableField(exist = false)
-	private List<PriceBank> priceBankList;
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsSpecification.java

@@ -139,5 +139,17 @@ public class GoodsSpecification implements Serializable {
 	@ApiModelProperty(value = "属性值")
 	private String attributeData;
 
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+
+	/**
+	 * 类型  0:属性  1:配件
+	 */
+	@ApiModelProperty(value = "类型  0:属性  1:配件")
+	private String type;
+
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IRedisClient.java

@@ -26,6 +26,6 @@ public interface IRedisClient {
 	 * @return
 	 */
 	@GetMapping(REFRESH_REDIS)
-	boolean selectItemsIdGoods(@RequestParam("type") String type);
+	boolean basicData(@RequestParam("type") String type);
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -970,5 +970,11 @@ public class Order implements Serializable {
 	 * 货物类型
 	 */
 	@ApiModelProperty(value = "货物类型")
-	private BigDecimal cargoType;
+	private String cargoType;
+
+	/**
+	 * 总数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal sumNumber;
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderCostItem.java

@@ -150,5 +150,17 @@ public class OrderCostItem implements Serializable {
 	@ApiModelProperty(value = "租户")
 	private String tenantId;
 
+	/**
+	 * 箱型
+	 */
+	@ApiModelProperty(value = "箱型")
+	private String boxPile;
+
+	/**
+	 * 价格
+	 */
+	@ApiModelProperty(value = "价格")
+	private BigDecimal amount;
+
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/RedisClient.java

@@ -1,7 +1,9 @@
 package org.springblade.client;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.feign.IRedisClient;
@@ -33,7 +35,7 @@ public class RedisClient implements IRedisClient {
 	private final RedisTemplate<String, Object> redisTemplate;
 
 	@Override
-	public boolean selectItemsIdGoods(String type) {
+	public boolean basicData(String type) {
 
 
 		//redis缓存基础资料数据
@@ -59,13 +61,15 @@ public class RedisClient implements IRedisClient {
 
 		//客户
 		if (RedisKey.REDIS_CORPS.equals(type)) {
-			R<List<CorpsDescVO>> list = corpsDescClient.selCorpsDetails(AuthUtil.getTenantId());
-			if (list.isSuccess()) {
+			CorpsDesc corpsDesc = new CorpsDesc();
+			corpsDesc.setTenantId(AuthUtil.getTenantId());
+			List<CorpsDesc> list = corpsDescClient.getCorp(corpsDesc);
+			if (ObjectUtils.isNotNull(list)) {
 				if (redisTemplate.hasKey(type)) {
-					redisTemplate.opsForValue().set(type, list.getData());
+					redisTemplate.opsForValue().set(type, list);
 					redisTemplate.persist(type);
 				} else {
-					redisTemplate.opsForValue().getAndSet(type, list.getData());
+					redisTemplate.opsForValue().getAndSet(type, list);
 				}
 			}
 		}

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -18,6 +18,7 @@ import org.springblade.client.corps.service.ICorpsTypeService;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.CorpsType;
 import org.springblade.client.entity.CorpsTypeDesc;
+import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.vo.CorpListVo;
 import org.springblade.client.vo.CorpsDescVO;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -60,6 +61,7 @@ public class CorpsDescController extends BladeController {
 	private final IOrderDescClient orderDescClient;
 	private final IFinanceClient financeClient;
 	private final ICorpsTypeDescService corpsTypeDescService;
+	private final IRedisClient redisClient;//redis缓存处理
 
 	/**
 	 * 详情
@@ -148,7 +150,9 @@ public class CorpsDescController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入corpsDesc")
 	public R save(@Valid @RequestBody CorpsDesc corpsDesc) {
-		return R.status(corpsDescService.save(corpsDesc));
+		boolean status = corpsDescService.save(corpsDesc);
+		redisClient.basicData("corps");
+		return R.status(status);
 	}
 
 	/**
@@ -200,7 +204,9 @@ public class CorpsDescController extends BladeController {
 
 		typeList.remove(corpsDesc.getCorpType());
 		desc.setCorpType(String.join(",", typeList));
-		return R.status(corpsDescService.updateById(desc));
+		boolean status = corpsDescService.updateById(corpsDesc);
+		redisClient.basicData("corps");
+		return R.status(status);
 	}
 
 	/**
@@ -225,7 +231,9 @@ public class CorpsDescController extends BladeController {
 		if ("NotUNIQUE".equals(corpsDescService.selectCorpsDescCname(corpsDesc))) {
 			return R.data(200, "error", "客户名称已存在");
 		}
-		return corpsDescService.submit(corpsDesc);
+		R corpsDesc1 = corpsDescService.submit(corpsDesc);
+		redisClient.basicData("corps");
+		return corpsDesc1;
 	}
 
 
@@ -236,8 +244,9 @@ public class CorpsDescController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-
-		return R.status(corpsDescService.removeByIds(Func.toLongList(ids)));
+		boolean status = corpsDescService.removeByIds(Func.toLongList(ids));
+		redisClient.basicData("corps");
+		return R.status(status);
 	}
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -29,6 +29,7 @@ import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.*;
+import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.goods.enums.GoodsTypeEnum;
 import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.goods.excel.GoodsExcels;
@@ -99,8 +100,7 @@ public class GoodsDescController extends BladeController {
 
 	private final GoodsFilesMapper goodsFilesMapper;
 
-
-	private final IPriceBankClient priceBankClient;
+	private final IRedisClient redisClient;//redis缓存处理
 
 	/**
 	 * 详情
@@ -236,9 +236,6 @@ public class GoodsDescController extends BladeController {
 			.eq(GoodsSpecification::getTenantId, SecureUtil.getTenantId())
 		);
 		goodsDesc.setGoodsSpecificationList(goodsSpecificationList);
-
-		goodsDesc.setPriceBankList(priceBankClient.selectById(goodsDesc.getPartsIds()));
-
 		return R.data(goodsDesc);
 	}
 
@@ -250,12 +247,14 @@ public class GoodsDescController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
 	public R<?> modify(@RequestBody GoodsDesc goodsDesc) {
 		goodsDescService.modify(goodsDesc);
+		redisClient.basicData("goods");
 		return R.data(goodsDesc);
 	}
 
 	@DeleteMapping("delete")
 	public R delete(@RequestParam(name = "id", required = true) String id) {
 		goodsDescService.removeByIds(Func.toLongList(id));
+		redisClient.basicData("goods");
 		return R.success("操作成功");
 	}
 
@@ -287,7 +286,9 @@ public class GoodsDescController extends BladeController {
 	public R save(@Valid @RequestBody GoodsDesc goodsDesc) {
 		goodsDesc.setTenantId(AuthUtil.getTenantId());
 		goodsDesc.setType(GoodsTypeEnum.GOODS.getType());
-		return R.status(goodsDescService.save(goodsDesc));
+		boolean status = goodsDescService.save(goodsDesc);
+		redisClient.basicData("goods");
+		return R.status(status);
 	}
 
 	/**
@@ -307,8 +308,9 @@ public class GoodsDescController extends BladeController {
 		if (listR.isSuccess() && listR.getData().size() > 0) {
 			throw new SecurityException("存在绑定明细信息,禁止删除");
 		}
-
-		return R.status(goodsDescService.updateById(goodsDesc));
+		boolean status = goodsDescService.updateById(goodsDesc);
+		redisClient.basicData("goods");
+		return R.status(status);
 	}
 
 	/**
@@ -331,7 +333,9 @@ public class GoodsDescController extends BladeController {
 		goodsDescService.selectGoodsCode(goodsDesc);
 		goodsDescService.selectGoodsCname(goodsDesc);
 		goodsDesc.setType(GoodsTypeEnum.GOODS.getType());
-		return R.data(goodsDescService.saveMessage(goodsDesc));
+		GoodsDesc goodsDesc1 = goodsDescService.saveMessage(goodsDesc);
+		redisClient.basicData("goods");
+		return R.data(goodsDesc1);
 	}
 
 
@@ -342,7 +346,9 @@ public class GoodsDescController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(goodsDescService.removeByIds(Func.toLongList(ids)));
+		boolean status = goodsDescService.removeByIds(Func.toLongList(ids));
+		redisClient.basicData("goods");
+		return R.status(status);
 	}
 
 	/**
@@ -379,9 +385,7 @@ public class GoodsDescController extends BladeController {
 						e.setCorpCode(desc.getCode());
 					}
 				}
-				e.setPriceBankList(priceBankClient.selectById(e.getPartsIds()));
 			});
-
 		}
 		return R.data(goodsDescVOIPage);
 	}

blade-service/blade-client/src/main/java/org/springblade/client/serial/controller/StorageDescController.java

@@ -17,20 +17,22 @@
 package org.springblade.client.serial.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-
-import javax.validation.Valid;
-
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.entity.StorageTypeDesc;
+import org.springblade.client.feign.IRedisClient;
+import org.springblade.client.serial.service.IStorageDescService;
 import org.springblade.client.serial.service.IStorageTypeDescService;
+import org.springblade.client.vo.StorageDescVO;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -38,11 +40,8 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.client.vo.StorageDescVO;
-import org.springblade.client.serial.service.IStorageDescService;
-import org.springblade.core.boot.ctrl.BladeController;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -63,6 +62,8 @@ public class StorageDescController extends BladeController {
 
 	private final IStorageTypeDescService storageTypeDescService;
 
+	private final IRedisClient redisClient;//redis缓存处理
+
 	/**
 	 * 详情
 	 */
@@ -105,7 +106,9 @@ public class StorageDescController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入storageDesc")
 	public R save(@Valid @RequestBody StorageDesc storageDesc) {
-		return R.status(storageDescService.save(storageDesc));
+		boolean status = storageDescService.save(storageDesc);
+		redisClient.basicData("storageDesc");
+		return R.status(status);
 	}
 
 	/**
@@ -119,7 +122,9 @@ public class StorageDescController extends BladeController {
 			return R.fail(500, "请选择要删除的数据");
 		}
 		storageDesc.setIsDeleted(1);
-		return R.status(storageDescService.updateById(storageDesc));
+		boolean status = storageDescService.updateById(storageDesc);
+		redisClient.basicData("storageDesc");
+		return R.status(status);
 	}
 
 	/**
@@ -144,7 +149,9 @@ public class StorageDescController extends BladeController {
 		if ("NotUNIQUE".equals(storageDescService.selectStorageDescCname(storageDesc))) {
 			return R.fail(500, "库区名称已存在");
 		}
-		return R.data(storageDescService.saveMessage(storageDesc));
+		StorageDesc storageDesc1 = storageDescService.saveMessage(storageDesc);
+		redisClient.basicData("storageDesc");
+		return R.data(storageDesc1);
 	}
 
 
@@ -155,7 +162,9 @@ public class StorageDescController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(storageDescService.removeByIds(Func.toLongList(ids)));
+		boolean status = storageDescService.removeByIds(Func.toLongList(ids));
+		redisClient.basicData("storageDesc");
+		return R.status(status);
 	}
 
 	/**
@@ -183,11 +192,11 @@ public class StorageDescController extends BladeController {
 		List<StorageDesc> list = new ArrayList<>();
 		LambdaQueryWrapper<StorageTypeDesc> storageTypeDesc = new LambdaQueryWrapper<>();
 		storageTypeDesc
-			.eq(ObjectUtils.isNotNull(storageTypeId),StorageTypeDesc::getStorageTypeId, storageTypeId)
+			.eq(ObjectUtils.isNotNull(storageTypeId), StorageTypeDesc::getStorageTypeId, storageTypeId)
 			.eq(StorageTypeDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(StorageTypeDesc::getStatus, 0);
 		List<StorageTypeDesc> storageTypeDescList = storageTypeDescService.list(storageTypeDesc);
-		for (StorageTypeDesc storageTypeDescs:storageTypeDescList) {
+		for (StorageTypeDesc storageTypeDescs : storageTypeDescList) {
 			StorageDesc storageDesc = storageDescService.getById(storageTypeDescs.getStorageId());
 			list.add(storageDesc);
 		}

blade-service/blade-client/src/main/java/org/springblade/client/serial/controller/StorageTypeController.java

@@ -26,6 +26,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.client.entity.StorageType;
+import org.springblade.client.feign.IRedisClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -54,6 +55,8 @@ public class StorageTypeController extends BladeController {
 
 	private final IStorageTypeService storageTypeService;
 
+	private final IRedisClient redisClient;//redis缓存处理
+
 	/**
 	 * 详情
 	 */
@@ -101,7 +104,9 @@ public class StorageTypeController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入storageType")
 	public R save(@Valid @RequestBody StorageType storageType) {
-		return R.status(storageTypeService.save(storageType));
+		boolean status = storageTypeService.save(storageType);
+		redisClient.basicData("storageType");
+		return R.status(status);
 	}
 
 	/**
@@ -119,7 +124,9 @@ public class StorageTypeController extends BladeController {
 			return R.fail(500,"存在下级仓库不能删除");
 		}
 		storageType.setIsDeleted(1);
-		return R.status(storageTypeService.updateById(storageType));
+		boolean status = storageTypeService.updateById(storageType);
+		redisClient.basicData("storageType");
+		return R.status(status);
 	}
 
 	/**
@@ -144,7 +151,9 @@ public class StorageTypeController extends BladeController {
 		if ("NotUNIQUE".equals(storageTypeService.selectStorageTypeCname(storageType))){
 			return R.fail(500,"仓库名称已存在");
 		}
-		return R.data(storageTypeService.saveMessage(storageType));
+		StorageType storageType1 = storageTypeService.saveMessage(storageType);
+		redisClient.basicData("storageType");
+		return R.data(storageType1);
 	}
 
 
@@ -155,7 +164,9 @@ public class StorageTypeController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(storageTypeService.removeByIds(Func.toLongList(ids)));
+		boolean status = storageTypeService.removeByIds(Func.toLongList(ids));
+		redisClient.basicData("storageType");
+		return R.status(status);
 	}
 	/**
 	 * 懒加载获取仓库树形结构

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -51,10 +51,7 @@ import org.springblade.finance.vojo.Items;
 import org.springblade.purchase.sales.entity.*;
 import org.springblade.purchase.sales.enums.OrderStatusEnum;
 import org.springblade.purchase.sales.excel.*;
-import org.springblade.purchase.sales.mapper.OrderFeesMapper;
-import org.springblade.purchase.sales.mapper.OrderItemsMapper;
-import org.springblade.purchase.sales.mapper.OrderMapper;
-import org.springblade.purchase.sales.mapper.OrderPartsMapper;
+import org.springblade.purchase.sales.mapper.*;
 import org.springblade.purchase.sales.service.IOrderService;
 import org.springblade.purchase.sales.vo.*;
 import org.springblade.stock.entity.StockGoods;
@@ -131,6 +128,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	//租户
 	private final ITenantClient iTenantClient;
 
+	private final OrderCostItemMapper orderCostItemMapper;
+
+	private final OrderCostMapper orderCostMapper;
+
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
 		List<OrderVO> orderVOList = baseMapper.selectOrderPage(page, order);
@@ -1488,17 +1489,37 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	/**
 	 * 计算国内费用
+	 *
 	 * @param order
 	 * @return
 	 */
 	@Override
 	public BigDecimal calculationDomesticFees(Order order) {
 
-//		if (){
-//
-//		}
-
-		return null;
+		LambdaQueryWrapper<OrderCost> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(OrderCost::getGoodsAttribute, order.getCargoType())
+			.eq(OrderCost::getOutHarborName, order.getPortOfLoad())
+			.eq(OrderCost::getStatus, 0)
+			.eq(OrderCost::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderCost::getIsDeleted, 0);
+
+		OrderCost orderCost = orderCostMapper.selectOne(lambdaQueryWrapper);
+
+		LambdaQueryWrapper<OrderCostItem> itemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		itemLambdaQueryWrapper.eq(OrderCostItem::getPId, orderCost.getId())
+			.eq(OrderCostItem::getDepartureId, order.getPortOfLoad())
+			.eq(OrderCostItem::getBoxPile, order.getBoxPile())
+			.eq(OrderCostItem::getStatus, 0)
+			.eq(OrderCostItem::getTenantId, AuthUtil.getTenantId())
+			.eq(OrderCostItem::getIsDeleted, 0);
+		OrderCostItem orderCostItem = orderCostItemMapper.selectOne(itemLambdaQueryWrapper);
+		if ("USD".equals(orderCostItem.getCurrency())) {
+			return orderCostItem.getAmount().multiply(order.getBoxNumber()).divide(order.getExchangeRate()).divide(order.getSumNumber());
+		} else if ("CNY".equals(orderCostItem.getCurrency())){
+			return orderCostItem.getAmount().multiply(order.getBoxNumber()).divide(order.getExchangeRate()).divide(order.getSumNumber());
+		}else{
+			return orderCostItem.getAmount().divide(order.getExchangeRate()).divide(order.getSumNumber());
+		}
 	}
 
 	@Override
@@ -1520,7 +1541,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(Order::getBillType, OrderTypeEnum.WAREHOUSING.getType())
 				.eq(Order::getTradeType, OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType());
 			int unrecognized = baseMapper.selectCount(RKlambdaQueryWrapper);
-			monthSales.setGrossAmount(BigDecimal.valueOf((int) (sum-unrecognized)));
+			monthSales.setGrossAmount(BigDecimal.valueOf((int) (sum - unrecognized)));
 			monthSales.setNotReachAmount(BigDecimal.valueOf((int) sum));
 			monthSales.setReachAmount(BigDecimal.valueOf((int) unrecognized));
 			if (monthSales.getGrossAmount().compareTo(BigDecimal.ZERO) > 0) {//达成金额%总金额*100（保留两位并四舍五入）
@@ -1529,10 +1550,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				monthSales.setYieldRate(BigDecimal.ZERO);
 			}
 		} else {
-			if (StringUtils.isBlank(order.getTradeType())){
+			if (StringUtils.isBlank(order.getTradeType())) {
 				throw new SecurityException("缺少贸易类型");
 			}
-			if (StringUtils.isBlank(order.getBillType())){
+			if (StringUtils.isBlank(order.getBillType())) {
 				throw new SecurityException("缺少订单类型");
 			}
 			if (StringUtils.isBlank(order.getTenantId())) {

blade-service/blade-user/pom.xml

@@ -38,6 +38,12 @@
             <artifactId>blade-system-api</artifactId>
             <version>2.8.2.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-client-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
+import org.springblade.client.feign.IRedisClient;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -78,6 +79,8 @@ public class UserController {
 	private final ISysClient sysClient;
 	private final IUserSearchClient userSearchClient;
 
+	private final IRedisClient redisClient;//redis缓存处理
+
 	/**
 	 * 查询单条
 	 */
@@ -267,7 +270,9 @@ public class UserController {
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R submit(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
-		return R.status(userService.submit(user));
+		boolean status = userService.submit(user);
+		redisClient.basicData("user");
+		return R.status(status);
 	}
 
 	/**
@@ -278,7 +283,9 @@ public class UserController {
 	@ApiOperation(value = "修改", notes = "传入User")
 	public R update(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
-		return R.status(userService.updateUser(user));
+		boolean status = userService.updateUser(user);
+		redisClient.basicData("user");
+		return R.status(status);
 	}
 
 	/**
@@ -290,7 +297,9 @@ public class UserController {
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R remove(@RequestParam String ids) {
 		CacheUtil.clear(USER_CACHE);
-		return R.status(userService.removeUser(ids));
+		boolean status = userService.removeUser(ids);
+		redisClient.basicData("user");
+		return R.status(status);
 	}
 
 	/**
@@ -315,6 +324,7 @@ public class UserController {
 	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
 		boolean temp = userService.resetPassword(userIds);
+		redisClient.basicData("user");
 		return R.status(temp);
 	}
 
@@ -328,6 +338,7 @@ public class UserController {
 							@ApiParam(value = "新密码", required = true) @RequestParam String newPassword,
 							@ApiParam(value = "新密码", required = true) @RequestParam String newPassword1) {
 		boolean temp = userService.updatePassword(user.getUserId(), oldPassword, newPassword, newPassword1);
+		redisClient.basicData("user");
 		return R.status(temp);
 	}
 
@@ -339,7 +350,9 @@ public class UserController {
 	@ApiOperation(value = "修改基本信息", notes = "传入User")
 	public R updateInfo(@Valid @RequestBody User user) {
 		CacheUtil.clear(USER_CACHE);
-		return R.status(userService.updateUserInfo(user));
+		boolean temp = userService.updateUserInfo(user);
+		redisClient.basicData("user");
+		return R.status(temp);
 	}
 
 	/**
@@ -401,7 +414,9 @@ public class UserController {
 	@ApiOperationSupport(order = 15)
 	@ApiOperation(value = "第三方注册用户", notes = "传入user")
 	public R registerGuest(User user, Long oauthId) {
-		return R.status(userService.registerGuest(user, oauthId));
+		boolean temp = userService.registerGuest(user, oauthId);
+		redisClient.basicData("user");
+		return R.status(temp);
 	}
 
 
@@ -412,7 +427,9 @@ public class UserController {
 	@ApiOperationSupport(order = 16)
 	@ApiOperation(value = "配置用户平台信息", notes = "传入user")
 	public R updatePlatform(Long userId, Integer userType, String userExt) {
-		return R.status(userService.updatePlatform(userId, userType, userExt));
+		boolean temp = userService.updatePlatform(userId, userType, userExt);
+		redisClient.basicData("user");
+		return R.status(temp);
 	}
 
 	/**

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/WoodHarvestingCloudController.java

@@ -60,8 +60,6 @@ public class WoodHarvestingCloudController {
 
 	private IGoodsDescClient goodsDescClient;//获取商品信息
 
-	private IRedisClient redisClient;//获取商品信息
-
 	/**
 	 * 导出采木云入库模板
 	 */
@@ -105,11 +103,6 @@ public class WoodHarvestingCloudController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询所有", notes = "传入order")
 	public R<IPage<Order>> list(Order order, Query query) {
-//		redisClient.selectItemsIdGoods("goods");
-//		redisClient.selectItemsIdGoods("corps");
-//		redisClient.selectItemsIdGoods("storageType");
-//		redisClient.selectItemsIdGoods("storageDesc");
-//		redisClient.selectItemsIdGoods("user");
 		IPage<Order> pages = orderService.selectOrderList(order, query);
 		return R.data(pages);
 	}
@@ -399,24 +392,6 @@ public class WoodHarvestingCloudController {
 		}
 		scanningCodeAddPcDto.setTenantId(AuthUtil.getTenantId());
 		IPage<ScanningCodeAddPcDto> pages = orderItemsService.selectScanningCodeAddPc(Condition.getPage(query), scanningCodeAddPcDto);
-		/*LambdaQueryWrapper<OrderItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(OrderItems::getTenantId, AuthUtil.getTenantId())
-			.eq(OrderItems::getIsDeleted, 0)
-			.eq(OrderItems::getPurchaserId, purchaserId)
-			.eq(OrderItems::getIsIssue, "3")
-			.eq(OrderItems::getBillType, OrderTypeEnum.WAREHOUSING.getType())
-			.eq(OrderItems::getScanningComparison, "N")
-			.like(ObjectUtils.isNotNull(billNo), OrderItems::getBillNo, billNo)
-			.eq(ObjectUtils.isNotNull(itemId), OrderItems::getItemId, itemId)
-			.eq(ObjectUtils.isNotNull(length), OrderItems::getLength, length)
-			.eq(ObjectUtils.isNotNull(thickness), OrderItems::getThickness, thickness)
-			.eq(ObjectUtils.isNotNull(grade), OrderItems::getGrade, grade)
-			.eq(ObjectUtils.isNotNull(containerNo), OrderItems::getContainerNo, containerNo)
-			.eq(ObjectUtils.isNotNull(itemType), OrderItems::getItemType, itemType)
-			.ge(ObjectUtils.isNotNull(stockTimeStart), OrderItems::getStockTime, stockTimeStart)
-			.le(ObjectUtils.isNotNull(stockTimeEnd), OrderItems::getStockTime, stockTimeEnd)
-			.eq(OrderItems::getWarehouseId, storageId);
-		IPage<OrderItems> pages = orderItemsService.page(Condition.getPage(query), lambdaQueryWrapper);*/
 		return R.data(pages);
 	}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -115,17 +115,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	private IDictBizClient dictBizClient;//字典
 	private final RedisTemplate<String, Object> redisTemplate;
 
-	//客户
-//	private final List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
-	//商品
-//	private final List<GoodsDesc> goodsList = castToList(redisTemplate.opsForValue().get("goods"), GoodsDesc.class);
-	//仓库
-//	private final List<StorageType> storageTypeList = castToList(redisTemplate.opsForValue().get("storageType"), StorageType.class);
-	//库区
-//	private final List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageDesc"), StorageDesc.class);
-	//用户
-//	private final List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
-
 
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
@@ -217,6 +206,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 */
 	@Override
 	public R<OrderVO> getOrderMessage(String id) {
+		//客户
+		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
+		//仓库
+		List<StorageType> storageTypeList = castToList(redisTemplate.opsForValue().get("storageType"), StorageType.class);
+		//用户
+		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
+
 		String tenantId = AuthUtil.getTenantId();
 		//获取订单主表信息
 		Order orderMessage = baseMapper.selectOne(Wrappers.<Order>lambdaQuery().eq(Order::getId, id)
@@ -228,28 +224,29 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		BeanUtil.copyProperties(orderMessage, vo);
 		/*OrderVO vo = OrderMapstructMapper.INSTANCE.toVo(orderMessage);*/
 		//获取创建人中文名
-		R<User> createUser = userClient.userInfoById(vo.getCreateUser());
-
-		if (createUser.isSuccess()) {
-			vo.setCreateUserName(createUser.getData().getName());
+		if (ObjectUtils.isNotNull(userList)){
+			User createUser = userList.stream().filter(user -> user.getId().equals(vo.getCreateUser())).findFirst().orElse(null);
+			if (ObjectUtils.isNotNull(createUser)) {
+				vo.setCreateUserName(createUser.getName());
+			}
 		}
 		//获取供应商中文名
 		if (orderMessage.getCorpId() != null) {
-			CorpsDesc corpMessage = corpsDescClient.getCorpId(orderMessage.getCorpId());
+			CorpsDesc corpMessage = corpsDescList.stream().filter(corp -> corp.getId().equals(orderMessage.getCorpId())).findFirst().orElse(null);
 			if (ObjectUtils.isNotNull(corpMessage)) {
 				vo.setCorpName(corpMessage.getCname());
 			}
 		}
 		//获取货权人中文名
 		if (orderMessage.getPurchaserId() != null) {
-			CorpsDesc corpMessage = corpsDescClient.getCorpId(orderMessage.getPurchaserId());
+			CorpsDesc corpMessage = corpsDescList.stream().filter(corp -> corp.getId().equals(orderMessage.getPurchaserId())).findFirst().orElse(null);
 			if (ObjectUtils.isNotNull(corpMessage)) {
 				vo.setPurchaser(corpMessage.getCname());
 			}
 		}
 		if (ObjectUtils.isNotNull(orderMessage.getStorageId())) {
 			//仓库
-			StorageType storageType = iStorageClient.getStorageType(orderMessage.getStorageId());
+			StorageType storageType = storageTypeList.stream().filter(storage -> storage.getId().equals(orderMessage.getStorageId())).findFirst().orElse(null);
 			if (ObjectUtils.isNotNull(storageType)) {
 				vo.setStorageName(storageType.getCname());
 			}
@@ -284,12 +281,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		} else {
 			vo.setOrderFilesList(new ArrayList<>());
 		}
-		//获取订单修改日志信息
-		/*List<OrderModify> modifyList = orderModifyService.list(Wrappers.<OrderModify>lambdaQuery().eq(OrderModify::getPid, vo.getId())
-			.eq(OrderModify::getTenantId, SecureUtil.getTenantId()).eq(OrderModify::getIsDeleted, 0).orderByAsc(OrderModify::getSort));
-		if (CollectionUtils.isNotEmpty(modifyList)) {
-			vo.setOrderModifyList(modifyList);
-		}*/
 		return R.data(vo);
 	}
 
@@ -798,6 +789,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * @return 子订单集合
 	 */
 	public List<OrderItems> getOrderItems(Long orderId, Long createId) {
+		//库区
+		List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageDesc"), StorageDesc.class);
 		// 查询订单明细信息
 		List<OrderItems> orderItemsList = orderItemsService.list(Wrappers.<OrderItems>lambdaQuery()
 			.eq(OrderItems::getPid, orderId).eq(OrderItems::getTenantId, SecureUtil.getTenantId())
@@ -807,7 +800,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		orderItemsList.forEach(item -> {
 			if (item.getItemId() != null) {
 				//库区
-				StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
+				StorageDesc storageDesc = storageDescList.stream().filter(storage -> storage.getId().equals(item.getStorageId())).findFirst().orElse(null);
 				if (ObjectUtils.isNotNull(storageDesc)) {
 					item.setStorageName(storageDesc.getCname());
 				}
@@ -841,6 +834,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	 * @return 费用集合
 	 */
 	public List<OrderFees> getOrderFees(Long orderId) {
+		//客户
+		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
 		// 查询费用明细
 		List<OrderFees> orderFeesList = orderFeesService.list(Wrappers.<OrderFees>lambdaQuery().eq(OrderFees::getPid, orderId).eq(OrderFees::getIsDeleted, 0)
 			.eq(OrderFees::getTenantId, SecureUtil.getTenantId()));
@@ -856,9 +851,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 					//获取客户名称
 					if (item.getCorpId() != null) {
-						R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
-						if (corpMessage.isSuccess() && corpMessage.getData() != null) {
-							item.setCorpName(corpMessage.getData().getCname());
+						CorpsDesc corpMessage = corpsDescList.stream().filter(corp -> corp.getId().equals(item.getCorpId())).findFirst().orElse(null);
+						if (ObjectUtils.isNotNull(corpMessage)) {
+							item.setCorpName(corpMessage.getCname());
 						}
 					}
 				}
@@ -988,12 +983,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public List<CMYWarehousingExcel> warehousing(List<CMYWarehousingExcel> excelList) {
+		//商品
+		List<GoodsDesc> goodsList = castToList(redisTemplate.opsForValue().get("goods"), GoodsDesc.class);
+		//库区
+		List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageDesc"), StorageDesc.class);
 
 		for (CMYWarehousingExcel cMYWarehousingExcel : excelList) {
 			cMYWarehousingExcel.setContainerNo(cMYWarehousingExcel.getContainerNo());//箱号
 			if (ObjectUtils.isNotNull(cMYWarehousingExcel.getReservoirAreaName())) {
 				//库区
-				StorageDesc storageDesc = iStorageClient.getName(cMYWarehousingExcel.getReservoirAreaName());
+				StorageDesc storageDesc = storageDescList.stream().filter(storage -> storage.getCname().equals(cMYWarehousingExcel.getReservoirAreaName())).findFirst().orElse(null);
 				if (ObjectUtils.isNotNull(storageDesc)) {
 					cMYWarehousingExcel.setStorageId(storageDesc.getId());
 				} else {
@@ -1002,7 +1001,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 			if (ObjectUtils.isNotNull(cMYWarehousingExcel.getGoodsName())) {
 				//品名
-				GoodsDesc goodsDesc = goodsDescClient.getGoodsDescByCname(cMYWarehousingExcel.getGoodsName());
+				GoodsDesc goodsDesc = goodsList.stream().filter(goods -> goods.getCname().equals(cMYWarehousingExcel.getGoodsName())).findFirst().orElse(null);
 				if (ObjectUtils.isNotNull(goodsDesc)) {
 					cMYWarehousingExcel.setItemId(goodsDesc.getId());
 				} else {
@@ -2132,6 +2131,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public IPage<Order> selectOrderList(Order order, Query query) {
+		//客户
+		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
+		//仓库
+		List<StorageType> storageTypeList = castToList(redisTemplate.opsForValue().get("storageType"), StorageType.class);
+		//用户
+		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
 
 		QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("is_deleted", 0)
@@ -2141,18 +2146,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(ObjectUtils.isNotNull(order.getBusinessType()), "business_type", order.getBusinessType());
 		if (ObjectUtils.isNotNull(order.getPurchaser())) {
 			//货权人
-//			CorpsDesc corpsDesc = corpsDescList.stream().filter(corps -> corps.getCname().equals(order.getPurchaser())).findFirst().orElse(null);
-			R<CorpsDesc> corpsDesc = corpsDescClient.getCorpByName(order.getPurchaser(), AuthUtil.getTenantId());
+			CorpsDesc corpsDesc = corpsDescList.stream().filter(corps -> corps.getCname().equals(order.getPurchaser())).findFirst().orElse(null);
 			if (ObjectUtils.isNotNull(corpsDesc)) {
-				queryWrapper.eq(ObjectUtils.isNotNull(order.getPurchaserId()), "purchaser_id", corpsDesc.getData().getId());
+				queryWrapper.eq(ObjectUtils.isNotNull(order.getPurchaserId()), "purchaser_id", corpsDesc.getId());
 			}
 		} else {
 			queryWrapper.eq(ObjectUtils.isNotNull(order.getPurchaserId()), "purchaser_id", order.getPurchaserId());
 		}
 		if (ObjectUtils.isNotNull(order.getStorageName())) {
 			//仓库
-//			StorageType storageType = storageTypeList.stream().filter(storageTypes -> storageTypes.getCname().equals(order.getStorageName())).findFirst().orElse(null);
-			StorageType storageType = iStorageClient.storageTypeName(order.getStorageName());
+			StorageType storageType = storageTypeList.stream().filter(storageTypes -> storageTypes.getCname().equals(order.getStorageName())).findFirst().orElse(null);
 			if (ObjectUtils.isNotNull(storageType)) {
 				queryWrapper.eq("storage_id", storageType.getId());
 			}
@@ -2181,10 +2184,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 		}
-		queryWrapper.apply(ObjectUtils.isNotNull(order.getCreateStartTime()),"DATE_FORMAT(stock_time,'%Y-%m-%d') >= DATE_FORMAT('"+order.getCreateStartTime()+"','%Y-%m-%d')")
-		.apply(ObjectUtils.isNotNull(order.getCreateStartTime()),"DATE_FORMAT(stock_time,'%Y-%m-%d') >= DATE_FORMAT('"+order.getCreateStartTime()+"','%Y-%m-%d')")
-//		queryWrapper.ge(ObjectUtils.isNotNull(order.getCreateEndTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d')", order.getCreateEndTime())
-//			.le(ObjectUtils.isNotNull(order.getCreateEndTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d')", order.getCreateEndTime())
+		queryWrapper.apply(ObjectUtils.isNotNull(order.getCreateStartTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d') >= DATE_FORMAT('" + order.getCreateStartTime() + "','%Y-%m-%d')")
+			.apply(ObjectUtils.isNotNull(order.getCreateEndTime()), "DATE_FORMAT(stock_time,'%Y-%m-%d') <= DATE_FORMAT('" + order.getCreateEndTime() + "','%Y-%m-%d')")
 			.orderByDesc("stock_time");
 		IPage<Order> pages = baseMapper.selectPage(Condition.getPage(query), queryWrapper);
 		List<Order> orderList = pages.getRecords();
@@ -2192,33 +2193,29 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		for (Order orders : orderList) {
 			if (ObjectUtils.isNotNull(orders.getStorageId())) {
 				//仓库
-//				StorageType storageType = storageTypeList.stream().filter(storageTypes -> storageTypes.getId().equals(orders.getStorageId())).findFirst().orElse(null);
-				StorageType storageType = iStorageClient.getStorageType(orders.getStorageId());
+				StorageType storageType = storageTypeList.stream().filter(storageTypes -> storageTypes.getId().equals(orders.getStorageId())).findFirst().orElse(null);
 				if (ObjectUtils.isNotNull(storageType)) {
 					orders.setStorageName(storageType.getCname());
 				}
 			}
 			//货权人
 			if (ObjectUtils.isNotNull(orders.getPurchaserId())) {
-//				CorpsDesc corpsDesc = corpsDescList.stream().filter(corps -> corps.getId().equals(orders.getPurchaserId())).findFirst().orElse(null);
-				R<CorpsDesc> corpsDesc = corpsDescClient.getCorpMessage(orders.getPurchaserId());
+				CorpsDesc corpsDesc = corpsDescList.stream().filter(corps -> corps.getId().equals(orders.getPurchaserId())).findFirst().orElse(null);
 				if (ObjectUtils.isNotNull(corpsDesc)) {
-					orders.setPurchaser(corpsDesc.getData().getCname());
+					orders.setPurchaser(corpsDesc.getCname());
 				}
 			}
 			//供应商
 			if (ObjectUtils.isNotNull(orders.getCorpId())) {
-//				CorpsDesc corpsDesc = corpsDescList.stream().filter(corps -> corps.getId().equals(orders.getCorpId())).findFirst().orElse(null);
-				R<CorpsDesc> corpsDesc = corpsDescClient.getCorpMessage(orders.getCorpId());
+				CorpsDesc corpsDesc = corpsDescList.stream().filter(corps -> corps.getId().equals(orders.getCorpId())).findFirst().orElse(null);
 				if (ObjectUtils.isNotNull(corpsDesc)) {
-					orders.setCorpName(corpsDesc.getData().getCname());
+					orders.setCorpName(corpsDesc.getCname());
 				}
 			}
 			//操作人
-//			User user = userList.stream().filter(u -> u.getId().equals(orders.getCreateUser())).findFirst().orElse(null);
-			R<User> user = userClient.userInfoById(orders.getCreateUser());
+			User user = userList.stream().filter(u -> u.getId().equals(orders.getCreateUser())).findFirst().orElse(null);
 			if (ObjectUtils.isNotNull(user)) {
-				orders.setSalesName(user.getData().getName());
+				orders.setSalesName(user.getName());
 			}
 		}
 		return pages;
@@ -2571,7 +2568,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 									text.append(order.getStorageQuantity()).append("*").append(agreementitems.getPrice()).append("*").append(date + 2).append("^");
 									date = date - (agreementitems.getEnDays() - agreementitems.getFromDays() + 1);
 								}
-							}else{
+							} else {
 
 							}
 						}
@@ -2748,6 +2745,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			}
 			return resList;
 		}
-		return null;
+		return resList;
 	}
 }