2024年3月26日17:40:56

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/ProductLaunchExportExcel.java

@@ -0,0 +1,111 @@
+package org.springblade.salesPart.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springblade.salesPart.entity.PjProductLaunch;
+import org.springblade.salesPart.entity.PjProductLaunchFiles;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 产品导入导入模板实体类
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ProductLaunchExportExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 名称
+	 */
+	@ExcelProperty(value = "商品名称")
+	private String cname;
+
+	/**
+	 * 规格型号
+	 */
+	@ExcelProperty(value = "规格型号")
+	private String specificationAndModel;
+
+	/**
+	 * 花纹
+	 */
+	@ExcelProperty(value = "花纹")
+	private String brandItem;
+
+
+	/**
+	 * 所属公司名称
+	 */
+	@ExcelProperty(value = "公司")
+	private String salesCompanyName;
+
+	/**
+	 * 库存
+	 */
+	@ExcelProperty(value = "库存")
+	private BigDecimal inventory;
+
+	/**
+	 * 品牌名称
+	 */
+	@ExcelProperty(value = "品牌")
+	private String brandName;
+
+	/**
+	 * 售价1
+	 */
+	@ExcelProperty(value = "售价1")
+	private BigDecimal priceOne;
+	/**
+	 * 售价2
+	 */
+	@ExcelProperty(value = "售价2")
+	private BigDecimal priceTwo;
+	/**
+	 * 售价3
+	 */
+	@ExcelProperty(value = "售价3")
+	private BigDecimal priceThree;
+	/**
+	 * 售价4
+	 */
+	@ExcelProperty(value = "售价4")
+	private BigDecimal priceFour;
+
+	/**
+	 * 共享公司
+	 */
+	@ExcelProperty(value = "共享公司(英文逗号拼接)")
+	private String sharedCompany;
+
+	/**
+	 * 防爆（0否，1是）
+	 */
+	@ExcelProperty(value = "防爆（0否，1是）")
+	private Integer explosionProof;
+
+	/**
+	 * 静音棉
+	 */
+	@ExcelProperty(value = "静音棉")
+	private String originalFactory;
+
+	/**
+	 * 自修补
+	 */
+	@ExcelProperty(value = "自修补")
+	private String selfRecovery;
+
+}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -71,6 +71,8 @@ public interface ISysClient {
 	String GET_PARAM_SERVICE = API_PREFIX + "/getParamService";
 	String GET_PARAM_SERVICE_NEW = API_PREFIX + "/getParamServiceNew";
 	String GET_PARAM_SERVICE_DWT = API_PREFIX + "/getParamServiceDWT";
+
+	String GET_PARAM_SERVICE_BY_DEPT = API_PREFIX + "/getParamServiceByDept";
 	String UPDATE_BY_DEPT = API_PREFIX + "/updateByDept";
 
 
@@ -343,7 +345,16 @@ public interface ISysClient {
 	 * @return String
 	 */
 	@GetMapping(GET_PARAM_SERVICE_DWT)
-	String getParamServiceDWT(@RequestParam("paramKey") String paramKey,@RequestParam("tenantId")String tenantId);
+	String getParamServiceDWT(@RequestParam("paramKey") String paramKey, @RequestParam("tenantId") String tenantId);
+
+	/**
+	 * 获取业务参数配置
+	 *
+	 * @param paramKey 参数key
+	 * @return String
+	 */
+	@GetMapping(GET_PARAM_SERVICE_BY_DEPT)
+	String getParamServiceByDept(@RequestParam("paramKey") String paramKey, @RequestParam("tenantId") String tenantId, @RequestParam("salesCompanyId") String salesCompanyId);
 
 	/**
 	 * 配件获取所属公司

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -181,6 +181,11 @@ public class ISysClientFallback implements ISysClient {
 	}
 
 	@Override
+	public String getParamServiceByDept(String paramKey, String tenantId, String salesCompanyId) {
+		return "获取数据失败";
+	}
+
+	@Override
 	public R<Dept> getDeptIByName(String tenantId, String deptName) {
 		return R.fail("获取数据失败");
 	}

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -76,7 +76,7 @@ public interface IUserClient {
 	String UPDATE_BY_ID_POINTS_BALANCE = API_PREFIX + "/updateByIdPointsBalance";
 
 	@GetMapping(LIST_USER_BY_ROLE_ID)
-	R<List<User>> listUserByRoleId(@RequestParam("roleId") Long roleId, @RequestParam(value = "tenantId", required = false) String tenantId, @RequestParam(value = "salesCompanyId", required = false) Long salesCompanyId);
+	R<List<User>> listUserByRoleId(@RequestParam("roleId") String roleId, @RequestParam(value = "tenantId", required = false) String tenantId, @RequestParam(value = "salesCompanyId", required = false) String salesCompanyId);
 
 	/**
 	 * 获取用户信息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxItemController.java

@@ -368,7 +368,7 @@ public class TradingBoxItemController extends BladeController {
 						.eq(TradingBoxItem::getPid, tradingBox.getId())
 						.eq(TradingBoxItem::getCode, tradingBoxItem.getCode());
 					List<TradingBoxItem> tradingBoxItemList1 = tradingBoxItemService.list(tradingBoxItemLambdaQueryWrapper);
-					if (ObjectUtils.isNotNull(tradingBoxItemList1) && tradingBoxItemList1.size() > 0) {
+					if (ObjectUtils.isNotNull(tradingBoxItemList1) && !tradingBoxItemList1.isEmpty()) {
 						throw new RuntimeException("箱号：" + tradingBoxItem.getCode() + "已存在，保存失败");
 					}
 					if ("ZR".equals(tradingBox.getType())) {
@@ -417,7 +417,7 @@ public class TradingBoxItemController extends BladeController {
 				}
 				//明细图片
 				List<TradingBoxFiles> tradingBoxItemFilesList = tradingBoxItem.getTradingBoxFilesList();
-				if (ObjectUtils.isNotNull(tradingBoxItemFilesList) && tradingBoxItemFilesList.size() > 0) {
+				if (ObjectUtils.isNotNull(tradingBoxItemFilesList) && !tradingBoxItemFilesList.isEmpty()) {
 					for (TradingBoxFiles tradingBoxFiles : tradingBoxItemFilesList) {
 						if (tradingBoxFiles.getId() == null) {
 							tradingBoxFiles.setCreateUser(AuthUtil.getUserId());
@@ -536,7 +536,7 @@ public class TradingBoxItemController extends BladeController {
 		}
 		//明细图片
 		List<TradingBoxFiles> tradingBoxItemFilesList = tradingBoxItem.getTradingBoxFilesList();
-		if (ObjectUtils.isNotNull(tradingBoxItemFilesList) && tradingBoxItemFilesList.size() > 0) {
+		if (ObjectUtils.isNotNull(tradingBoxItemFilesList) && !tradingBoxItemFilesList.isEmpty()) {
 			for (TradingBoxFiles tradingBoxFiles : tradingBoxItemFilesList) {
 				if (tradingBoxFiles.getId() == null) {
 					tradingBoxFiles.setCreateUser(AuthUtil.getUserId());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/ocean/service/impl/ShippingBillServiceImpl.java

@@ -869,7 +869,7 @@ public class ShippingBillServiceImpl extends ServiceImpl<ShippingBillMapper, Shi
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/DeclareCustomsServiceImpl.java

@@ -809,7 +809,7 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/RepairServiceImpl.java

@@ -675,7 +675,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(),null,null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -977,7 +977,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息
@@ -1012,7 +1012,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public TradingBox rentCalculation(TradingBox tradingBox) {
 		List<TradingBoxItem> tradingBoxItemList = tradingBox.getTradingBoxItemsList();
-		if (tradingBoxItemList.size() < 1) {
+		if (tradingBoxItemList.isEmpty()) {
 			throw new RuntimeException("明细不能为空");
 		}
 		int days = 0;
@@ -1235,16 +1235,38 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				tradingBoxFees.setCode(tradingBoxItem.getCode());
 				tradingBoxFeesList.add(tradingBoxFees);
 			}
-			if ("ZC".equals(billType) && ObjectUtils.isNotNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())) {
+			/*if ("ZC".equals(billType) && ObjectUtils.isNotNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())) {
+				tradingBoxItem.setStatus("待使用");
+			}else if ("ZC".equals(billType) && ObjectUtils.isNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())){
+				tradingBoxItem.setStatus("使用");
+			}else if ("ZR".equals(billType)&& ObjectUtils.isNotNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())){
 				tradingBoxItem.setStatus("待使用");
+			}else if ("ZR".equals(billType)&& ObjectUtils.isNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())){
+				tradingBoxItem.setStatus("使用");
 			}
-
+*/
+			if ("ZR".equals(billType)) {
+				if (ObjectUtils.isNotNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())) {
+					tradingBoxItem.setStatus("待使用");
+				} else {
+					tradingBoxItem.setStatus("录入");
+				}
+			} else if ("ZC".equals(billType)) {
+				if (ObjectUtils.isNotNull(tradingBoxItemExcelEnter.getLeaseCommencementDate())) {
+					tradingBoxItem.setStatus("使用");
+				} else {
+					tradingBoxItem.setStatus("录入");
+				}
+			}
+			tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+			tradingBoxItem.setCreateTime(new Date());
+			tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
 			tradingBoxItemList.add(tradingBoxItem);
 		}
