推送版本

src/main/java/com/caimei365/commodity/service/impl/ShopServiceImpl.java

@@ -126,9 +126,9 @@ public class ShopServiceImpl implements ShopService {
         Integer listingfeeExpireCount= shopMapper.listingfeeExpire(shopId);
         Integer receStatctCount=shopMapper.receStatct(shopId);
         Integer listingFee=0;
-        if(listingFeeCount>0 || listingfeeExpireCount>0){
-            if(receStatctCount<=0){
-                listingFee=1;
+        if(listingFeeCount>0 && listingfeeExpireCount>0){
+                if(receStatctCount<=0){
+                listingFee=1;//1是有上架费或者过期并且没有免除上架费
             }
         }
         map.put("listingFee", listingFee);