合并要货接口

suishenbang-api/src/main/resources/application-prod.yml

@@ -99,6 +99,18 @@ spring:
           socketFactory:
             #SSL连接配置
             class: javax.net.ssl.SSLSocketFactory
+
+#hana数据库数据同步配置
+hana:
+  hana-driver: com.sap.db.jdbc.Driver
+  hana-url: jdbc:sap://hanaentsltp.nipponpaint.com.cn:30015?reconnect=true
+  hana-user: SSB_HANA
+  hana-pwd: Erty567*
+  mysql-driver: com.mysql.jdbc.Driver
+  mysql-url: jdbc:mysql://pc-nipponpaintproddb01.rwlb.rds.aliyuncs.com:3306/ssbprd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+  mysql-user: ssbprd
+  mysql-pwd: Ssbprd#0828
+
   # redis配置
 #  redis:
 #      # Redis数据库索引（默认为0）

suishenbang-api/src/main/resources/application-uat.yml

@@ -42,6 +42,21 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
+#hana数据库数据同步配置
+hana:
+  #  hana-driver: com.sap.db.jdbc.Driver
+  #  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+  #  hana-user: SSB_HANA
+  #  hana-pwd: s$EW12445T
+  #  hana-driver: com.sap.db.jdbc.Driver
+  #  hana-url: jdbc:sap://hanaentsltd.nipponpaint.com.cn:30015?reconnect=true
+  #  hana-user: SSB_HANA
+  #  hana-pwd: s$EW12445T
+  hana-driver: com.sap.db.jdbc.Driver
+  hana-url: jdbc:sap://hanaentsltp.nipponpaint.com.cn:30015?reconnect=true
+  hana-user: SSB_HANA
+  hana-pwd: Erty567*
+  mysql-driver: com.mysql.jdbc.Driver
 
 # 日志配置
 logging:

suishenbang-system/src/main/java/com/dgtly/system/domain/DataMasterCustomerVO.java

@@ -10,4 +10,12 @@ public class DataMasterCustomerVO implements Serializable {
     private String CustomerCode;
 
     private String CustomerName;
+
+    private String CustomerTypeCode5;
+
+    private String CustomerTypeCode1;
+
+    private String IsBMDCustomer;
+
+    private String salesGroupName;
 }

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

@@ -41,7 +41,9 @@ public interface DeliverQuantityConfirmMapper
    void  saveDeliverNumber(@Param("list") List<DeliverQuantityConfirm> list);
 
 
-    int insertCus(String customer);
+    Integer insertCus(String customer);
+
+    Integer selectCus(String customer);
 
 
 

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserOrderAuthorService.java

@@ -120,4 +120,6 @@ public interface ISysUserOrderAuthorService
 
     int insertCus(String customer);
 
+    int selectCus(String  customer);
+
 }

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

@@ -65,6 +65,9 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
     @Autowired
     private SysBatchSignForMapper sysBatchSignForMapper;
 
+    @Autowired
+    private SysDictDataMapper sysDictDataMapper;
+
 
     @Autowired
     private CustomerMapper customersMapper;
@@ -873,7 +876,19 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
      */
     @Override
     public void customersStart() {
-        List<DataMasterCustomerVO> customerVOS = customersMapper.selectCustomerCodeByNotStart();
+        List<DataMasterCustomerVO> customerVOSOld = customersMapper.selectCustomerCodeByNotStart();
+        //AND (CustomerTypeCode5 = 'SSB'
+        // or (CustomerTypeCode1='D01' and IsBMDCustomer='否')
+        // or (CustomerTypeCode1='D06'))
+        List<DataMasterCustomerVO> customerVOS = new ArrayList<>();
+        List<SysDictData>  sysDictData = sysDictDataMapper.selectDictDataByType("sys_system_bmd_name");
+        log.info("获取非bmd的机构数量:{}", sysDictData.size());
+        List<String> subOfficeName = sysDictData.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
+        for (DataMasterCustomerVO customerVO : customerVOSOld){
+            if (subOfficeName.contains(customerVO.getSalesGroupName()) || "SSB".equals(customerVO.getCustomerTypeCode5()) || ("D01".equals(customerVO.getCustomerTypeCode1()) && "否".equals(customerVO.getIsBMDCustomer())) || "D01".equals(customerVO.getCustomerTypeCode1())){
+                customerVOS.add(customerVO);
+            }
+        }
         if(customerVOS !=null && customerVOS.size()>0){
             log.info("开始执行经销商自动上线");
             log.info("待上线经销商：{}", JSON.toJSON(customerVOS));
@@ -899,6 +914,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         return deliverQuantityConfirmMapper.insertCus( customer);
     }
 
+    @Override
+    public int selectCus(String customer) {
+        return deliverQuantityConfirmMapper.selectCus( customer);
+    }
+
     public Set<String> getConfigValueSet(String dictType){
             Set<String> res = new HashSet<>();
             List<SysDictData> dictDatas = sysDictDataService.selectSimpleDictDataByType(dictType);

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

@@ -144,13 +144,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCustomerCodeByNotStart" resultType="com.dgtly.system.domain.DataMasterCustomerVO">
         SELECT DISTINCT
             CustomerCode,
-            CustomerName
+            CustomerName,
+            CustomerTypeCode5,
+            CustomerTypeCode1,
+            IsBMDCustomer,
+            sales_group_name as salesGroupName
         FROM
             data_master_customer
         WHERE
-            1 = 1
-          AND (CustomerTypeCode5 = 'SSB' or (CustomerTypeCode1='D01' and IsBMDCustomer='否')  or (CustomerTypeCode1='D06'))
-          AND CustomerCode NOT IN (
+           CustomerCode NOT IN (
             SELECT
                 customers_code
             FROM
@@ -178,5 +180,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  (#{item.customersCode},#{item.customersName},#{item.onlineTime},#{item.customerType})
              </foreach>
     </insert>
-    
+
 </mapper>

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

@@ -117,4 +117,8 @@
     <select id="insertCus" parameterType="java.lang.String" resultType="java.lang.Integer">
         insert into meta_hana_not_freeze_customer(customer_code,create_time) values(#{customer}, NOW())
     </select>
+
+    <select id="selectCus"  parameterType="java.lang.String" resultType="java.lang.Integer">
+            select count(*) from meta_hana_not_freeze_customer where customer_code = #{customer}
+    </select>
 </mapper>

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/FreeCustomerController.java

@@ -36,7 +36,7 @@ public class FreeCustomerController {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        return AjaxResult.success(str);
+        return AjaxResult.self(str);
     }
 
 }