app销售订单列表接口更改

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.common.annotation.RepeatSubmit;
+import org.springblade.common.enums.NumberEnum;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -93,6 +94,7 @@ public class OrderController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入order")
 	public R<IPage<PjOrder>> list(PjOrder order, Query query) {
+		BladeUser selectedUser = AuthUtil.getUser();
 		LambdaQueryWrapper<PjOrder> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.select(PjOrder::getId, PjOrder::getOrdNo, PjOrder::getSrcOrdNo, PjOrder::getBusinessSource,
 				PjOrder::getSalesCompanyName, PjOrder::getCustomerName, PjOrder::getSalerName, PjOrder::getStorageName,
@@ -106,10 +108,10 @@ public class OrderController extends BladeController {
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
 				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount, PjOrder::getVersion,
 				PjOrder::getDeliveryBusinesDate, PjOrder::getSalesCompanyId, PjOrder::getBillType, PjOrder::getRemarks, PjOrder::getPaymentRecoveredBalance)
-			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
+			.eq(PjOrder::getTenantId, selectedUser.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())
-			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())//公司
+			.eq(PjOrder::getSalesCompanyId, selectedUser.getDeptId())//公司
 			.eq(ObjectUtils.isNotEmpty(order.getBillType()), PjOrder::getBillType, order.getBillType())
 			.eq(ObjectUtils.isNotEmpty(order.getReturnsStatus()), PjOrder::getReturnsStatus, order.getReturnsStatus())//退货状态
 			.eq(ObjectUtils.isNotEmpty(order.getStorageName()), PjOrder::getStorageName, order.getStorageName())
@@ -173,16 +175,27 @@ public class OrderController extends BladeController {
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		}
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
-			if (AuthUtil.getUserRole().contains("业务员")) {
-				lambdaQueryWrapper.eq(PjOrder::getSalerId, AuthUtil.getUserId());
-			} else if (AuthUtil.getUserRole().contains("客户")) {
-				lambdaQueryWrapper.eq(PjOrder::getCreateUser, AuthUtil.getUserId());
+		String userStorageId = ParameterUtils.getStorageId();
+		boolean whetherDatabaseSharding = ParameterUtils.whetherDatabaseSharding();
+		// selectedUser
+		String userRole = AuthUtil.getUserRole();
+		if (!userRole.contains("admin") && !userRole.contains("老板")) {
+			if (userRole.contains("业务员")) {
+				if (ObjectUtils.isNotNull(userStorageId) && whetherDatabaseSharding) {
+					lambdaQueryWrapper.and(e -> e.eq(PjOrder::getSalerId, selectedUser.getUserId()).or().apply("find_in_set(storage_id,'" + ParameterUtils.getStorageId() + "')"));
+					// lambdaQueryWrapper.apply("find_in_set(storage_id,'" + ParameterUtils.getStorageId() + "')");
+				} else {
+					lambdaQueryWrapper.eq(PjOrder::getSalerId, selectedUser.getUserId());
+				}
+			} else if (userRole.contains("客户")) {
+				lambdaQueryWrapper.eq(PjOrder::getCreateUser, selectedUser.getUserId());
+			} else if (ObjectUtils.isNotNull(userStorageId) && whetherDatabaseSharding){
+				lambdaQueryWrapper.apply("find_in_set(storage_id,'" + userStorageId + "')");
 			}
 		}
-		if (ObjectUtils.isNotNull(ParameterUtils.getStorageId()) && ParameterUtils.whetherDatabaseSharding()) {
+/*		if (ObjectUtils.isNotNull(ParameterUtils.getStorageId()) && ParameterUtils.whetherDatabaseSharding()) {
 			lambdaQueryWrapper.apply("find_in_set(storage_id,'" + ParameterUtils.getStorageId() + "')");
-		}
+		}*/
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(order.getStorageId()), PjOrder::getStorageId, order.getStorageId());
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())) {
@@ -755,6 +768,7 @@ public class OrderController extends BladeController {
 
 	/**
 	 * 销售列表不分页查询
+	 * 小程序待付款列表
 	 */
 	@GetMapping("/listAll1")
 	@ApiOperationSupport(order = 2)
@@ -767,7 +781,7 @@ public class OrderController extends BladeController {
 			.eq(PjOrder::getIsDeleted, 0)
 			//公司
 			.eq(PjOrder::getSalesCompanyId, user.getDeptId())
-			.eq(PjOrder::getActualPaymentStatus, 1)
+			.eq(PjOrder::getActualPaymentStatus, NumberEnum.ONE.number)
 			.eq(PjOrder::getCustomerId, pjCorpsAttn.getPid())
 			.in(PjOrder::getBsType, "XS", "GX")
 			.orderByDesc(PjOrder::getCreateTime);