bugfix

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -888,13 +888,17 @@ public class LoginServiceImpl implements LoginService {
             }
             Integer shopID = messageCenterMapper.shopID(loginUser.getUserId());
             Integer newReceiptType = messageCenterMapper.newReceiptType(shopID);
+            // 上架费次数
             Integer listingFeeCount= messageCenterMapper.listingFee(shopID);
+            // 上架费有效期内个数
             Integer listingfeeExpireCount= messageCenterMapper.listingfeeExpire(shopID);
+            // 有免除上架费的次数
             Integer receStatctCount=messageCenterMapper.receStatct(shopID);
-            Integer listingFee=0;
-            if(listingFeeCount>0 && listingfeeExpireCount>0){
-                if(receStatctCount<=0){
-                    listingFee=1;
+            Integer listingFee = 0;
+            // 如果上架费次数为 0 ；所有上架费都不在在生效时间； 没有免除过上架费；
+            if(listingFeeCount > 0 && listingfeeExpireCount == 0){
+                if(receStatctCount <= 0){
+                    listingFee = 1;
                 }
             }
             loginUser.setListingFee(listingFee);

src/main/resources/mapper/MessageCenter.xml

@@ -101,7 +101,7 @@
     </select>
 
     <select id="listingfeeExpire" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM `cm_discern_receipt` WHERE newReceiptType=1 AND shopID=#{shopID} AND NOW()> DATE_ADD(receiptDate, INTERVAL 1 YEAR)
+        SELECT COUNT(*) FROM `cm_discern_receipt` WHERE newReceiptType=1 AND shopID = #{shopID} AND NOW() <![CDATA[  <=  ]]> DATE_ADD(receiptDate, INTERVAL 1 YEAR) AND NOW() > receiptDate
     </select>
 
     <select id="MessageList" resultType="com.caimei365.user.model.vo.MessageCenter">