# Conflicts:

#	suishenbang-system/src/main/java/com/dgtly/system/mapper/MetaHanaDeliverSignMapper.java
#	suishenbang-system/src/main/java/com/dgtly/system/service/impl/MetaHanaDeliverSignServiceImpl.java
#	suishenbang-system/src/main/resources/mapper/system/MetaHanaDeliverSignMapper.xml

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -68,6 +68,12 @@ public class RyTask
     public void analyDiyCustomer1(){
         analysisDiyCustomerComponent.analyDiyCustomer1();
     }
+
+
+    //针对特殊人的定时任务修改入库ass表
+    public void analyDiyCustomer2(){
+        analysisDiyCustomerComponent.analyDiyCustomer2();
+    }
     /**
      * @description: 获取TUC仿石漆服务商人员
      * @param: []

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -17,6 +17,7 @@ import com.dgtly.sync.mapper.SyncFailDetailMapper;
 import com.dgtly.sync.utils.CustomerAccessTokenUtil;
 import com.dgtly.sync.utils.CustomerAccessTokenUtil.UrlType;
 import com.dgtly.system.domain.AssRelcustomerinfo;
+import com.dgtly.system.domain.SysDictData;
 import com.dgtly.system.domain.SysUser;
 import com.dgtly.system.domain.SysUserExt;
 import com.dgtly.system.mapper.SysUserExtMapper;
@@ -24,6 +25,7 @@ import com.dgtly.system.mapper.SysUserMapper;
 import com.dgtly.system.mapper.SysUserShopExtMapper;
 import com.dgtly.system.service.IAssRelcustomerinfoService;
 import com.dgtly.system.service.ISysConfigService;
+import com.dgtly.system.service.ISysDictDataService;
 import com.dgtly.system.service.impl.SysUserServiceImpl;
 import com.dgtly.wxportal.mapper.WxQyUserMapper;
 import org.slf4j.Logger;
@@ -55,6 +57,9 @@ public class AnalysisDiyCustomerComponent {
     @Autowired
     private WxQyUserMapper wxQyUserMapper;
 
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
     @Autowired
     private ISysConfigService configService;
     @Autowired
@@ -64,6 +69,9 @@ public class AnalysisDiyCustomerComponent {
     @Autowired
     private IAssRelcustomerinfoService assRelcustomerinfoService;
 
+    @Autowired
+    private AnalysisDiyCustomerComponent analysisDiyCustomerComponent;
+
     @Autowired
     private SysUserShopExtMapper userShopExtMapper;
     private Long deptId;
@@ -85,7 +93,15 @@ public class AnalysisDiyCustomerComponent {
     private Long[] roleSfa;//5.1家装顾问挂sfa角色
 
 
-
+    public void analyDiyCustomer2() {
+        List<SysDictData> sysDictData = sysDictDataService.selectSimpleDictDataByType("sys_system_ass_cusyomer");
+        String deptCodes = sysDictData.get(0).getDictValue();
+        String [] deptCode = deptCodes.split(",");
+        for (String dCode : deptCode){
+            log.info("本次需要同步的经销商:{}",dCode);
+            getManagerList(dCode,"");
+        }
+    }
 
 
     public SyncLog analyDiyCustomer1() {
@@ -1197,7 +1213,11 @@ public class AnalysisDiyCustomerComponent {
                         if (isManager != 0 && !("019").equals(userOld.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(userOld.getSysUserExt().getCustomerCode().substring(0, 3))
                                 && !("019").equals(user.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))
                         ) {
-
+                            log.info("到这了");
+                            log.info("q:{}",userOld.getSysUserExt().getOrgCode());
+                            log.info("q:{}",userOld.getSysUserExt().getCustomerCode());
+                            log.info("q:{}",user.getSysUserExt().getOrgCode());
+                            log.info("q:{}",customerCode);
                             if (user.getSysUserExt().getOrgCode() != null && (!customerCode.equals(userOld.getSysUserExt().getOrgCode()) || !customerCode.equals(userOld.getSysUserExt().getCustomerCode()) )) {
 
                                 assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());

suishenbang-system/src/main/java/com/dgtly/system/mapper/CustomersExtMapper.java

@@ -21,6 +21,14 @@ public interface CustomersExtMapper
      */
     public CustomersExt selectCustomersExtById(String chainsCode);
 
