合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java

@@ -154,9 +154,9 @@ public class TemporaryActivityCoreController {
                 throw new DataException(RCode.NOT_GFQ_PHOTO_ERROR);
             } else if (CollectionUtils.isEmpty(activityReportedDto.getScbbwlPhotoInfos()) ){
                 throw new DataException(RCode.NOT_SCBBWL_PHOTO_ERROR);
-            }else if  (StringUtils.isBlank(activityReportedDto.getHasBlackDuckFlavor())){
+            }else if  ("是".equals(activityReportedDto.getHasBlackDuckFlavor()) &&StringUtils.isBlank(activityReportedDto.getHasBlackDuckFlavor())){
                 throw new DataException(RCode.NOT_BLACK_DUCK_FLAVOR_ERROR);
-            }else if (activityReportedDto.getBlackDuckTastingNum() == null || activityReportedDto.getBlackDuckTastingNum() == 0 ){
+            }else if ("是".equals(activityReportedDto.getHasBlackDuckFlavor()) &&activityReportedDto.getBlackDuckTastingNum() == null || activityReportedDto.getBlackDuckTastingNum() == 0 ){
                 throw new DataException(RCode.NOT_BLACK_DUCK_TASTING_NUM_ERROR);
             }else if (activityReportedDto.getBraisedTastingNum() == null ){
                 throw new DataException(RCode.NOT_BRAISED_TASTING_NUM_ERROR);
@@ -164,7 +164,7 @@ public class TemporaryActivityCoreController {
                 throw new DataException(RCode.NOT_GIFT_NUM_ERROR);
             }else if (activityReportedDto.getPromotionSales() == null ||(1== BigDecimal.ZERO.compareTo(activityReportedDto.getPromotionSales()))){
                 throw new DataException(RCode.NOT_PROMOTION_SALES_ERROR);
-            }else if (activityReportedDto.getBlackDuckSales() == null ){
+            }else if ("是".equals(activityReportedDto.getHasBlackDuckFlavor()) && activityReportedDto.getBlackDuckSales() == null ){
                 throw new DataException(RCode.NOT_BLACK_DUCK_SALES_ERROR);
             }else if (activityReportedDto.getGiftBoxSales() == null ){
                 throw new DataException(RCode.NOT_GIFT_SALES_ERROR);