20230306 18:57

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -1778,7 +1778,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			// 通过
 			if (operate == 1) {
 				auditProecess.setAuditStatus("A");
-				if (auditProecess.getLevelId() == 1) {
+				//if (auditProecess.getLevelId() == 1) {
 					R submit;
 					if ("fybx".equals(proecessTemp.getCheckType())) {
 						submit = claimClient.passCheck(auditProecess.getSrcBillId());
@@ -1793,7 +1793,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 					if (!submit.isSuccess()) {
 						throw new SecurityException(submit.getMsg());
 					}
-				}
+				//}
 				R save = messageClient.save(sendMessage);
 				if (!save.isSuccess()) {
 					throw new SecurityException("发送消息失败");

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/controller/DeliveryController.java

@@ -132,42 +132,41 @@ public class DeliveryController extends BladeController {
 		redisClient.basicData("all");
 		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
 		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
+		List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageDesc"), StorageDesc.class);
 
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().forEach(item ->{
 				if (item.getCorpId() != null){
 					CorpsDesc corpMessage = corpsDescList.stream().filter(corps -> corps.getId().equals(item.getCorpId())).findFirst().orElse(null);
-					/*R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());*/
 					if (ObjectUtil.isNotEmpty(corpMessage)){
 						item.setCorpsName(corpMessage.getCname());
 					}
 				}
 				if (item.getSalesCompany() != null){
 					CorpsDesc corpMessage = corpsDescList.stream().filter(corps -> corps.getId().equals(item.getSalesCompany())).findFirst().orElse(null);
-					/*R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getSalesCompany());*/
 					if (ObjectUtil.isNotEmpty(corpMessage)){
 						item.setSalesCompanyName(corpMessage.getCname());
 					}
 				}
 				if (item.getCreateUser() != null){
 					User user = userList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().orElse(null);
-					/*R<User> user = iUserClient.userInfoById(item.getCreateUser());*/
 					if (ObjectUtil.isNotEmpty(user)){
 						item.setCreateUserName(user.getName());
 					}
 				}
 				if (item.getUpdateUser() != null){
 					User user1 = userList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().orElse(null);
-					/*R<User> user1 = iUserClient.userInfoById(item.getUpdateUser());*/
 					if (ObjectUtil.isNotEmpty(user1)){
 						item.setUpdateUserName(user1.getName());
 					}
 				}
 				//仓库信息
-				StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
-				if(storageDesc!=null)
-				{
-					item.setStorageName(storageDesc.getCname());
+				if (item.getStorageId() != null){
+					StorageDesc storageDesc = storageDescList.stream().filter(e -> e.getId().equals(item.getStorageId())).findFirst().orElse(null);
+					if(storageDesc!=null)
+					{
+						item.setStorageName(storageDesc.getCname());
+					}
 				}
 
 				//获得明细到货数量和到货金额
@@ -220,34 +219,45 @@ public class DeliveryController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(delivery.getArrivalEndTime()),Delivery::getArrivalTime,delivery.getArrivalEndTime());//确认到货日期结束
 		lambdaQueryWrapper.orderByDesc(Delivery::getId);
 		List<Delivery> list = deliveryService.list(lambdaQueryWrapper);
+
+		redisClient.basicData("all");
+		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
+		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
+		List<StorageDesc> storageDescList = castToList(redisTemplate.opsForValue().get("storageDesc"), StorageDesc.class);
+
 		if (CollectionUtils.isNotEmpty(list)){
 			list.forEach(item ->{
 				if (item.getCorpId() != null){
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
-					if (corpMessage.isSuccess() && corpMessage.getData() != null){
-						item.setCorpsName(corpMessage.getData().getCname());
+					CorpsDesc corpMessage = corpsDescList.stream().filter(corps -> corps.getId().equals(item.getCorpId())).findFirst().orElse(null);
+					if (ObjectUtil.isNotEmpty(corpMessage)){
+						item.setCorpsName(corpMessage.getCname());
 					}
 				}
 				if (item.getSalesCompany() != null){
-					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getSalesCompany());
-					if (corpMessage.isSuccess() && corpMessage.getData() != null){
-						item.setSalesCompanyName(corpMessage.getData().getCname());
+					CorpsDesc corpMessage = corpsDescList.stream().filter(corps -> corps.getId().equals(item.getSalesCompany())).findFirst().orElse(null);
+					if (ObjectUtil.isNotEmpty(corpMessage)){
+						item.setSalesCompanyName(corpMessage.getCname());
 					}
 				}
-				R<User> user = iUserClient.userInfoById(item.getCreateUser());
-				if (user.isSuccess() && user.getData() != null){
-					item.setCreateUserName(user.getData().getName());
+				if (item.getCreateUser() != null){
+					User user = userList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().orElse(null);
+					if (ObjectUtil.isNotEmpty(user)){
+						item.setCreateUserName(user.getName());
+					}
 				}
-
-				R<User> user1 = iUserClient.userInfoById(item.getUpdateUser());
-				if (user1.isSuccess() && user1.getData() != null){
-					item.setUpdateUserName(user1.getData().getName());
+				if (item.getUpdateUser() != null){
+					User user1 = userList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().orElse(null);
+					if (ObjectUtil.isNotEmpty(user1)){
+						item.setUpdateUserName(user1.getName());
+					}
 				}
 				//仓库信息
-				StorageDesc storageDesc = iStorageClient.findById(item.getStorageId());
-				if(storageDesc!=null)
-				{
-					item.setStorageName(storageDesc.getCname());
+				if (item.getStorageId() != null){
+					StorageDesc storageDesc = storageDescList.stream().filter(e -> e.getId().equals(item.getStorageId())).findFirst().orElse(null);
+					if(storageDesc!=null)
+					{
+						item.setStorageName(storageDesc.getCname());
+					}
 				}
 
 				//获得明细到货数量和到货金额
@@ -262,7 +272,7 @@ public class DeliveryController extends BladeController {
 				//实际到货金额
 				item.setActualArrivalAmount(itemsList.stream().reduce(BigDecimal.ZERO, (x, y) -> {
 					return x.add(y.getArrivalQuantity().multiply(y.getPrice()));
-				},BigDecimal::add));
+				},BigDecimal::add).setScale(2,BigDecimal.ROUND_HALF_UP));
 
 			});
 		}
@@ -301,7 +311,7 @@ public class DeliveryController extends BladeController {
 		return deliveryService.submit(delivery);
 	}
 	/**
-	 * 撤销发货通知单
+	 * 撤销确认收货
 	 */
 	@PostMapping("/repeal")
 	@ApiOperationSupport(order = 7)

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/IDeliveryService.java

@@ -53,15 +53,16 @@ public interface IDeliveryService extends IService<Delivery> {
 	 * @return
 	 */
 	Delivery getDeliveryMessage(Delivery delivery);
+
 	/**
-	 * 提交发货明细
+	 * 确认收货或撤销确认收货
 	 * @param delivery
 	 * @return
 	 */
 	R submit(Delivery delivery);
 
 	/**
-	 * 国内贸易发货单 确认或撤销收货
+	 * 国内贸易发货单 确认或撤销到货
 	 * @param delivery
 	 * @return
 	 */

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -271,6 +271,9 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		//获取发货主表数据
 		Delivery selectById = baseMapper.selectById(delivery.getId());
 
+		redisClient.basicData("all");
+		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
+
 		//获得包装要求
 		Order order = new Order();
 		order.setOrderNo(selectById.getOrderNo());
@@ -279,9 +282,11 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			selectById.setPackageRemarks(listR.getPackageRemarks());
 		}
 		//获取创建人中文名
-		R<User> createUser = userClient.userInfoById(selectById.getCreateUser());
-		if (createUser.isSuccess() || createUser.getData() != null) {
-			selectById.setCreateUserName(createUser.getData().getName());
+		if (selectById.getCreateUser() != null){
+			User user = userList.stream().filter(e -> e.getId().equals(selectById.getCreateUser())).findFirst().orElse(null);
+			if (ObjectUtil.isNotEmpty(user)){
+				selectById.setCreateUserName(user.getName());
+			}
 		}
 		//获取客户中文名
 		if (selectById.getCorpId() != null) {
@@ -329,6 +334,9 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		return selectById;
 	}
 
+	/**
+	 * 确认收货及撤销确认收货
+	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
@@ -472,8 +480,8 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	}
 
 	@Override
-	@GlobalTransactional(timeoutMills = 12000000)
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R revocation(Delivery delivery) {
 		Long deliveryId = delivery.getId();
 		Delivery select = baseMapper.selectById(deliveryId);

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/BusinessOverpaymentItemServiceImpl.java

@@ -95,7 +95,7 @@ public class BusinessOverpaymentItemServiceImpl extends ServiceImpl<BusinessOver
 		}else {
 			businessOverpayment.setOutOverpaymen(BigDecimal.ZERO);
 		}
-
+		//余额=增加-使用
 		businessOverpayment.setBalanceOverpaymen(businessOverpayment.getInOverpayment().subtract(businessOverpayment.getOutOverpaymen()));
 		businessOverpaymentService.updateById(businessOverpayment);
 

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryController.java

@@ -26,15 +26,19 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.client.entity.CorpsDesc;
+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.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.school.entity.*;
 import org.springblade.school.service.ISalaryItemService;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.school.vo.SalaryVO;
@@ -42,6 +46,7 @@ import org.springblade.school.service.ISalaryService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -59,6 +64,8 @@ public class SalaryController extends BladeController {
 	private final ISalaryService salaryService;
 	private final IUserClient userClient;
 	private final ISalaryItemService salaryItemService;
+	private final IRedisClient redisClient;//redis缓存处理
+	private final RedisTemplate<String, Object> redisTemplate;
 	/**
 	 * 详情
 	 */
@@ -83,16 +90,23 @@ public class SalaryController extends BladeController {
 		lambdaQueryWrapper.setEntity(salary);
 		lambdaQueryWrapper.orderByDesc(Salary::getAnnual).orderByDesc(Salary::getMoon);
 		IPage<Salary> pages = salaryService.page(Condition.getPage(query), lambdaQueryWrapper);
+
+		redisClient.basicData("all");
+		List<User> userList = castToList(redisTemplate.opsForValue().get("user"), User.class);
+
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{
-				R<User> user = userClient.userInfoById(item.getCreateUser());
-				if (user.isSuccess() && user.getData() != null){
-					item.setCreateUserName(user.getData().getName());
+				if (item.getCreateUser() != null){
+					User user = userList.stream().filter(e -> e.getId().equals(item.getCreateUser())).findFirst().orElse(null);
+					if (ObjectUtil.isNotEmpty(user)){
+						item.setCreateUserName(user.getName());
+					}
 				}
+
 				if (item.getUpdateUser() != null){
-					R<User> info = userClient.userInfoById(item.getUpdateUser());
-					if (info.isSuccess() && info.getData() != null){
-						item.setUpdateUserName(info.getData().getName());
+					User info = userList.stream().filter(e -> e.getId().equals(item.getUpdateUser())).findFirst().orElse(null);
+					if (ObjectUtil.isNotEmpty(info)){
+						item.setUpdateUserName(info.getName());
 					}
 				}
 				//获取工资额
@@ -263,4 +277,24 @@ public class SalaryController extends BladeController {
 		return R.data(salaryService.salaryAverage(salary));
 	}
 
+	/**
+	 * 将Object转换成List类型
+	 *
+	 * @param obj   Object对象
+	 * @param clazz 数据类型
+	 * @param <T>   泛型类型
+	 * @return List类型
+	 */
+	public static <T> List<T> castToList(Object obj, Class<T> clazz) {
+		List<T> resList = new ArrayList<>();
+		// 如果不是List<?>对象，是没有办法转换的
+		if (obj instanceof List<?>) {
+			for (Object o : (List<?>) obj) {
+				// 将对应的元素进行类型转换
+				resList.add(clazz.cast(o));
+			}
+			return resList;
+		}
+		return resList;
+	}
 }