FengChaoYu 3 ヶ月 前
コミット
e755aaa94c

+ 5 - 2
mall-server-api/src/main/java/com/gree/mall/manager/bean/quality/QualityFeedbackVO.java

@@ -112,8 +112,11 @@ public class QualityFeedbackVO {
     @ApiModelProperty(value = "系列名称")
     private String seriesName;
 
-    @ApiModelProperty(value = "机型名称")
-    private String productName;
+    @ApiModelProperty(value = "内机型号")
+    private String insideProductName;
+
+    @ApiModelProperty(value = "外机型号")
+    private String outProductName;
 
     @ApiModelProperty(value = "内机条码")
     private String insideCode;

+ 5 - 2
mall-server-api/src/main/java/com/gree/mall/manager/logic/quality/QualityFeedbackLogic.java

@@ -153,8 +153,8 @@ public class QualityFeedbackLogic {
         if (StringUtils.isBlank(bean.getSeriesName())) {
             throw new RemoteServiceException("系列名称不能为空");
         }
-        if (StringUtils.isBlank(bean.getProductName())) {
-            throw new RemoteServiceException("机型名称不能为空");
+        if (StringUtils.isBlank(bean.getInsideProductName())) {
+            throw new RemoteServiceException("内机型号不能为空");
         }
         if (StringUtils.isBlank(bean.getInsideCode())) {
             throw new RemoteServiceException("内机条码不能为空");
@@ -169,6 +169,9 @@ public class QualityFeedbackLogic {
         if ("空调,空气能热水器".contains(bean.getMainName()) && StringUtils.isBlank(bean.getOutCode())) {
             throw new RemoteServiceException("外机条码不能为空");
         }
+        if ("空调,空气能热水器".contains(bean.getMainName()) && StringUtils.isBlank(bean.getOutProductName())) {
+            throw new RemoteServiceException("外机型号不能为空");
+        }
         if (StringUtils.isNotBlank(bean.getOutCode())) {
             count = qualityFeedbackService.lambdaQuery()
                     .eq(QualityFeedback::getOutCode, bean.getOutCode())