-		if (tradingBoxItemList.size() > 0) {
+		if (!tradingBoxItemList.isEmpty()) {
 			tradingBoxItemService.saveOrUpdateBatch(tradingBoxItemList);
 		}
-		if (tradingBoxFeesList.size() > 0) {
+		if (!tradingBoxFeesList.isEmpty()) {
 			tradingBoxFeesService.saveOrUpdateBatch(tradingBoxFeesList);
 		}
 		if ("SELL".equals(billType) || "BUY".equals(billType)) {
@@ -1508,7 +1530,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					//给角色为财务的人发送消息
 					R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 					if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+						R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 						if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 							for (User datum : userList.getData()) {
 								//循环发送消息
@@ -1619,7 +1641,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					//给角色为财务的人发送消息
 					R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 					if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+						R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 						if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 							for (User datum : userList.getData()) {
 								//循环发送消息
@@ -1811,7 +1833,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -876,7 +876,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -1032,7 +1032,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

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

@@ -956,7 +956,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 					// 给角色为助理的人发送消息
 					R<String> roleId = sysClient.getRoleIds(AuthUtil.getTenantId(), "助理");
 					if (roleId.isSuccess() && roleId.getData() != null) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(roleId.getData()),null,null);
+						R<List<User>> userList = userClient.listUserByRoleId(roleId.getData(),null,null);
 						if (userList.isSuccess() && userList.getData() != null) {
 							userList.getData().forEach(user -> {
 								// 推送消息提醒助理生成采购

blade-service/blade-client/src/main/java/org/springblade/client/message/service/impl/MessageServiceImpl.java

@@ -86,7 +86,7 @@ public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> impl
 		//角色id
 		Long roleId = roleByAlias.getData();
 		//查询此角色下全部用户
-		R<List<User>> listR = userClient.listUserByRoleId(roleId,null,null);
+		R<List<User>> listR = userClient.listUserByRoleId(roleId+"",null,null);
 		if (!listR.isSuccess()) {
 			throw new SecurityException("查询用户列表信息错误");
 		}

blade-service/blade-land/src/main/java/org/springblade/land/insurance/service/impl/InsuranceServiceImpl.java

@@ -436,7 +436,7 @@ public class InsuranceServiceImpl extends ServiceImpl<InsuranceMapper, Insurance
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(),null,null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息

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

@@ -1634,7 +1634,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -185,6 +185,9 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			.eq(BCurrency::getTenantId, AuthUtil.getTenantId())
 			.eq(BCurrency::getIsDeleted, 0)
 			.eq(BCurrency::getCode, MagicValues.USD));
+		List<BCorps> bCorpsLists = bCorpsService.list(new LambdaQueryWrapper<BCorps>()
+			.eq(BCorps::getTenantId, AuthUtil.getTenantId())
+			.eq(BCorps::getIsDeleted, 0));
 		if (MagicValues.BUSINESS.equals(reportCode) && MagicValues.SALES_REPORT.equals(groupCode) && (MagicValues.HYCK.equals(type) || MagicValues.HYJK.equals(type))) {
 			List<Bills> list = new ArrayList<>();
 			Bills bills = billsService.getById(billId);
@@ -535,7 +538,6 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								feeCenterReports1.setFeeCnName(i.getFeeCnName());
 								feeCenterReports1.setHblno(i.getHblno());
 								feeCenterReports1.setPid(i.getPid());
-								feeCenterReports1.setCorpCnName(i.getCorpCnName());
 								feeCenterReports1.setAmountC(i.getAmountC());
 								feeCenterReports1.setAmountLocC(i.getAmountLocC());
 								feeCenterReports1.setAmountUsdC(i.getAmountUsdC());

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -666,7 +666,7 @@ public class PaymentServiceImpl implements IPaymentService {
 							//给角色为财务的人发送消息
 							R<String> clientDeptIds = sysClient.getRoleIds(parametersDetails.getTenantId(), "客服");
 							if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-								R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId());
+								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId()+"");
 								if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 									for (User datum : userList.getData()) {
 										if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
@@ -874,7 +874,10 @@ public class PaymentServiceImpl implements IPaymentService {
 							//给角色为财务的人发送消息
 							R<String> clientDeptIds = sysClient.getRoleIds(parametersDetails.getTenantId(), "客服");
 							if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-								R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId());
+								System.out.println("所属公司id：" + selectOrder.getSalesCompanyId());
+								System.out.println("租户号：" + parametersDetails.getTenantId());
+								System.out.println("角色id：" + clientDeptIds.getData());
+								R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId() + "");
 								if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 									for (User datum : userList.getData()) {
 										//循环发送消息

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

@@ -7881,7 +7881,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			String date1 = format.format(new Date());
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "管理员");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					StringBuilder openIds = new StringBuilder();
 					for (User datum : userList.getData()) {
@@ -8415,7 +8415,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -8619,7 +8619,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsStatisticsController.java

@@ -67,7 +67,9 @@ public class CorpsStatisticsController {
 				lambdaQueryWrapper.eq(PjOrder::getBsType, "CG");
 			}
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
-			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
+			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			if (ObjectUtils.isNotNull(corpsDescDto1.getCreditLimit()) && ObjectUtils.isNotNull(corpsDescDto1.getUseCreditLimit())) {
 				corpsDescDto1.setCreditLimitBalance(corpsDescDto1.getCreditLimit().subtract(corpsDescDto1.getUseCreditLimit()));
 			}
@@ -121,7 +123,9 @@ public class CorpsStatisticsController {
 				lambdaQueryWrapper.eq(PjOrder::getBsType, "CG");
 			}
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
-			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
+			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {
 				BigDecimal sumAmount = orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -163,7 +167,9 @@ public class CorpsStatisticsController {
 			if (ObjectUtils.isNotNull(corpsDescDto1.getCreditLimit()) && ObjectUtils.isNotNull(corpsDescDto1.getUseCreditLimit())) {
 				corpsDescDto1.setCreditLimitBalance(corpsDescDto1.getCreditLimit().subtract(corpsDescDto1.getUseCreditLimit()));
 			}
-			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
+			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {
 				BigDecimal totalAmount = orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -235,7 +235,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 
 			data.forEach(e -> {
 				String type = e.getType();
-				PjCorpsType corpsType = corpsTypeMapper.selectCorpsTypeCname(type, AuthUtil.getTenantId(),AuthUtil.getDeptId());
+				PjCorpsType corpsType = corpsTypeMapper.selectCorpsTypeCname(type, AuthUtil.getTenantId(), AuthUtil.getDeptId());
 				if (corpsType != null) {
 					countList.add(true);
 					PjCorpsDesc corpsDesc = new PjCorpsDesc();
@@ -343,7 +343,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 
 			data.forEach(e -> {
 				String type = e.getType();
-				PjCorpsType corpsType = corpsTypeMapper.selectCorpsTypeCname(type, AuthUtil.getTenantId(),AuthUtil.getDeptId());
+				PjCorpsType corpsType = corpsTypeMapper.selectCorpsTypeCname(type, AuthUtil.getTenantId(), AuthUtil.getDeptId());
 				if (corpsType != null) {
 					countList.add(true);
 					PjCorpsDesc corpsDesc = new PjCorpsDesc();
@@ -688,7 +688,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		}
 
 
-		PjCorpsDesc pjCorpsDesc = baseMapper.selectCorpsDescCname(corpsDesc.getCname(),AuthUtil.getDeptId(), AuthUtil.getTenantId());
+		PjCorpsDesc pjCorpsDesc = baseMapper.selectCorpsDescCname(corpsDesc.getCname(), AuthUtil.getDeptId(), AuthUtil.getTenantId());
 		if (ObjectUtils.isNotNull(pjCorpsDesc)) {
 			pjCorpsDesc.setSalesCompanyId(deptId);
 			pjCorpsDesc.setSalesCompanyName(deptName);
@@ -725,7 +725,6 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 			PjCorpsAddr corpsAddr = corpsAddrService.getOne(new LambdaQueryWrapper<PjCorpsAddr>().eq(PjCorpsAddr::getIsDeleted, 0)
 				.eq(PjCorpsAddr::getTenantId, AuthUtil.getTenantId())
 				.eq(PjCorpsAddr::getPid, pjCorpsDesc.getId())
-				.eq(PjCorpsAddr::getDefaultAddres, "1")
 				.eq(PjCorpsAddr::getTel, corpsDesc.getTel()));
 			if (ObjectUtils.isNotNull(corpsAddr)) {
 				corpsAddr.setContacts(corpsDesc.getAttn());
@@ -749,14 +748,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 				corpsAddr1.setCreateUser(AuthUtil.getUserId());
 				corpsAddr1.setSalesCompanyId(deptId);
 				corpsAddr1.setSalesCompanyName(deptName);
-				long count = corpsAddrService.count(new LambdaQueryWrapper<PjCorpsAddr>().eq(PjCorpsAddr::getIsDeleted, 0)
-					.eq(PjCorpsAddr::getTenantId, AuthUtil.getTenantId())
-					.eq(PjCorpsAddr::getPid, pjCorpsDesc.getId()));
-				if (count > 1) {
-					corpsAddr1.setDefaultAddres("0");
-				} else {
-					corpsAddr1.setDefaultAddres("1");
-				}
+				corpsAddr1.setDefaultAddres("0");
 				corpsAddrService.save(corpsAddr1);
 			}
 		} else {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -167,7 +167,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 			}
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "管理员");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					StringBuilder openIds = new StringBuilder();
 					for (User datum : userList.getData()) {
@@ -739,7 +739,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		StringBuilder openIds = new StringBuilder();
 		R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "管理员");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-			R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
@@ -924,7 +924,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		StringBuilder openIds = new StringBuilder();
 		R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "管理员");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-			R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					if (ObjectUtils.isNotNull(datum.getOaOpenId())) {

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

@@ -36,7 +36,6 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.purchase.sales.feign.IIntegralDetailClient;
 import org.springblade.salesPart.brand.service.IBrandFilesService;
 import org.springblade.salesPart.corps.service.ICorpsAttnService;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
@@ -49,7 +48,6 @@ import org.springblade.salesPart.order.service.IOrderService;
 import org.springblade.salesPart.vo.OrderStatistics;
 import org.springblade.salesPart.vo.OrderVO;
 import org.springblade.salesPart.vo.PjOrderStatisticsWeb;
-import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
@@ -84,8 +82,6 @@ public class OrderController extends BladeController {
 	private final ICorpsDescService corpsDescService;
 	private final IGoodsFilesService goodsFilesService;
 	private final IBrandFilesService brandFilesService;
-	private final ISysClient sysClient;
-	private final IIntegralDetailClient iIntegralDetailClient;
 
 	/**
 	 * 销售详情
@@ -138,7 +134,9 @@ public class OrderController extends BladeController {
 		} else {
 			lambdaQueryWrapper.ne(ObjectUtils.isNotEmpty(order.getActualPaymentStatus()), PjOrder::getActualPaymentStatus, order.getActualPaymentStatus());//来源单号
 		}
-		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
+		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
+			" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
+			" 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("业务员")) {
@@ -231,7 +229,9 @@ public class OrderController extends BladeController {
 		} else {
 			lambdaQueryWrapper.ne(ObjectUtils.isNotEmpty(order.getActualPaymentStatus()), PjOrder::getActualPaymentStatus, order.getActualPaymentStatus());//来源单号
 		}
-		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND actual_payment_status = 2 ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
+		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
+			" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
+			" 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("业务员")) {
@@ -749,7 +749,9 @@ public class OrderController extends BladeController {
 				lambdaQueryWrapperXS.gt(PjOrder::getSalerId, AuthUtil.getTenantId());
 			}
 		}
-		lambdaQueryWrapperXS.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
+		lambdaQueryWrapperXS.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
+			" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
+			" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		List<PjOrder> pjOrderListXS = orderService.list(lambdaQueryWrapperXS);
 		List<PjOrder> pjOrderListCG = orderService.list(new LambdaQueryWrapper<PjOrder>().eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
@@ -839,7 +841,9 @@ public class OrderController extends BladeController {
 			lambdaQueryWrapper.ge(ObjectUtils.isNotNull(order.getBusinesDateList().get(0)), PjOrder::getBusinesDate, order.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(ObjectUtils.isNotNull(order.getBusinesDateList().get(1)), PjOrder::getBusinesDate, order.getBusinesDateList().get(1));
 		}
-		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
+		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
+			"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
+			"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 		List<PjOrder> pages = orderService.list(lambdaQueryWrapper);
 		if ("1".equals(order.getExportType())) {
@@ -877,7 +881,7 @@ public class OrderController extends BladeController {
 	}
 
 	/**
-	 * 消费记录
+	 * 消费记录(额度支付)
 	 */
 	@GetMapping("/consumptionRecords")
 	public R<IPage<PjOrder>> consumptionRecords(PjOrder order, Query query) {
@@ -900,7 +904,8 @@ public class OrderController extends BladeController {
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.ne(PjOrder::getWhetherIntegral, "1")
-			.eq(PjOrder::getCustomerId, order.getCustomerId());
+			.eq(PjOrder::getCustomerId, order.getCustomerId())
+			.eq(PjOrder::getBusinessSource, "额度支付");
 		return R.data(orderService.page(Condition.getPage(query), lambdaQueryWrapper));
 	}
 

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

@@ -91,7 +91,9 @@ public class OrderStatisticsController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
-		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
+		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+			"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+			"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		String createUserIds = "";

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -134,7 +134,9 @@
         WHERE
             po.tenant_id = #{order.tenantId}
           AND po.is_deleted = 0
-          and (( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
+          and (( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) )
+                   OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))
+        OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
         <if test="order.businesDateList != null and order.businesDateList[0] != null and order.businesDateList[0]!= ''">
             and po.busines_date &gt;= #{order.businesDateList[0]}
         </if>
@@ -163,7 +165,8 @@
         AND FIND_IN_SET( po.actual_payment_status, '2,3' ))
         OR (
         po.business_source = '内部销售'
-        AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' )))
+        AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' ))
+        OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
         <if test="firstDay != null">
             and po.busines_date &gt;= #{firstDay}
         </if>
@@ -262,7 +265,9 @@
         WHERE
             o.tenant_id = #{order.tenantId}
           AND o.is_deleted = '0'
-        and (( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))
+        and (( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) )
+                 OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' ))
+                OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
         <if test="order.customerId!=null">
             and o.customer_id = #{order.customerId}
         </if>
@@ -310,7 +315,9 @@
         WHERE
         o.tenant_id = #{order.tenantId}
         AND o.is_deleted = '0'
-        and (( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) ) OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' )))
+        and (( o.business_source = '外部销售' AND FIND_IN_SET( o.actual_payment_status, '2,3' ) )
+                 OR (o.business_source = '内部销售' AND FIND_IN_SET( o.actual_payment_status, '0,1,2,3' ))
+        OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
         <if test="order.customerId!=null">
             and o.customer_id = #{order.customerId}
         </if>
@@ -411,7 +418,8 @@
           AND poi.tenant_id = #{tenantId}
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
-                   OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' )))
+                   OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' ))
+            OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &lt;= DATE_FORMAT(#{endDate},'%Y-%m')
@@ -435,7 +443,8 @@
           AND poi.tenant_id = #{tenantId}
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
-            OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' )))
+            OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' ))
+            OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &lt;= DATE_FORMAT(#{endDate},'%Y-%m')
@@ -462,7 +471,8 @@
           AND poi.tenant_id = #{tenantId}
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
-            OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' )))
+            OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' ))
+            OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &lt;= DATE_FORMAT(#{endDate},'%Y-%m')
@@ -488,7 +498,8 @@
           AND poi.tenant_id = #{tenantId}
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
-            OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' )))
+            OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3' ))
+        OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &lt;= DATE_FORMAT(#{endDate},'%Y-%m')

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -329,7 +329,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getBsType, "XS")
 			.eq(PjOrder::getBusinesDate, dateS)
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))"));
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))"));
 		if (!orderList.isEmpty()) {
 			return R.data(orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 		} else {
@@ -1367,7 +1369,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjOrder.setXcxStatus(OrderTypeEnum.XSDFH.getType());
 		pjOrder.setGenerateTask(OrderTypeEnum.SCRW.getType());
 		baseMapper.updateById(pjOrder);
-		if ("挂账".equals(pjOrder.getReceivableType())) {
+		/*if ("挂账".equals(pjOrder.getReceivableType())) {
 			PjCorpsDesc pjCorpsDesc = corpsDescMapper.selectById(pjOrder.getCustomerId());
 			if (ObjectUtils.isNotNull(pjCorpsDesc)) {
 				if (ObjectUtils.isNotNull(pjCorpsDesc.getUseCreditLimit())) {
@@ -1381,7 +1383,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				}
 			}
 			corpsDescMapper.updateById(pjCorpsDesc);
-		}
+		}*/
 		//内部销售修改上架管理的库存
 		if (pjOrder.getBusinessSource().equals(OrderTypeEnum.WEB.getType())) {
 			LambdaQueryWrapper<PjOrderItems> itemsLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -1416,7 +1418,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		//给角色为派工的人发送消息
 		R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "派工");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-			R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), pjShip.getSalesCompanyId());
+			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), pjShip.getSalesCompanyId() + "");
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					//循环发送消息
@@ -1521,7 +1523,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		pjOrder.setGenerateTask(OrderTypeEnum.NSCRW.getType());
 		baseMapper.updateById(pjOrder);
 
-		if ("挂账".equals(pjOrder.getReceivableType())) {
+		/*if ("挂账".equals(pjOrder.getReceivableType())) {
 			PjCorpsDesc pjCorpsDesc = corpsDescMapper.selectById(pjOrder.getCustomerId());
 			if (ObjectUtils.isNotNull(pjCorpsDesc)) {
 				if (ObjectUtils.isNotNull(pjCorpsDesc.getUseCreditLimit())) {
@@ -1531,7 +1533,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				}
 			}
 			corpsDescMapper.updateById(pjCorpsDesc);
-		}
+		}*/
 
 		//内部销售修改上架管理的库存
 		if (pjOrder.getBusinessSource().equals(OrderTypeEnum.WEB.getType())) {
@@ -1567,7 +1569,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		//给角色为派工的人发送消息
 		R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "派工");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-			R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), pjShip.getSalesCompanyId());
+			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), pjShip.getSalesCompanyId() + "");
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					//循环发送消息
@@ -1646,7 +1648,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		//给角色为派工的人发送消息
 		R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "派工");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-			R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), pjShip.getSalesCompanyId());
+			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), pjShip.getSalesCompanyId() + "");
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					//循环发送消息
@@ -1762,19 +1764,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 	/**
 	 * 销售申请退款请核
-	 *
-	 * @param order
-	 * @return
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public PjOrder checkOrder(PjOrder order) {
 		PjOrder declare = baseMapper.selectById(order.getId());
-		if (ObjectUtils.isNull(declare.getOldTrxId())) {
-			throw new RuntimeException("线下支付按钮无效");
+		if (!"额度支付".equals(declare.getBusinessSource())) {
+			if (ObjectUtils.isNull(declare.getOldTrxId())) {
+				throw new RuntimeException("线下支付按钮无效");
+			}
 		}
-
 		//审批数据
 		PjAuditProecessDTO auditProecessDTO = new PjAuditProecessDTO();
 		//获取审批级次
@@ -2367,7 +2367,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		//给角色为派工的人发送消息
 		R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "派工");
 		if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-			R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), pjShip.getSalesCompanyId());
+			R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), pjShip.getSalesCompanyId() + "");
 			if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 				for (User datum : userList.getData()) {
 					//循环发送消息

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -41,6 +41,7 @@ import org.springblade.salesPart.brand.service.IBrandFilesService;
 import org.springblade.salesPart.corps.service.ICorpsAttnService;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
 import org.springblade.salesPart.entity.*;
+import org.springblade.salesPart.excel.ProductLaunchExportExcel;
 import org.springblade.salesPart.excel.ProductLaunchImportCodeExcel;
 import org.springblade.salesPart.excel.ProductLaunchImportExcel;
 import org.springblade.salesPart.goods.service.IGoodsDescService;
@@ -120,7 +121,7 @@ public class ProductLaunchController extends BladeController {
 			lambdaQueryWrapper.and(ObjectUtils.isNotNull(productLaunch.getCname()), i -> i.like(PjProductLaunch::getCname, productLaunch.getCname()).or().like(PjProductLaunch::getCnameInt, productLaunch.getCname()));
 		}
 		lambdaQueryWrapper.eq(PjProductLaunch::getSalesCompanyId, AuthUtil.getDeptId());
-		if (productLaunch.getBillType() == 1) {
+		if (ObjectUtils.isNotNull(productLaunch.getBillType()) && productLaunch.getBillType() == 1) {
 			lambdaQueryWrapper.eq(PjProductLaunch::getWhetherShare, 0);
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(productLaunch.getSourceCompanyId()), PjProductLaunch::getSourceCompanyId, productLaunch.getSourceCompanyId());//公司
 		} else {
@@ -396,7 +397,7 @@ public class ProductLaunchController extends BladeController {
 			lambdaQueryWrapper.and(ObjectUtils.isNotNull(productLaunch.getCname()), i -> i.like(PjProductLaunch::getCname, productLaunch.getCname()).or().like(PjProductLaunch::getCnameInt, productLaunch.getCname()));
 		}
 		lambdaQueryWrapper.eq(PjProductLaunch::getSalesCompanyId, AuthUtil.getDeptId());
-		if (productLaunch.getBillType() == 1) {
+		if (ObjectUtils.isNotNull(productLaunch.getBillType()) && productLaunch.getBillType() == 1) {
 			lambdaQueryWrapper.eq(PjProductLaunch::getWhetherShare, 0);
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(productLaunch.getSourceCompanyId()), PjProductLaunch::getSourceCompanyId, productLaunch.getSourceCompanyId());//公司
 		} else {
@@ -414,7 +415,7 @@ public class ProductLaunchController extends BladeController {
 			}
 
 		}
-		ExcelUtil.export(response, "导入模板-产品上架", "导入数据表", BeanUtil.copyProperties(pjProductLaunchList, ProductLaunchImportExcel.class), ProductLaunchImportExcel.class);
+		ExcelUtil.export(response, "导出产品上下架数据", "产品上下架数据表", BeanUtil.copyProperties(pjProductLaunchList, ProductLaunchExportExcel.class), ProductLaunchExportExcel.class);
 	}
 
 	/**

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/service/impl/SettlementServiceImpl.java

@@ -156,6 +156,15 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 			if (ObjectUtils.isNull(pjOrderList) || pjOrderList.isEmpty()) {
 				throw new RuntimeException("未找到订单信息");
 			}
+			List<Long> corpIds = pjOrderList.stream().map(PjOrder::getCustomerId).distinct().collect(Collectors.toList());
+			List<PjCorpsDesc> pjCorpsDescList = corpsDescService.list(new LambdaQueryWrapper<PjCorpsDesc>()
+				.eq(PjCorpsDesc::getTenantId, AuthUtil.getTenantId())
+				.eq(PjCorpsDesc::getIsDeleted, 0)
+				.in(PjCorpsDesc::getId, corpIds));
+			if (pjCorpsDescList.isEmpty()) {
+				throw new RuntimeException("未找到客户信息");
+			}
+			List<PjCorpsDesc> pjCorpsDescs = new ArrayList<>();
 			List<PjOrder> orderArrayList = new ArrayList<>();
 			BigDecimal thisAmount = new BigDecimal("0.00");
 			for (PjSettlementItems item : settlement.getSettlementItemsList()) {
@@ -169,7 +178,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 				if (pjOrder == null) {
 					continue;
 				}
-				if ("挂账".equals(pjOrder.getReceivableType())) {
+				/*if ("挂账".equals(pjOrder.getReceivableType())) {
 					PjCorpsDesc pjCorpsDesc = corpsDescService.getById(pjOrder.getCustomerId());
 					if (ObjectUtils.isNotNull(pjCorpsDesc)) {
 						if (ObjectUtils.isNotNull(pjCorpsDesc.getUseCreditLimit())) {
@@ -179,28 +188,43 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 						}
 					}
 					corpsDescService.updateById(pjCorpsDesc);
-				}
-				if (ObjectUtils.isNotNull(pjOrder.getPaymentAmountTl())) {
-					if (pjOrder.getPaymentAmountTl().add(item.getThisAmount()).compareTo(pjOrder.getTotalMoney()) > 0) {
-						throw new RuntimeException("当前结算金额大于订单金额");
-					}
-					pjOrder.setPaymentAmountTl(pjOrder.getPaymentAmountTl().add(item.getThisAmount()));
-				} else {
-					if (item.getThisAmount().compareTo(pjOrder.getTotalMoney()) > 0) {
-						throw new RuntimeException("当前结算金额大于订单金额");
+				}*/
+				if ("额度支付".equals(pjOrder.getBusinessSource())) {
+					PjCorpsDesc pjCorpsDesc = pjCorpsDescList.stream().filter(e -> e.getId().equals(pjOrder.getCustomerId()))
+						.findFirst().orElse(null);
+					if (pjCorpsDesc != null) {
+						if (ObjectUtils.isNotNull(pjCorpsDesc.getLimitAmount())) {
+							pjCorpsDesc.setLimitAmount(pjCorpsDesc.getLimitAmount().add(pjOrder.getTotalMoney()));
+						} else {
+							pjCorpsDesc.setLimitAmount(new BigDecimal("0.00"));
+						}
 					}
-					pjOrder.setPaymentAmountTl(item.getThisAmount());
-				}
-				if (pjOrder.getPaymentAmountTl().equals(pjOrder.getTotalMoney())) {
+					pjCorpsDescs.add(pjCorpsDesc);
 					pjOrder.setActualPaymentStatus(2);
-				} else {
-					pjOrder.setActualPaymentStatus(3);
+				}else{
+					if (ObjectUtils.isNotNull(pjOrder.getPaymentAmountTl())) {
+						if (pjOrder.getPaymentAmountTl().add(item.getThisAmount()).compareTo(pjOrder.getTotalMoney()) > 0) {
+							throw new RuntimeException("当前结算金额大于订单金额");
+						}
+						pjOrder.setPaymentAmountTl(pjOrder.getPaymentAmountTl().add(item.getThisAmount()));
+					} else {
+						if (item.getThisAmount().compareTo(pjOrder.getTotalMoney()) > 0) {
+							throw new RuntimeException("当前结算金额大于订单金额");
+						}
+						pjOrder.setPaymentAmountTl(item.getThisAmount());
+					}
+					if (pjOrder.getPaymentAmountTl().equals(pjOrder.getTotalMoney())) {
+						pjOrder.setActualPaymentStatus(2);
+					} else {
+						pjOrder.setActualPaymentStatus(3);
+					}
 				}
 				pjOrder.setUpdateTime(new Date());
 				pjOrder.setUpdateUser(AuthUtil.getUserId());
 				orderArrayList.add(pjOrder);
 				thisAmount = thisAmount.add(item.getThisAmount());
 			}
+			corpsDescService.updateBatchById(pjCorpsDescs);
 			settlementItemsService.saveOrUpdateBatch(settlement.getSettlementItemsList());
 			orderService.updateBatchById(orderArrayList);
 			PjAccountManagement pjAccountManagement = accountManagementService.getById(settlement.getAccountId());
@@ -246,6 +270,15 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 			if (ObjectUtils.isNull(pjOrderList) || pjOrderList.isEmpty()) {
 				throw new RuntimeException("未找到订单信息");
 			}
+			List<Long> corpIds = pjOrderList.stream().map(PjOrder::getCustomerId).distinct().collect(Collectors.toList());
+			List<PjCorpsDesc> pjCorpsDescList = corpsDescService.list(new LambdaQueryWrapper<PjCorpsDesc>()
+				.eq(PjCorpsDesc::getTenantId, AuthUtil.getTenantId())
+				.eq(PjCorpsDesc::getIsDeleted, 0)
+				.in(PjCorpsDesc::getId, corpIds));
+			if (pjCorpsDescList.isEmpty()) {
+				throw new RuntimeException("未找到客户信息");
+			}
+			List<PjCorpsDesc> pjCorpsDescs = new ArrayList<>();
 			List<PjOrder> orderArrayList = new ArrayList<>();
 			BigDecimal thisAmount = new BigDecimal("0.00");
 			for (PjSettlementItems item : settlement.getSettlementItemsList()) {
@@ -256,7 +289,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 				if (pjOrder == null) {
 					continue;
 				}
-				if ("挂账".equals(pjOrder.getReceivableType())) {
+				/*if ("挂账".equals(pjOrder.getReceivableType())) {
 					PjCorpsDesc pjCorpsDesc = corpsDescService.getById(pjOrder.getCustomerId());
 					if (ObjectUtils.isNotNull(pjCorpsDesc)) {
 						if (ObjectUtils.isNotNull(pjCorpsDesc.getUseCreditLimit())) {
@@ -266,22 +299,37 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 						}
 					}
 					corpsDescService.updateById(pjCorpsDesc);
-				}
-				if (ObjectUtils.isNotNull(pjOrder.getPaymentAmountTl())) {
-					pjOrder.setPaymentAmountTl(pjOrder.getPaymentAmountTl().subtract(item.getThisAmount()));
-				} else {
-					pjOrder.setPaymentAmountTl(new BigDecimal("0.00"));
-				}
-				if (pjOrder.getPaymentAmountTl().equals(new BigDecimal("0.00"))) {
+				}*/
+				if ("额度支付".equals(pjOrder.getBusinessSource())) {
+					PjCorpsDesc pjCorpsDesc = pjCorpsDescList.stream().filter(e -> e.getId().equals(pjOrder.getCustomerId()))
+						.findFirst().orElse(null);
+					if (pjCorpsDesc != null) {
+						if (ObjectUtils.isNotNull(pjCorpsDesc.getLimitAmount())) {
+							pjCorpsDesc.setLimitAmount(pjCorpsDesc.getLimitAmount().subtract(pjOrder.getTotalMoney()));
+						} else {
+							pjCorpsDesc.setLimitAmount(new BigDecimal("0.00"));
+						}
+					}
+					pjCorpsDescs.add(pjCorpsDesc);
 					pjOrder.setActualPaymentStatus(1);
-				} else {
-					pjOrder.setActualPaymentStatus(3);
+				}else{
+					if (ObjectUtils.isNotNull(pjOrder.getPaymentAmountTl())) {
+						pjOrder.setPaymentAmountTl(pjOrder.getPaymentAmountTl().subtract(item.getThisAmount()));
+					} else {
+						pjOrder.setPaymentAmountTl(new BigDecimal("0.00"));
+					}
+					if (pjOrder.getPaymentAmountTl().equals(new BigDecimal("0.00"))) {
+						pjOrder.setActualPaymentStatus(1);
+					} else {
+						pjOrder.setActualPaymentStatus(3);
+					}
 				}
 				pjOrder.setUpdateTime(new Date());
 				pjOrder.setUpdateUser(AuthUtil.getUserId());
 				orderArrayList.add(pjOrder);
 				thisAmount = thisAmount.add(item.getThisAmount());
 			}
+			corpsDescService.updateBatchById(pjCorpsDescs);
 			settlementItemsService.saveOrUpdateBatch(settlement.getSettlementItemsList());
 			orderService.updateBatchById(orderArrayList);
 			PjAccountManagement pjAccountManagement = accountManagementService.getById(settlement.getAccountId());

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

@@ -378,7 +378,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), item.getSalesCompanyId());
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), item.getSalesCompanyId()+"");
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -409,7 +409,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "客服");
 			StringBuilder openIds = new StringBuilder();
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), rwShip.getSalesCompanyId());
+				R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), rwShip.getSalesCompanyId()+"");
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
@@ -914,7 +914,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				//给角色为派工的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "库管");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), item.getSalesCompanyId());
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), item.getSalesCompanyId()+"");
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

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

