导购019，经销商认证

suishenbang-order/src/main/java/com/dgtly/order/controller/OrderCustomersController.java

@@ -8,9 +8,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.core.domain.AjaxResult;
 import com.dgtly.common.core.page.TableDataInfo;
+import com.dgtly.common.utils.DateUtils;
 import com.dgtly.common.utils.MapDataUtil;
 import com.dgtly.common.utils.poi.ExcelUtil;
-import com.dgtly.order.domain.BpmWxNoticeOrg;
 import com.dgtly.order.domain.CustomerAuthModel;
 import com.dgtly.order.domain.OrderCustomers;
 import com.dgtly.order.service.ICustomersStartService;
@@ -22,7 +22,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.*;
 import com.dgtly.common.core.controller.BaseController;
@@ -156,7 +155,7 @@ public class OrderCustomersController extends BaseController
     @ResponseBody
     public AjaxResult export()
     {
-        List<CustomerAuthModel> list = customersStartService.selectCustomerAuthList();
+        List<CustomerAuthModel> list = customersStartService.selectCustomerAuthList(DateUtils.getYearMonthStr());
         ExcelUtil<CustomerAuthModel> util = new ExcelUtil<CustomerAuthModel>(CustomerAuthModel.class);
         return util.exportExcel(list, "已认证经销商列表");
     }

suishenbang-order/src/main/java/com/dgtly/order/domain/CustomerAuthModel.java

@@ -30,8 +30,8 @@ public class CustomerAuthModel  extends BaseEntity
 //    @Excel(name = "销售大区代码")
     private String saleCode;
 
-    /** 销售部 */
-    @Excel(name = "销售部", width = 30)
+  /*  *//** 销售部 *//*
+    @Excel(name = "销售部", width = 30)*/
     private String officeName;
 
     /** 销售部代码 */
@@ -39,7 +39,7 @@ public class CustomerAuthModel  extends BaseEntity
     private String officeCode;
 
     /** 销售分部 */
-//    @Excel(name = "销售分部", width = 30)
+    @Excel(name = "销售部", width = 30)
     private String subOfficeName;
 
     /** 销售分部代码 */

suishenbang-order/src/main/java/com/dgtly/order/mapper/CustomersStartMapper.java

@@ -3,6 +3,7 @@ package com.dgtly.order.mapper;
 import com.dgtly.order.domain.CustomerAuthModel;
 import com.dgtly.order.domain.CustomersStart;
 import com.dgtly.order.domain.OrderCustomers;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -71,5 +72,11 @@ public interface CustomersStartMapper
 
     OrderCustomers selectCustomersById(Long id);
 
-    List<CustomerAuthModel> selectCustomerAuthList();
+    List<CustomerAuthModel> selectCustomerAuthList(@Param("yearMonth") String yearMonth);
+
+    List<CustomerAuthModel> selectCustomerExt();
+
+    CustomerAuthModel selectCustomerExtByid(String id);
+
+    String selectCustomerNameByCustomerId(String customerId);
 }

suishenbang-order/src/main/java/com/dgtly/order/service/ICustomersStartService.java

@@ -76,5 +76,7 @@ public interface ICustomersStartService
      */
     int addCustomersStart(String ids);
 
-    List<CustomerAuthModel> selectCustomerAuthList();
+    List<CustomerAuthModel> selectCustomerAuthList(String yearMonth);
+
+
 }

suishenbang-order/src/main/java/com/dgtly/order/service/impl/CustomersStartServiceImpl.java

@@ -2,6 +2,7 @@ package com.dgtly.order.service.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.dgtly.common.utils.StringUtils;
 import com.dgtly.order.domain.CustomerAuthModel;
@@ -147,7 +148,24 @@ public class CustomersStartServiceImpl implements ICustomersStartService
     }
 
     @Override
