2023年12月4日17:59:25

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -101,7 +101,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				if (ObjectUtils.isNull(tenant) || ObjectUtils.isNull(tenant.getData())) {
 					throw new UsernameNotFoundException("未查到租户信息");
 				}
-				user = userClient.loginByAccount(null, username, "4", tenant.getData().getTenantId(),appletsId);
+				user = userClient.loginByAccount(null, username, "4", tenant.getData().getTenantId(), appletsId);
 				if (ObjectUtils.isNull(user)) {
 					if ("wx0a0feca24b695636".equals(appletsId)) {
 						throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
@@ -116,7 +116,6 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 					saveUser.setAppletsId(appletsId);
 					saveUser.setUnionId(unionId);
 					saveUser.setTenantId(tenant.getData().getTenantId());
-					saveUser.setUserType(1);
 					saveUser.setAccount(username);
 					saveUser.setName(username);
 					saveUser.setRealName(username);
@@ -139,9 +138,9 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				}
 
 			} else {
-				user = userClient.loginByAccount(username, null, "2", null,null);
+				user = userClient.loginByAccount(username, null, "2", null, null);
 				if (ObjectUtils.isNull(user)) {
-					user = userClient.loginByAccount(null, username, "2", null,null);
+					user = userClient.loginByAccount(null, username, "2", null, null);
 					if (ObjectUtils.isNull(user)) {
 						throw new UsernameNotFoundException(TokenUtil.USER_NOT_FOUND);
 					}
@@ -181,17 +180,19 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 			}
 
 			// 获取用户类型
-			String userType = Func.toStr(request.getHeader(TokenUtil.USER_TYPE_HEADER_KEY), TokenUtil.DEFAULT_USER_TYPE);
+			Integer userType = user.getUserType();
 
 			// 远程调用返回数据
 			R<UserInfo> result;
 			// 根据不同用户类型调用对应的接口返回数据，用户可自行拓展
-			if (userType.equals(UserEnum.WEB.getName())) {
+			if (userType == UserEnum.WEB.getCategory()) {
 				result = userClient.userInfo(tenantId, user.getAccount(), UserEnum.WEB.getName());
-			} else if (userType.equals(UserEnum.APP.getName())) {
+			} else if (userType == UserEnum.APP.getCategory()) {
 				result = userClient.userInfo(tenantId, user.getAccount(), UserEnum.APP.getName());
-			} else {
+			} else if (userType == UserEnum.OTHER.getCategory()) {
 				result = userClient.userInfo(tenantId, user.getAccount(), UserEnum.OTHER.getName());
+			} else {
+				result = userClient.userInfo(tenantId, user.getAccount(), UserEnum.WECHAT.getName());
 			}
 
 			// 判断返回信息
@@ -233,7 +234,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				String corpName = "";
 				String corpAddress = "";
 				if (ObjectUtils.isNotNull(user.getId())) {
-					R<Map<String, String>> r = paymentClient.getCorpDesc(user.getId(),user.getTenantId());
+					R<Map<String, String>> r = paymentClient.getCorpDesc(user.getId(), user.getTenantId());
 					if (r.isSuccess()) {
 						if (ObjectUtils.isNotNull(r.getData().get("corpId"))) {
 							corpId = Long.parseLong(r.getData().get("corpId"));
@@ -325,7 +326,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				String corpName = "";
 				String corpAddress = "";
 				if (ObjectUtils.isNotNull(user.getId())) {
-					R<Map<String, String>> r = paymentClient.getCorpDesc(user.getId(),user.getTenantId());
+					R<Map<String, String>> r = paymentClient.getCorpDesc(user.getId(), user.getTenantId());
 					if (r.isSuccess()) {
 						if (ObjectUtils.isNotNull(r.getData().get("corpId"))) {
 							corpId = Long.parseLong(r.getData().get("corpId"));

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/enums/UserEnum.java

@@ -42,6 +42,10 @@ public enum UserEnum {
 	 * other
 	 */
 	OTHER("other", 3),
+	/**
+	 * 小程序
+	 */
+	WECHAT("小程序", 4),
 	;
 
 	final String name;

blade-service/blade-los/src/main/java/org/springblade/los/check/controller/AuditProecessController.java

@@ -226,7 +226,7 @@ public class AuditProecessController extends BladeController {
 		}
 		if ("HYCK-DJ".equals(proecess.getCheckType())) {
 			auditProecessService.losBillsCheck(auditProecess);
-		}else if ("HYCK-JSSQ".equals(proecess.getCheckType())) {
+		}else if ("HYCK-FFSQ".equals(proecess.getCheckType())) {
 			auditProecessService.losStlBillsCheck(auditProecess);
 		}
 		return R.data(auditProecess);

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/controller/FinStlBillsController.java

@@ -219,6 +219,37 @@ public class FinStlBillsController extends BladeController {
 		return finStlBillsService.deleteByIds(Func.toLongList(ids));
 	}
 
+	/**
+	 * 付费申请
+	 */
+	@PostMapping("/settlementApprove")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "确认", notes = "传入finStlBills")
+	public R settlementApprove(@Valid @RequestBody FinStlBills finStlBills) {
+		return finStlBillsService.settlementApprove(finStlBills);
+	}
+
+	/**
+	 * 付费申请 撤销
+	 */
+	@PostMapping("/revokeSettlementApprove")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "撤销", notes = "传入finStlBills")
+	public R revokeSettlementApprove(@Valid @RequestBody FinStlBills finStlBills) {
+		return finStlBillsService.revokeSettlementApprove(finStlBills);
+	}
+
+	/**
+	 * 付费申请明细
+	 */
+	@GetMapping("/approveDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入finStlBills")
+	public R<FinStlBills> approveDetail(FinStlBills finStlBills) {
+		FinStlBills detail = finStlBillsService.approveDetail(finStlBills);
+		return R.data(detail);
+	}
+
 
 	/**
 	 * 审核通过

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/IFinStlBillsService.java

@@ -89,4 +89,10 @@ public interface IFinStlBillsService extends IService<FinStlBills> {
 	R confirmSignFor(FinStlBills finStlBills);
 
 	R revokeSignFor(FinStlBills finStlBills);
+
+	R settlementApprove(FinStlBills finStlBills);
+
+	R revokeSettlementApprove(FinStlBills finStlBills);
+
+	FinStlBills approveDetail(FinStlBills finStlBills);
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/controller/ShipController.java

@@ -373,7 +373,6 @@ public class ShipController extends BladeController {
 		return shipService.returnWarehouse(ship);
 	}
 
-
 	/**
 	 * 库存账明细
 	 */

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -174,7 +174,9 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 		}
 
 		//库管员名称
-		ship.setStockClerkName(userClient.userInfoById(ship.getStockClerkId()).getData().getRealName());
+		if(ObjectUtils.isNotNull(ship.getStockClerkId())){
+			ship.setStockClerkName(userClient.userInfoById(ship.getStockClerkId()).getData().getRealName());
+		}
 		ship.setStorageName(storageDescMapper.selectById(ship.getStorageId()).getCname());
 
 		if (ship.getId() == null) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -236,7 +236,9 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 						shoppingCartList.forEach(e -> {
 							PjOrderItems orderItems = new PjOrderItems();
 							BeanUtils.copyProperties(e, orderItems);
-
+							if (e.getInventory().compareTo(orderItems.getGoodsNum()) < 0) {
+								throw new RuntimeException("库存不足");
+							}
 							orderItems.setId(null);
 							orderItems.setCreateUser(AuthUtil.getUserId());
 							orderItems.setCreateDept(order.getCreateDept());