@@ -676,7 +676,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 						}
 						amount = amount.add(totalMoney);
 						order.setPaymentDate(new Date());
-						order.setActualPaymentStatus(2);
+						order.setActualPaymentStatus(1);
 						order.setPaymentAmountTl(totalMoney);
 						order.setStatus(OrderTypeEnum.XSDQR.getType());
 						order.setXcxStatus(OrderTypeEnum.XSDFH.getType());
@@ -704,7 +704,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(AuthUtil.getTenantId(), "客服");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), AuthUtil.getTenantId(), item.getSalesCompanyId());
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), AuthUtil.getTenantId(), item.getSalesCompanyId()+"");
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -74,7 +74,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货' and busines_date = CURDATE()"));
 		if (!pjOrderListD.isEmpty()) {
 			List<Long> orderIdsD = pjOrderListD.stream().map(PjOrder::getId).collect(Collectors.toList());
@@ -97,7 +99,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货' and DATE_FORMAT(busines_date, '%Y-%m') = DATE_FORMAT(CURRENT_DATE(), '%Y-%m')"));
 		if (!pjOrderListM.isEmpty()) {
 			List<Long> orderIdsM = pjOrderListM.stream().map(PjOrder::getId).collect(Collectors.toList());
@@ -138,7 +142,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
 			.apply("find_in_set(status,'录入,待确认')")
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.ge(!quer.getDateList().isEmpty(), PjOrder::getBusinesDate, quer.getDateList().get(0))
 			.le(!quer.getDateList().isEmpty(), PjOrder::getBusinesDate, quer.getDateList().get(1)));
 		for (PjOrder item : pjOrderList) {
@@ -275,7 +281,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, "XS")
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货' and busines_date = CURDATE()"));
 		if (!pjOrderList.isEmpty()) {
 			List<Long> ids = pjOrderList.stream().map(PjOrder::getId).collect(Collectors.toList());
@@ -306,7 +314,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)
 			.lt(PjOrder::getBusinesDate, endDate)
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货'"));
 		List<Map<String, Object>> list = new ArrayList<>();
 		List<Map<String, Object>> mapList = orderService.brandSalesVolume(statusDate, endDate, AuthUtil.getDeptId(), AuthUtil.getTenantId());
@@ -347,7 +357,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)
 			.lt(PjOrder::getBusinesDate, endDate)
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货'"));
 		List<Map<String, Object>> list = new ArrayList<>();
 		List<Map<String, Object>> mapList = orderService.corpsSalesVolume(statusDate, endDate, AuthUtil.getDeptId(), AuthUtil.getTenantId());