-    public List<CustomerAuthModel> selectCustomerAuthList() {
-        return customersStartMapper.selectCustomerAuthList();
+    public List<CustomerAuthModel> selectCustomerAuthList(String yearMonth) {
+        List<CustomerAuthModel> customerExt=customersStartMapper.selectCustomerExt();
+        List<CustomerAuthModel> list=customersStartMapper.selectCustomerAuthList(yearMonth);
+        List<String> customertuc = list.stream().map(CustomerAuthModel::getCustomerCode).collect(Collectors.toList());
+        List<String> customerext = customerExt.stream().map(CustomerAuthModel::getCustomerCode).collect(Collectors.toList());
+        List<String> collect = customerext.stream().filter(item -> !customertuc.contains(item)).collect(Collectors.toList());
+        if(collect.size()>0){
+        for (String id:collect
+             ) {
+            CustomerAuthModel model=new CustomerAuthModel();
+            CustomerAuthModel auth=customersStartMapper.selectCustomerExtByid(id);
+            String name=customersStartMapper.selectCustomerNameByCustomerId(auth.getCustomerCode());
+            model.setCustomerCode(auth.getCustomerCode());
+            model.setCustomerName(name);
+            model.setAuthTime(auth.getAuthTime());
+            list.add(model);
+        }
+        }
+        return list;
     }
 }

suishenbang-order/src/main/resources/mapper/order/CustomersStartMapper.xml

@@ -71,11 +71,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         WHERE
             ce.org_attestation_time IS NOT NULL
+        <if test="yearMonth !=null">
+            and mds.cal_month=#{yearMonth}
+        </if>
         GROUP BY
-            ce.chains_code,mds.BUSINESS_UNIT
+            ce.chains_code
         ORDER BY mds.company_name DESC
     </select>
 
+    <select id="selectCustomerExt" resultType="com.dgtly.order.domain.CustomerAuthModel">
+        SELECT chains_code customerCode,org_attestation_time authTime FROM `customers_ext` where is_authentication=1
+    </select>
+
+    <select id="selectCustomerExtByid" resultType="com.dgtly.order.domain.CustomerAuthModel">
+        SELECT chains_code customerCode,org_attestation_time authTime FROM `customers_ext` where is_authentication=1
+        and chains_code =#{id} limit 1
+    </select>
+
     <insert id="insertCustomersStart" parameterType="com.dgtly.order.domain.CustomersStart">
         insert into customers_start
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -108,5 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{customersCode}
         </foreach>
     </delete>
-    
+
+    <select id="selectCustomerNameByCustomerId" resultType="java.lang.String">
+        select chains_name from customers where chains_code=#{customerId} limit 1
+    </select>
 </mapper>

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

@@ -602,11 +602,11 @@ public class AnalysisDiyCustomerComponent {
                     } else {
                         userExt.setOrgCode(orgCode);
                     }
-                   /* if (isManager == 0) {
-                        userExt.setCustomerCode(code);
-                    } else {*/
+                    if (isManager == 0) {
+                        userExt.setCustomerCode(userExt.getOrgCode());
+                    } else {
                         userExt.setCustomerCode(jo.getString("depCode"));
-                   // }
+                   }
 //                    /**======== 构建diy用户wx信息表 start===============*/
 //                    WxQyUser wxQyUser = new WxQyUser();
 //                    wxQyUser.setUserid(jo.getString("userid"));
@@ -634,10 +634,6 @@ public class AnalysisDiyCustomerComponent {
 //                    }
                         if (isManager == 0) {
                             sysUserService.insertUserRole(user.getUserId(), roleGuideIds[0]);
-                            if(("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))){
-                                user.getSysUserExt().setCustomerCode(jo.getString("depCode"));
-                                sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
-                            }
                         } else {
                             sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
                         }
@@ -660,6 +656,10 @@ public class AnalysisDiyCustomerComponent {
                             log.info("updateSysUserExt" + customerCode);
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         }
+                        if(("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))){
+                            user.getSysUserExt().setCustomerCode(user.getSysUserExt().getOrgCode());
+                            sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
+                        }
                         /*解决名称不一样的情况*/
                         if (!user.getUserName().equals(name)) {
                             user.setUserName(name);