Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/src/main/java/com/winsun/bean/UniversityInfo.java
#	common/src/main/java/com/winsun/constant/Constant.java
#	common/src/main/java/com/winsun/mapper/UniversityInfoMapper.java

common/src/main/java/com/winsun/bean/BroadBandOrder.java

@@ -13,6 +13,12 @@ public class BroadBandOrder extends Order{
      */
     @TableField(value = "orderSeq")
     private String orderSeq;
+
+    /**
+     * 订单号码
+     */
+    @TableField(value = "kd_order_id")
+    private String kdOrderId;
     /**
      * 产品名称
      */

common/src/main/java/com/winsun/bean/KdPhone.java

@@ -22,7 +22,7 @@ public class KdPhone implements Serializable {
     /**
      *
      */
-    @TableId(value = "d",type = IdType.AUTO)
+    @TableId(value = "id",type = IdType.AUTO)
     private int id;
     /**
      *

common/src/main/java/com/winsun/bean/ToIntegrateOrderParam.java

+package com.winsun.bean;
+
+import lombok.Data;
+
+/**
+  * 单宽进融下单参数
+  * @author chengfengluo
+  * @date 2021-01-26 18:30:59
+  */
+@Data
+public class ToIntegrateOrderParam {
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 宽带账号
+     */
+    private String netNumber;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 办理号码
+     */
+    private String businessNumber;
+
+    /**
+     * 联系号码
+     */
+    private String contactPhone;
+
+    /**
+     * 合伙人id
+     */
+    private String hehuorenId;
+
+    /**
+     * 融合时间
+     */
+    private String rhTime;
+}

common/src/main/java/com/winsun/constant/Constant.java

@@ -104,5 +104,5 @@ public class Constant {
 			e.printStackTrace();
 		}
 	}
-	
+
 }

common/src/main/java/com/winsun/mapper/HhrUserMapper.java

@@ -48,4 +48,25 @@ public interface HhrUserMapper extends BaseMapper<HhrUser> {
                                              @Param("toWeekStart")String toWeekStart, @Param("toWeekEnd")String toWeekEnd,
                                              @Param("toMonthStart")String toMonthStart, @Param("toMonthEnd")String toMonthEnd,
                                              @Param("isComplete") boolean isComplete);
+
+    /**
+     * 根据合伙人获取产品id
+     * @param hehuorenId
+     * @return
+     */
+    Map<String, Object> getProductByUserId(@Param("hehuorenId") String hehuorenId);
+
+    /**
+     * 查询督导姓名、揽装工号
+     * @param hehuorenId
+     * @return
+     */
+    List<Map<String, Object>> selectSupervisor(@Param("hehuorenId") String hehuorenId);
+
+    /**
+     * 查询合伙人信息
+     * @param hehuorenId
+     * @return
+     */
+    Map<String, Object> selectHehuorenInfo(@Param("hehuorenId") String hehuorenId);
 }

common/src/main/java/com/winsun/mapper/OrderMapper.java

@@ -94,4 +94,23 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     List<BroadBandOrder> selectBroadBandOrderList(Page<BroadBandOrder> page, BroadBandOrder broadBandOrder);
 
+    /**
+     * 查询重复订单
+     * @param idCard
+     * @return
+     */
+    List<Order> selectRepeatOrder(String idCard);
+
+    /**
+     * 查询宽带清单
+     * @param accountNumber
+     * @return
+     */
+    List<Map<String, Object>> selectBroadList(String accountNumber);
+
+    /**
+     * 更新已完成订单
+     * @return
+     */
+    int updateCompleteOrder();
 }

common/src/main/java/com/winsun/mapper/UniversityInfoMapper.java

@@ -18,5 +18,5 @@ public interface UniversityInfoMapper extends BaseMapper<UniversityInfo> {
     List<Map<String, Object>> getBroadBandConfigList(Page page,
                 @Param("productUniversity") String productUniversity, @Param("productRegion") String productRegion);
 
-
+    List<Map<String, Object>> selectProductManager(String id);
 }

service-manager/src/main/resources/com/winsun/mapper/mapping/HhrUserMapper.xml → common/src/main/resources/com/winsun/mapper/mapping/HhrUserMapper.xml

@@ -64,4 +64,39 @@
             </where>
             ) c
     </select>