@@ -388,7 +400,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)
 			.lt(PjOrder::getBusinesDate, endDate)
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货'"));
 		List<Map<String, Object>> mapList = new ArrayList<>();
 		if (!pjOrderList.isEmpty()) {
@@ -436,7 +450,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getBsType, "XS")
 			.gt(PjOrder::getBusinesDate, statusDate)
 			.lt(PjOrder::getBusinesDate, endDate)
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
+				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' ))" +
+				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货'"));
 		//销售
 		BigDecimal income = new BigDecimal("0.00");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/mapper/StockDescMapper.xml

@@ -177,7 +177,7 @@
         LEFT JOIN pjpf_stock_desc stock ON goods.id = stock.goods_id
         <where>
             goods.is_deleted = 0
-            <if test="stockDesc.whether == null or stockDesc.whether == ''">
+            <if test="stockDesc.whether == null or stockDesc.whether == '' or stockDesc.whether == '0'">
                 and stock.balance_quantity != 0
             </if>
             <if test="stockDesc.brandId != null and stockDesc.brandId != ''">

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -226,6 +226,15 @@ public class SysClient implements ISysClient {
 		return ObjectUtils.isNotNull(paramService) ? paramService.getParamValue() : "";
 	}
 
+	@Override
+	public String getParamServiceByDept(String paramKey, String tenantId, String salesCompanyId) {
+		ParamService paramService = paramServiceService.getOne(new LambdaQueryWrapper<ParamService>()
+			.eq(ParamService::getParamKey, paramKey)
+			.eq(ParamService::getIsDeleted, 0)
+			.eq(ParamService::getSalesCompanyId, salesCompanyId)
+			.eq(ParamService::getTenantId, tenantId));
+		return ObjectUtils.isNotNull(paramService) ? paramService.getParamValue() : "";
+	}
 	/**
 	 * 配件获取所属公司
 	 *

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -57,25 +57,23 @@ public class UserClient implements IUserClient {
 
 	@Override
 	@GetMapping(LIST_USER_BY_ROLE_ID)
-	public R<List<User>> listUserByRoleId(Long roleId, String tenantId, Long salesCompanyId) {
+	public R<List<User>> listUserByRoleId(String roleId, String tenantId, String salesCompanyId) {
+		System.err.println("所属公司id：" + salesCompanyId);
+		System.err.println("租户号：" + tenantId);
+		System.err.println("角色id：" + roleId);
 		LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		userLambdaQueryWrapper
-			.eq(User::getIsDeleted, 0);
-		String status = sysClient.getParamService("mall.data");
+			.eq(User::getIsDeleted, 0)
+			.apply("find_in_set('" + roleId + "',role_id)");
+		String status = sysClient.getParamServiceDWT("mall.data", tenantId);
 		if (ObjectUtils.isNotNull(tenantId) && ObjectUtils.isNotNull(salesCompanyId)) {
 			if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
-				userLambdaQueryWrapper.eq(User::getDeptId, salesCompanyId)
-					.apply("find_in_set('" + roleId + "',role_id)");
-			} else {
-				userLambdaQueryWrapper.eq(User::getRoleId, roleId);
+				userLambdaQueryWrapper.eq(User::getDeptId, salesCompanyId);
 			}
 			userLambdaQueryWrapper.eq(User::getTenantId, tenantId);
 		} else {
 			if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
-				userLambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId())
-					.apply("find_in_set('" + roleId + "',role_id)");
-			} else {
-				userLambdaQueryWrapper.eq(User::getRoleId, roleId);
+				userLambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
 			}
 			userLambdaQueryWrapper.eq(User::getTenantId, AuthUtil.getTenantId());
 		}
@@ -298,7 +296,7 @@ public class UserClient implements IUserClient {
 
 	@Override
 	public List<User> selectListNotTenantId(String tenantId, String ids) {
-		return service.selectListNotTenantId(tenantId,ids);
+		return service.selectListNotTenantId(tenantId, ids);
 	}
 
 	@Override

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -490,7 +490,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						// 给角色为助理的人发送消息
 						R<String> roleId = sysClient.getRoleIds(AuthUtil.getTenantId(), "助理");
 						if (roleId.isSuccess() && roleId.getData() != null) {
-							R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(roleId.getData()), null, null);
+							R<List<User>> userList = userClient.listUserByRoleId(roleId.getData(), null, null);
 							if (userList.isSuccess() && userList.getData() != null) {
 								userList.getData().forEach(user -> {
 									// 推送消息提醒助理生成采购

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

@@ -2580,7 +2580,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						//给角色为财务的人发送消息
 						R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 						if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-							R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+							R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 							if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 								for (User datum : userList.getData()) {
 									//循环发送消息
@@ -2758,7 +2758,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+					R<List<User>> userList = userClient.listUserByRoleId(clientDeptIds.getData(), null, null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息