Merge branch 'master' into test6.9.3

@@ -251,11 +251,14 @@ public class ImperfectPublishProcessor implements PublishProcessor<ImperfectOrde
                         iosr.getUid(), iosr.getStorageId(), imageList);
                 throw new UfoServiceException(400, "imageList[imageUrl]错误");
             }
-
-            if (type == ImageType.feature.code){
+            //TODO next version 6.9.2 app need fix
+            int type0 = code / 100;
+            if (type0 == ImageType.feature.code){
+                igi.setType(type0);
                 featureImageList.add(igi);
             }
-            if (type == ImageType.flaw.code){
+            if (type0 == ImageType.flaw.code){
+                igi.setType(type0);
                 flawImageList.add(igi);
             }
         }
@@ -286,4 +289,5 @@ public class ImperfectPublishProcessor implements PublishProcessor<ImperfectOrde
         igi.setGoodImg(defaultGoodsImag);
         return igi;
     }
+
 }

@@ -1382,7 +1382,7 @@ public class ProductServiceImpl implements ProductService {
             List<SecondhandFlaw> flaws = secondhandFlawMapper.selectByIds(secondhandInfo.getFlawId());
             for (SecondhandFlaw flaw : flaws) {
                 // 其他问题，文字不展示
-                if (flaw.getType() == 200) {
+                if (flaw.getId() == 200) {
                     continue;
                 }
                 if (flaw.getType() == 1) {

@@ -105,7 +105,7 @@ consumer:
       # CRM发券
       - class: com.yohoufo.promotion.mq.CouponSendConsumer
         topic: ufo.couponSend
-        ratelimit: 20
+        ratelimit: 50
 
 producer:
   - address: ${rabbit_ufo}