2025年2月25日17:19:35

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsDescMapper.xml

@@ -149,6 +149,7 @@
         select id, cname
         from pjpf_corps_desc
         where is_deleted = 0
+          and corp_type = 'KH'
           and sales_company_id = #{salesCompanyId}
           and cname = #{cname}
           and tenant_id = #{tenantId}
@@ -345,30 +346,17 @@
           and tenant_id = #{tenantId}
     </select>
     <select id="appCustomerAnalysis" resultType="org.springblade.salesPart.entity.PjCorpsDesc">
-        SELECT
+        SELECT DISTINCT
             pcd.*,
-        (
-        SELECT
-        busines_date
-        FROM
-        pjpf_order
-        WHERE
-        tenant_id = '883868'
-        AND is_deleted = '0'
-        AND bs_type = 'XS'
-        AND FIND_IN_SET( `status`, '已发货,已收货' )
-        and customer_id = pcd.id
-        ORDER BY
-        busines_date DESC
-        LIMIT 1
-        ) as businesDate,
+        o.busines_date as businesDate,
         pca.detailed_address as detailed_Address
         FROM
             pjpf_corps_desc pcd
         LEFT JOIN pjpf_corps_addr pca on pcd.id = pca.pid and  pca.default_addres = '1'
         LEFT JOIN (
                 SELECT
-                    customer_id
+                    customer_id,
+                    po.busines_date
                 FROM
                     pjpf_order po
                 WHERE
@@ -376,8 +364,12 @@
                     AND po.is_deleted = '0'
                     AND po.bs_type = 'XS'
                     AND FIND_IN_SET( po.`status`, '已发货,已收货' )
+                <if test="CorpsDesc.notPurchased == null  or CorpsDesc.notPurchased == ''">
                     AND  po.busines_date >= CURDATE() - INTERVAL #{CorpsDesc.days} DAY
-            ) o ON pcd.id = o.customer_id
+                </if>
+                ORDER BY
+                po.busines_date DESC
+        ) o ON pcd.id = o.customer_id
         WHERE
             pcd.corp_type = 'KH'
             AND pcd.tenant_id = #{CorpsDesc.tenantId}
@@ -385,11 +377,11 @@
             AND pca.tenant_id = #{CorpsDesc.tenantId}
             AND pca.is_deleted = '0'
         <if test="CorpsDesc.notPurchased !=null  and CorpsDesc.notPurchased != ''">
-            AND  o.customer_id IS NOT NULL
-        </if>
-        <if test="CorpsDesc.notPurchased == null">
             AND  o.customer_id IS NULL
         </if>