+
+    <select id="getProductByUserId" parameterType="String" resultType="HashMap">
+        select
+            hs.jilt_kdy, hs.school_name,hs.bandproduct_id
+        from
+            hhr_user_school hus
+            left join
+            hhr_school hs on hus.school_id = hs.id
+        where user_id = #{hehuorenId}
+    </select>
+
+    <select id="selectSupervisor" parameterType="String" resultType="HashMap">
+        select uuu.name ddname,sch.lzgh
+                from hhr_user u
+                left join hhr_user_school us on u.id = us.user_id
+                left join hhr_school sch on sch.id = us.school_id
+                left join hhr_supervisor_school ss on us.school_id = ss.school
+                left join sys_user uuu on uuu.id = ss.user_id
+                where u.id= #{hehuorenId}
+    </select>
+
+    <select id="selectHehuorenInfo" parameterType="String" resultType="HashMap">
+        SELECT
+            su.phone,
+            su.name,
+            hs.sub_name,
+            hs.school_name
+        FROM
+            sys_user su
+            LEFT JOIN hhr_user hu ON su.id = hu.id
+            LEFT JOIN hhr_user_school hus ON su.id = hus.user_id
+            LEFT JOIN hhr_school hs ON hus.school_id = hs.id
+        WHERE
+            su.id = #{hehuorenId}
+    </select>
 </mapper>
\ No newline at end of file

service-manager/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml → common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml

@@ -164,4 +164,16 @@
         select * from hhr_order where  order_number = #{orderNumber}
     </select>
 
+    <select id="selectRepeatOrder" parameterType="String" resultType="com.winsun.bean.Order">
+        select * from hhr_order where user_type in('3','5','9','10') and order_status !='异常单' and id_card=#{idCard}
+    </select>
+
+    <select id="selectBroadList" parameterType="String" resultType="HashMap">
+        select * from hhr_kd_dmt where account_number = #{accountNumber}
+    </select>
+
+    <update id="updateCompleteOrder">
+        UPDATE hhr_order SET order_status = '已完成' WHERE id IN (SELECT id FROM(SELECT id FROM hhr_order WHERE order_status='已发货' AND TO_DAYS(NOW()) - TO_DAYS(create_time) > 7) t1)
+    </update>
+
 </mapper>
\ No newline at end of file

service-manager/src/main/resources/com/winsun/mapper/mapping/UniversityInfoMapper.xml → common/src/main/resources/com/winsun/mapper/mapping/UniversityInfoMapper.xml

@@ -27,4 +27,8 @@
         group by ui.university_id
     </select>
 
+    <select id="selectProductManager" parameterType="String" resultType="HashMap">
+        SELECT * FROM `product_manage` WHERE product_id = (SELECT b.`bandproduct_id` FROM hhr_user_school a  LEFT JOIN hhr_school b ON a.`school_id`=b.`id`  WHERE a.user_id=#{id})
+    </select>
+
 </mapper>
\ No newline at end of file

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -35,13 +35,22 @@ public class OrderTask {
         OrderTask.orderMapper = orderMapper;
     }
 
-    // TODO 定时器更新已送货订单
+    /**
+     * 定时器更新已送货订单
+     */
+    @Scheduled(cron = "0 0/5 * * * ? ")
+    public void updateBeSendOrder() {
+        log.info("开始更新已发货超过7天订单");
+        orderMapper.updateCompleteOrder();
+        log.info("更新已送货订单");
+    }
 
     @Scheduled(cron = "0 0 0 * * ? ")
     //@Scheduled(cron = "0/5 * * * * ? ")
     //@Scheduled(fixedRate=1000*60)
     @PostMapping("/orderTask")
     public void general() throws ParseException {
+        log.info("更新小白卡订单");
         Wrapper<Order> wrapper = new EntityWrapper();
         wrapper.eq("order_status", "待识别");
         List<Order> orders = orderMapper.selectList(wrapper);

task/src/main/java/com/winsun/TimingTask/RhZhiNenTask.java

@@ -628,9 +628,9 @@ public class RhZhiNenTask {
 
                 }
 
-    }
-        }
+            }
         }
+    }
 
     private String QueOrderNum(String orderNum) {
         // TODO Auto-generated method stub