修复Bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/AppApplication.java

@@ -31,7 +31,7 @@ public class AppApplication {
 	public HttpMessageConverters fastJsonConfigure(){
 		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
 		FastJsonConfig fastJsonConfig = new FastJsonConfig();
-		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect);
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.WriteMapNullValue);
 		//日期格式化
 		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
 		converter.setFastJsonConfig(fastJsonConfig);

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/ToBannerMapper.java

@@ -9,7 +9,9 @@ import java.util.List;
 @Mapper
 public interface ToBannerMapper {
 
-    ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId, @Param("nowTime") String nowTime);
+//    ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId, @Param("nowTime") String nowTime);
+
+    ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId);
 
     List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num, @Param("bannerPosition") Integer bannerPosition);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBill;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TpBillMapper {
@@ -16,4 +17,6 @@ public interface TpBillMapper {
     int updateByPrimaryKeySelective(TpBill record);
 
     int updateByPrimaryKey(TpBill record);
+
+    TpBill selectById(@Param("id") Integer id);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/BannerServiceImpl.java

@@ -27,8 +27,7 @@ public class BannerServiceImpl implements BannerServiceI {
 
     @Override
     public ToBanner viewBannerImg(Integer bannerId) {
-        String nowTime = DateUtils.getDate("yyyy-MM-dd");
-        return toBannerMapper.selectByCommunityId(bannerId, nowTime);
+        return toBannerMapper.selectByCommunityId(bannerId);
     }
 
     @Override

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java

@@ -57,7 +57,7 @@ public class MessageServiceImpl implements MessageServiceI {
 		messageList.stream().forEach(tpMessage -> {
 			//缴费相关信息
 			if (tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)){
-				TpBill tpBill = tpBillMapper.selectByPrimaryKey(tpMessage.getBillId());
+				TpBill tpBill = tpBillMapper.selectById(tpMessage.getBillId());
 				if (null != tpBill){
 					tpMessage.setContent(tpBill.getBillExplain());
 				}

CODE/smart-community/app-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -21,12 +21,15 @@
     id, community_id, banner_description, sort, banner_cover, banner_position, eff_time, 
     exp_time, banner_type, external_link, banner_title, banner_content, create_user, create_date
   </sql>
+
   <select id="selectByCommunityId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List"></include>
     from to_banner t where id = #{bannerId}
-    and t.eff_time &lt; #{nowTime}
-    and t.exp_time &gt; #{nowTime}
+    <![CDATA[
+    AND date_format(t.eff_time,'%Y-%m-%d') <= date_format(NOW(),'%Y-%m-%d')
+    AND date_format(t.exp_time,'%Y-%m-%d') >= date_format(NOW(),'%Y-%m-%d')
+    ]]>
     order by t.sort, t.eff_time
   </select>
 

CODE/smart-community/app-api/src/main/resources/mapper/TpBillMapper.xml

@@ -27,7 +27,28 @@
     from tp_bill
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+  <select id="selectById" resultType="com.community.huiju.model.TpBill">
+    SELECT
+        t.id,
+        t.community_id,
+        t.bill_name,
+        t.bill_explain,
+        t.pay_price,
+        t.pay_total_num,
+        t.payed_num,
+        t.unpayed_num,
+        t.bill_status,
+        t.end_date,
+        t.create_user,
+        t.create_date,
+        t.update_user,
+        t.update_date
+    FROM
+        tp_bill t
+    LEFT JOIN tp_bill_invoice i ON t.id = i.bill_id
+    WHERE i.id = #{id,jdbcType=INTEGER}
+  </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from tp_bill
     where id = #{id,jdbcType=INTEGER}
   </delete>

CODE/smart-community/zuul/src/main/resources/bootstrap.yml

@@ -32,7 +32,6 @@ zuul:
   host:
     connect-timeout-millis: 180000
     socket-timeout-millis: 180000
-
 hystrix:
   command:
     default:
@@ -48,3 +47,5 @@ mybatis:
   mapperLocations: classpath:mapper/*.xml
   configuration:
     call-setters-on-nulls: true
+
+