+        <if test="CorpsDesc.notPurchased == null or CorpsDesc.notPurchased == ''">
+            AND  o.customer_id IS NOT NULL
+        </if>
         <if test="CorpsDesc.cname !=null and CorpsDesc.cname != ''">
             and pcd.cname like CONCAT(CONCAT('%', #{CorpsDesc.cname}), '%')
         </if>
@@ -402,5 +394,8 @@
         <if test="CorpsDesc.sort !=null and CorpsDesc.sort == 3">
             ORDER BY pca.detailed_address
         </if>
+        <if test="CorpsDesc.sort !=null and CorpsDesc.sort == 4">
+            ORDER BY o.busines_date ASC
+        </if>
     </select>
 </mapper>

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

@@ -1197,9 +1197,6 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 
 	@Override
 	public IPage<PjCorpsDesc> appCustomerAnalysis(IPage<PjCorpsDesc> page, PjCorpsDesc corpsDescDto) {
-		if(ObjectUtils.isNull(corpsDescDto.getDays())){
-
-		}
 		List<PjCorpsDesc> corpsDescList = baseMapper.appCustomerAnalysis(page, corpsDescDto);
 		Date date = new Date();
 		for (PjCorpsDesc item : corpsDescList) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/share/service/impl/SharePutOnShelvesServiceImpl.java

@@ -752,12 +752,20 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 					}
 					item.setShareStatus("已共享");
 					if (ObjectUtils.isNotNull(item.getSharedCompanyId()) && ObjectUtils.isNotNull(item.getSharedCompany())) {
+						List<String> sharedCompanyIdList = new ArrayList<>();
 						List<String> sharedCompanyId = Arrays.asList(item.getSharedCompanyId().split(","));
-						sharedCompanyId.add(deptItem.getId() + "");
-						item.setSharedCompanyId(sharedCompanyId.stream().distinct().collect(Collectors.joining(",")));
+						if (!sharedCompanyId.isEmpty()){
+							sharedCompanyIdList.addAll(sharedCompanyId);
+						}
+						sharedCompanyIdList.add(deptItem.getId() + "");
+						item.setSharedCompanyId(sharedCompanyIdList.stream().distinct().collect(Collectors.joining(",")));
+						List<String> sharedCompanyNameList = new ArrayList<>();
 						List<String> sharedCompanyName = Arrays.asList(item.getSharedCompany().split(","));
-						sharedCompanyName.add(deptItem.getDeptName());
-						item.setSharedCompany(sharedCompanyName.stream().distinct().collect(Collectors.joining(",")));
+						if (!sharedCompanyName.isEmpty()){
+							sharedCompanyNameList.addAll(sharedCompanyName);
+						}
+						sharedCompanyNameList.add(deptItem.getDeptName());
+						item.setSharedCompany(sharedCompanyNameList.stream().distinct().collect(Collectors.joining(",")));
 					} else {
 						item.setSharedCompanyId(deptItem.getId() + "");
 						item.setSharedCompany(deptItem.getDeptName());

blade-service/blade-sales-part/src/main/resources/log/logback-dev.xml

@@ -58,56 +58,56 @@
     </if>
 
     <!-- 日志输出级别 -->
-    <root level="ERROR">
+    <root level="info">
         <appender-ref ref="STDOUT"/>
         <appender-ref ref="${STDOUT_APPENDER}"/>
     </root>
 
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="druid.sql" level="ERROR"/>
+    <logger name="net.sf.ehcache" level="info"/>
+    <logger name="druid.sql" level="info"/>
 
 
     <!-- MyBatis log configure -->
-    <logger name="com.apache.ibatis" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="java.sql.Connection" level="ERROR"/>
-    <logger name="java.sql.Statement" level="ERROR"/>
-    <logger name="java.sql.PreparedStatement" level="ERROR"/>
+    <logger name="com.apache.ibatis" level="info"/>
+    <logger name="org.mybatis.spring" level="info"/>
+    <logger name="java.sql.Connection" level="info"/>
+    <logger name="java.sql.Statement" level="info"/>
+    <logger name="java.sql.PreparedStatement" level="info"/>
 
     <!-- 减少部分debug日志 -->
-    <logger name="druid.sql" level="ERROR"/>
-    <logger name="org.apache.shiro" level="ERROR"/>
-    <logger name="org.mybatis.spring" level="ERROR"/>
-    <logger name="org.springframework" level="ERROR"/>
-    <logger name="org.springframework.context" level="ERROR"/>
-    <logger name="org.springframework.beans" level="ERROR"/>
-    <logger name="com.baomidou.mybatisplus" level="ERROR"/>
-    <logger name="org.apache.ibatis.io" level="ERROR"/>
-    <logger name="org.apache.velocity" level="ERROR"/>
-    <logger name="org.eclipse.jetty" level="ERROR"/>
-    <logger name="io.undertow" level="ERROR"/>
-    <logger name="org.xnio.nio" level="ERROR"/>
-    <logger name="org.thymeleaf" level="ERROR"/>
-    <logger name="springfox.documentation" level="ERROR"/>
-    <logger name="org.hibernate.validator" level="ERROR"/>
-    <logger name="com.netflix.loadbalancer" level="ERROR"/>
-    <logger name="com.netflix.hystrix" level="ERROR"/>
-    <logger name="com.netflix.zuul" level="ERROR"/>
-    <logger name="de.codecentric" level="ERROR"/>
-    <!-- cache ERROR -->
-    <logger name="net.sf.ehcache" level="ERROR"/>
-    <logger name="org.springframework.cache" level="ERROR"/>
+    <logger name="druid.sql" level="info"/>
+    <logger name="org.apache.shiro" level="info"/>
+    <logger name="org.mybatis.spring" level="info"/>
+    <logger name="org.springframework" level="info"/>
+    <logger name="org.springframework.context" level="info"/>
+    <logger name="org.springframework.beans" level="info"/>
+    <logger name="com.baomidou.mybatisplus" level="info"/>
+    <logger name="org.apache.ibatis.io" level="info"/>
+    <logger name="org.apache.velocity" level="info"/>
+    <logger name="org.eclipse.jetty" level="info"/>
+    <logger name="io.undertow" level="info"/>
+    <logger name="org.xnio.nio" level="info"/>
+    <logger name="org.thymeleaf" level="info"/>
+    <logger name="springfox.documentation" level="info"/>
+    <logger name="org.hibernate.validator" level="info"/>
+    <logger name="com.netflix.loadbalancer" level="info"/>
+    <logger name="com.netflix.hystrix" level="info"/>
+    <logger name="com.netflix.zuul" level="info"/>
+    <logger name="de.codecentric" level="info"/>
+    <!-- cache info -->
+    <logger name="net.sf.ehcache" level="info"/>
+    <logger name="org.springframework.cache" level="info"/>
     <!-- cloud -->
-    <logger name="org.apache.http" level="ERROR"/>
-    <logger name="com.netflix.discovery" level="ERROR"/>
-    <logger name="com.netflix.eureka" level="ERROR"/>
+    <logger name="org.apache.http" level="info"/>
+    <logger name="com.netflix.discovery" level="info"/>
+    <logger name="com.netflix.eureka" level="info"/>
     <!-- 业务日志 -->
-    <Logger name="org.springblade" level="ERROR"/>
-    <Logger name="org.springblade.core.tenant" level="ERROR"/>
-    <Logger name="org.springblade.core.version" level="ERROR"/>
+    <Logger name="org.springblade" level="info"/>
+    <Logger name="org.springblade.core.tenant" level="info"/>
+    <Logger name="org.springblade.core.version" level="info"/>
 
     <!-- 减少nacos日志 -->
-    <logger name="com.alibaba.nacos" level="ERROR"/>
+    <logger name="com.alibaba.nacos" level="info"/>
 
 
 </configuration>