修改bug

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java

@@ -155,6 +155,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         double avgScore = getAvgScore(evaluateOrderConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
         evaluateDTO.setAvgScore(avgScore);
 
+        evaluateImgService.saveList(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId(), null, evaluateDTO.getImgList());
+
         Integer evaluateId = evaluateService.saveEvaluate(evaluateDTO);
 
         // 记录快评

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/ProblemManageApiServiceImpl.java

@@ -66,6 +66,13 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
             problemDTO.setImgList(list);
         }
         List<ProblemReplyDTO> replyList = problemReplyService.listReply(problemId);
+
+        if (CollectionUtils.isNotEmpty(replyList)) {
+            for (ProblemReplyDTO replyDTO : replyList) {
+                List<TabProblemImg> imgList = this.problemImgService.listImageByProblemReplyId(replyDTO.getProblemReplyId());
+                replyDTO.setImgList(Optional.ofNullable(imgList).orElse(Collections.emptyList()).stream().map(TabProblemImg::getImgUrl).collect(Collectors.toList()));
+            }
+        }
         ProblemReplyDTO problemReplyDTO = new ProblemReplyDTO();
         problemReplyDTO.setReplyerType(ReplyerTypeEnum.MEMBER.getCode());
         problemReplyDTO.setReplyContent(tabProblem.getProblemContent());
@@ -82,13 +89,6 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
         }
         replyList.add(0, problemReplyDTO);
 
-        if (CollectionUtils.isNotEmpty(replyList)) {
-            for (ProblemReplyDTO replyDTO : replyList) {
-                List<TabProblemImg> imgList = this.problemImgService.listImageByProblemReplyId(replyDTO.getProblemReplyId());
-                replyDTO.setImgList(Optional.ofNullable(imgList).orElse(Collections.emptyList()).stream().map(TabProblemImg::getImgUrl).collect(Collectors.toList()));
-            }
-        }
-
         problemDTO.setReplyList(replyList);
         return EnterpriseServiceResponse.success(problemDTO);
     }

gic-evaluate-web/pom.xml

@@ -25,6 +25,7 @@
         <gic-enterprise-download>4.0-SNAPSHOT</gic-enterprise-download>
         <gic-evaluate-api>4.0-SNAPSHOT</gic-evaluate-api>
         <gic-platform-auth-api>4.0-SNAPSHOT</gic-platform-auth-api>
+        <gic-open-platform-api>4.0-SNAPSHOT</gic-open-platform-api>
     </properties>
 
     <dependencies>
@@ -140,6 +141,11 @@
             <artifactId>gic-platform-auth-api</artifactId>
             <version>${gic-platform-auth-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-open-platform-api</artifactId>
+            <version>${gic-open-platform-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateManagerController.java

@@ -16,6 +16,8 @@ import com.gic.evaluate.dto.UserReplyDTO;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.service.EvaluateManageApiService;
 import com.gic.evaluate.web.vo.UserReplyVO;
+import com.gic.open.api.dto.EnterpriseServeInfoDTO;
+import com.gic.open.api.service.EnterpriseLicenseApiService;
 import com.gic.store.service.StoreWidgetApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -34,14 +36,23 @@ import java.util.List;
 @RestController
 public class EvaluateManagerController {
 
+
     @Autowired
     private EvaluateManageApiService evaluateManageApiService;
     @Autowired
     private StoreWidgetApiService storeWidgetApiService;
     @Autowired
     private ResourceApiService resourceApiService;
+    @Autowired
+    EnterpriseLicenseApiService enterpriseLicenseApiService;
 
 
+    @RequestMapping("/license")
+    public RestResponse license() {
+        ServiceResponse<EnterpriseServeInfoDTO> info = enterpriseLicenseApiService.getServeInfo(UserDetailUtils.getUserDetail().getEnterpriseId(), "DDPJ");
+        return ResultControllerUtils.commonResult(info);
+    }
+
     @RequestMapping("/list-evaluate")
     public RestResponse listEvaluate(EvaluateQO evaluateQO) {
         evaluateQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());

gic-evaluate-web/src/main/resources/dubbo-gic-evaluate-web.xml

@@ -27,4 +27,5 @@
     <dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.auth.service.MenuApiService" id="menuApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.auth.service.ResourceApiService" id="resourceApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" retries="0"/>
 </beans>
\ No newline at end of file