2024年3月13日17:38:36

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FinanceProfitDtoList.java

@@ -1,6 +1,8 @@
 package org.springblade.los.statisticAnalysis;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.secure.utils.AuthUtil;
 
 import java.math.BigDecimal;
 
@@ -232,4 +234,15 @@ public class FinanceProfitDtoList {
 	 */
 	private String examineDate;
 
+
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
+
+	/**
+	 * 分公司 Id
+	 */
+	private String branchId;
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -94,6 +94,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 				financeProfitList.addAll(financeProfitListBg);
 			}
 		}*/
+		financeProfit.setTenantId(AuthUtil.getTenantId());
+		financeProfit.setBranchId(deptUtils.getDeptPid()+"");
 		List<FinanceProfitDtoList> financeProfitList = new ArrayList<>();
 		BigDecimal exrateC = bCurrencyService.getCnyExrate("USD", "C");
 		BigDecimal exrateD = bCurrencyService.getCnyExrate("USD", "D");
@@ -697,6 +699,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 
 	@Override
 	public R financeProfitSum(FinanceProfitDtoList financeProfit) {
+		financeProfit.setTenantId(AuthUtil.getTenantId());
+		financeProfit.setBranchId(deptUtils.getDeptPid()+"");
 		List<FinanceProfitDtoList> financeProfitList = new ArrayList<>();
 		BigDecimal exrateC = bCurrencyService.getCnyExrate("USD", "C");
 		BigDecimal exrateD = bCurrencyService.getCnyExrate("USD", "D");

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/FinanceProfitMapper.xml

@@ -80,6 +80,8 @@
         los_finance_profit seb
         WHERE
         seb.is_deleted = '0'
+        and seb.tenant_id = #{data.tenantId}
+        and seb.branch_id = #{data.branchId}
         <if test="data.billType != null and data.billType != ''">
             and find_in_set(seb.business_type,#{data.billType})
         </if>
@@ -181,6 +183,8 @@
         los_finance_profit seb
         WHERE
         seb.is_deleted = '0'
+        and seb.tenant_id = #{data.tenantId}
+        and seb.branch_id = #{data.branchId}
         <if test="data.billType != null and data.billType != ''">
             and find_in_set(seb.business_type,#{data.billType})
         </if>

blade-service/blade-project/src/main/java/org/springblade/project/config/XxlJobConfig.java

@@ -0,0 +1,74 @@
+package org.springblade.project.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration
+public class XxlJobConfig {
+	private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+	@Value("${xxl.job.admin.addresses}")
+	private String adminAddresses;
+
+	@Value("${xxl.job.executor.appname}")
+	private String appName;
+
+	@Value("${xxl.job.executor.ip}")
+	private String ip;
+
+	@Value("${xxl.job.executor.port}")
+	private int port;
+
+	@Value("${xxl.job.accessToken}")
+	private String accessToken;
+
+	@Value("${xxl.job.executor.logpath}")
+	private String logPath;
+
+	@Value("${xxl.job.executor.logretentiondays}")
+	private int logRetentionDays;
+
+
+	@Bean
+	public XxlJobSpringExecutor xxlJobExecutor() {
+		logger.info(">>>>>>>>>>> xxl-job config init.");
+		XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+		xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+		xxlJobSpringExecutor.setAppName(appName);
+		xxlJobSpringExecutor.setIp(ip);
+		xxlJobSpringExecutor.setPort(port);
+		xxlJobSpringExecutor.setAccessToken(accessToken);
+		xxlJobSpringExecutor.setLogPath(logPath);
+		xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+		return xxlJobSpringExecutor;
+	}
+
+	/**
+	 * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+	 *
+	 *      1、引入依赖：
+	 *          <dependency>
+	 *             <groupId>org.springframework.cloud</groupId>
+	 *             <artifactId>spring-cloud-commons</artifactId>
+	 *             <version>${version}</version>
+	 *         </dependency>
+	 *
+	 *      2、配置文件，或者容器启动变量
+	 *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+	 *
+	 *      3、获取IP
+	 *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+	 */
+
+
+}

blade-service/blade-project/src/main/java/org/springblade/project/handler/SynchronizeDataJobHandler.java

@@ -0,0 +1,25 @@
+package org.springblade.project.handler;
+
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author :jixinyuan
+ * @date : 2024/3/14
+ */
+@Component
+@AllArgsConstructor
+public class SynchronizeDataJobHandler {
+
+	/**
+	 * @throws Exception
+	 */
+	@XxlJob("SynchronizeDataJobHandler")
+	public ReturnT<String> synchronizeDataJobHandler(String param) throws Exception {
+		System.out.println("==========================请求成功================================");
+		return ReturnT.SUCCESS;
+	}
+
+}

blade-service/blade-project/src/main/java/org/springblade/project/handler/TaskCompleteJobHandler.java

@@ -13,7 +13,6 @@ import org.springblade.client.feign.IMessageClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.project.entity.ServiceProjectItem;
 import org.springblade.project.service.ServiceProjectItemService;
-import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
@@ -29,8 +28,6 @@ public class TaskCompleteJobHandler {
 
 	private final IMessageClient iMessageClient;
 
-	private final ISysClient sysClient;
-
 	@XxlJob("taskCompleteJobHandler")
 	public ReturnT<String> taskCompleteJobHandler(String param) throws Exception {
 		// 创建线程池
@@ -83,13 +80,5 @@ public class TaskCompleteJobHandler {
 		}
 	}
 
-	/**
-	 * @throws Exception
-	 */
-	@XxlJob("SynchronizeDataJobHandler")
-	public ReturnT<String> synchronizeData() throws Exception {
-		System.out.println("==========================请求成功================================");
-		return ReturnT.SUCCESS;
-	}
 
 }

blade-service/blade-project/src/main/resources/application-dev.yml

@@ -9,3 +9,16 @@ spring:
     username: ${blade.datasource.dev.username}
     password: ${blade.datasource.dev.password}
 
+
+xxl:
+  job:
+    accessToken: ''
+    admin:
+      addresses: http://127.0.0.1:7009/xxl-job-admin
+    executor:
+      appname: blade-land
+      ip: 127.0.0.1
+      logpath: applogs/xxl-job/jobhandler
+      logretentiondays: -1
+      port: 10032
+

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/config/XxlJobConfig.java

@@ -0,0 +1,74 @@
+package org.springblade.salesPart.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+@Configuration
+public class XxlJobConfig {
+	private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+	@Value("${xxl.job.admin.addresses}")
+	private String adminAddresses;
+
+	@Value("${xxl.job.executor.appname}")
+	private String appName;
+
+	@Value("${xxl.job.executor.ip}")
+	private String ip;
+
+	@Value("${xxl.job.executor.port}")
+	private int port;
+
+	@Value("${xxl.job.accessToken}")
+	private String accessToken;
+
+	@Value("${xxl.job.executor.logpath}")
+	private String logPath;
+
+	@Value("${xxl.job.executor.logretentiondays}")
+	private int logRetentionDays;
+
+
+	@Bean
+	public XxlJobSpringExecutor xxlJobExecutor() {
+		logger.info(">>>>>>>>>>> xxl-job config init.");
+		XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+		xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+		xxlJobSpringExecutor.setAppName(appName);
+		xxlJobSpringExecutor.setIp(ip);
+		xxlJobSpringExecutor.setPort(port);
+		xxlJobSpringExecutor.setAccessToken(accessToken);
+		xxlJobSpringExecutor.setLogPath(logPath);
+		xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+		return xxlJobSpringExecutor;
+	}
+
+	/**
+	 * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+	 *
+	 *      1、引入依赖：
+	 *          <dependency>
+	 *             <groupId>org.springframework.cloud</groupId>
+	 *             <artifactId>spring-cloud-commons</artifactId>
+	 *             <version>${version}</version>
+	 *         </dependency>
+	 *
+	 *      2、配置文件，或者容器启动变量
+	 *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+	 *
+	 *      3、获取IP
+	 *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+	 */
+
+
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/handler/SynchronizeDataJobHandler.java

@@ -1,9 +1,9 @@
 package org.springblade.salesPart.handler;
 
+import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.AllArgsConstructor;
 import org.springblade.salesPart.michelinApi.service.IMichelinService;
-import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -12,16 +12,14 @@ public class SynchronizeDataJobHandler {
 
 	private final IMichelinService michelinService;
 
-	private final ISysClient sysClient;
-
-
 	/**
 	 * @throws Exception
 	 */
-	@XxlJob("SynchronizeDataJobHandler")
-	public void synchronizeData() throws Exception {
+	@XxlJob("synchronizeDataJobHandler")
+	public ReturnT<String> synchronizeDataJobHandler(String param) throws Exception {
 		System.out.println("==========================请求成功================================");
-		michelinService.getSalesOrder(sysClient.getParamService(""));
+		michelinService.getSalesOrder(param);
+		return ReturnT.SUCCESS;
 	}
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/michelinApi/dto/AckSalesOrderR.java

@@ -27,7 +27,7 @@ public class AckSalesOrderR {
 	/**
 	 * 是否有下一个订单待读取
 	 */
-	private String hasNext;
+	private Boolean hasNext;
 
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/michelinApi/service/impl/MichelinServiceImpl.java

@@ -32,8 +32,11 @@ public class MichelinServiceImpl implements IMichelinService {
 
 	private final IExternalOrderItemService externalOrderItemService;
 
+	public static int count = 1;
+
 	@Override
 	public R getSalesOrder(String agentId) throws Exception {
+		System.out.println("==========================请求成功==============第" + count + "次");
 		String geturl = MichelinValues.BASE_URL_TEXT + "/GetSalesOrder";
 		//设置请求体
 		Map<String, String> map = new HashMap<>();
@@ -65,7 +68,7 @@ public class MichelinServiceImpl implements IMichelinService {
 							externalOrderItem.setTenantId(AuthUtil.getTenantId());
 							externalOrderItemList.add(externalOrderItem);
 						}
-						if (!externalOrderItemList.isEmpty()){
+						if (!externalOrderItemList.isEmpty()) {
 							externalOrderItemService.saveBatch(externalOrderItemList);
 						}
 						order.setExternalOrderItemList(externalOrderItemList);
@@ -93,6 +96,11 @@ public class MichelinServiceImpl implements IMichelinService {
 					AckSalesOrderR ackSalesOrderR = JSONObject.parseObject(jsonObject1.get("response").toString(), AckSalesOrderR.class);
 					if (ackSalesOrderR != null) {
 						if ("001".equals(ackSalesOrderR.getCode())) {
+							if (ackSalesOrderR.getHasNext()) {
+								count = count + 1;
+								this.getSalesOrder(agentId);
+							}
+							count = 1;
 							return R.data(order);
 						} else {
 							return R.fail(ackSalesOrderR.getErrMsg());

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

@@ -206,8 +206,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					order.setCreateTime(new Date());
 					order.setCreateDept(deptId);
 					order.setTenantId(AuthUtil.getTenantId());
-					order.setStatus(OrderTypeEnum.XSDQR.getType());
-					order.setXcxStatus(OrderTypeEnum.XSDFH.getType());
+					/*order.setStatus(OrderTypeEnum.XSLR.getType());
+					order.setXcxStatus(OrderTypeEnum.XSLR.getType());*/
 					order.setCustomerId(finalCorpsDesc.getId());
 					order.setCustomerName(finalCorpsDesc.getCname());
 					if (ObjectUtils.isNotNull(finalCorpsDesc.getSalesmanId())) {

blade-service/blade-sales-part/src/main/resources/application-dev.yml

@@ -11,3 +11,14 @@ spring:
 #  mapper-locations: classpath:com/yh/project/mapper/*Mapper.xml
 #  type-aliases-package: com.yh.project.*.entity
 #swagger文档
+xxl:
+  job:
+    accessToken: ''
+    admin:
+      addresses: http://127.0.0.1:10031/xxl-job-admin
+    executor:
+      appname: blade-land
+      ip: 127.0.0.1
+      logpath: applogs/xxl-job/jobhandler
+      logretentiondays: -1
+      port: 10033