+    /**
+     * 根据子经销商查询主经销商扩展列表
+     *
+     * @param chainsCode 经销商扩展ID
+     * @return 经销商扩展集合
+     */
+    CustomersExt selectCustomersExt(String chainsCode);
+
     /**
      * 查询经销商扩展列表
      * 

suishenbang-system/src/main/java/com/dgtly/system/mapper/MetaHanaDeliverSignMapper.java

@@ -145,6 +145,9 @@ public interface MetaHanaDeliverSignMapper
    List<String> selectDeliverNumListByTmsShipmentNumber(@Param("tmsShipmentNumber") String tmsShipmentNumber);
 
 
-   int updateCertificationSync();
+   List<String> selectCertificationSync();
+
+
+
 
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/MetaHanaDeliverSignServiceImpl.java

@@ -1,21 +1,16 @@
 package com.dgtly.system.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
-import com.dgtly.system.domain.DeliverSignVO;
-import com.dgtly.system.domain.OrderSignVO;
-import com.dgtly.system.domain.TmsShipmentSignVO;
+import com.dgtly.system.domain.*;
+import com.dgtly.system.mapper.CustomersExtMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.dgtly.system.mapper.MetaHanaDeliverSignMapper;
-import com.dgtly.system.domain.MetaHanaDeliverSign;
 import com.dgtly.system.service.IMetaHanaDeliverSignService;
 import com.dgtly.common.core.text.Convert;
 
@@ -32,6 +27,9 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
     @Autowired
     private MetaHanaDeliverSignMapper metaHanaDeliverSignMapper;
 
+    @Autowired
+    CustomersExtMapper customersExtMapper;
+
     /**
      * 查询电子单签收状态数量
      *
@@ -255,7 +253,27 @@ public class MetaHanaDeliverSignServiceImpl implements IMetaHanaDeliverSignServi
 
     @Override
     public void certificationSync() {
-        metaHanaDeliverSignMapper.updateCertificationSync();
+       List<String> list = metaHanaDeliverSignMapper.selectCertificationSync();
+       for (String deliverNumber:list){
+           //判断ext表是否存在数据
+           CustomersExt customersExt = customersExtMapper.selectCustomersExtById(deliverNumber);
+           //查询主经销商的注册信息
+           CustomersExt cust =  customersExtMapper.selectCustomersExt(deliverNumber);
+           if (customersExt !=null){
+               //如果存在数据直接认证通过
+               CustomersExt customer = new CustomersExt();
+               customer.setIsAuthentication("1");
+               customer.setOrgId(cust.getOrgId());
+               customer.setCreator(cust.getCreator());
+               customer.setChainsCode(deliverNumber);
+               customer.setOrgAttestationTime(new Date());
+               customer.setCreateTime(new Date());
+               customersExtMapper.updateCustomersExt(customer);
+           }else {
+               cust.setChainsCode(deliverNumber);
+               customersExtMapper.insertCustomersExt(cust);
+           }
+       }
     }
 
 

suishenbang-system/src/main/resources/mapper/system/CustomersExtMapper.xml

@@ -39,7 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCustomersExtById" parameterType="String" resultMap="CustomersExtResult">
         <include refid="selectCustomersExtVo"/>
-        where chains_code = #{chainsCode}
+        where chains_code = #{chainsCode} limit 1
+    </select>
+
+
+    <select id="selectCustomersExt" parameterType="String" resultMap="CustomersExtResult">
+        <include refid="selectCustomersExtVo"/>
+        where chains_code in (SELECT main_customer_code FROM meta_relation_ship_diy  WHERE main_customer_name = #{chainsCode}) limit 1
     </select>
 
     <!--根据订单id关联订单基础信息表查询经销商注册id-->

suishenbang-system/src/main/resources/mapper/system/MetaHanaDeliverSignMapper.xml

@@ -217,24 +217,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
-    <update id="updateCertificationSync" >
-        UPDATE customers_ext
-        SET is_authentication = '1'
-        WHERE chains_code IN (
-            SELECT * FROM (
-                              SELECT chains_code
-                              FROM customers_ext
-                              WHERE chains_code IN (
-                                  SELECT t2.customer_code
-                                  FROM customers_ext t1
-                                           LEFT JOIN meta_relation_ship_diy t2
-                                                     ON t1.chains_code = t2.main_customer_code
-                                  WHERE t1.is_authentication = '1'
-                              )
-                                AND is_authentication != '1'
-                          ) AS temp_table
-        )
-    </update>
+    <select id="selectCertificationSync"  resultType="java.lang.String">
+        SELECT * FROM (
+                          SELECT chains_code
+                          FROM customers_ext
+                          WHERE chains_code IN (
+                              SELECT t2.customer_code
+                              FROM customers_ext t1
+                                       LEFT JOIN meta_relation_ship_diy t2
+                                                 ON t1.chains_code = t2.main_customer_code
+                              WHERE t1.is_authentication = '1'
+                          )
+                            AND is_authentication != '1'
+                      ) AS temp_table
+    </select>
 
 
 </mapper>