Commit 87bba441 authored by mlchun's avatar mlchun

1.订单评价优化

parent fde588e1
...@@ -27,7 +27,7 @@ public class SwaggerConfig { ...@@ -27,7 +27,7 @@ public class SwaggerConfig {
@Bean @Bean
public Docket createRestApi() { public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
// .host("byyl.zjhmit.com") .host("byyl.zjhmit.com")
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.select() .select()
//加了ApiOperation注解的类,才生成接口文档 //加了ApiOperation注解的类,才生成接口文档
......
...@@ -17,6 +17,8 @@ import io.swagger.annotations.Api; ...@@ -17,6 +17,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
...@@ -73,7 +75,7 @@ public class PensionOrderEvaluationController { ...@@ -73,7 +75,7 @@ public class PensionOrderEvaluationController {
todto = URLDecoder.decode(dto,"UTF-8"); todto = URLDecoder.decode(dto,"UTF-8");
}catch (Exception ignored){} }catch (Exception ignored){}
PensionOrderEvaluationDTO pensionOrderEvaluationDTO = JSON.parseObject(todto.substring(4), PensionOrderEvaluationDTO.class); PensionOrderEvaluationDTO pensionOrderEvaluationDTO = JSON.parseObject(todto.substring(4), PensionOrderEvaluationDTO.class);
pensionOrderEvaluationDTO.setFile(StringUtils.join(pensionOrderEvaluationDTO.getFiles(), ","));
pensionOrderEvaluationService.save(pensionOrderEvaluationDTO); pensionOrderEvaluationService.save(pensionOrderEvaluationDTO);
pensionOrderService.evaluationDone(pensionOrderEvaluationDTO); pensionOrderService.evaluationDone(pensionOrderEvaluationDTO);
......
...@@ -176,7 +176,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe ...@@ -176,7 +176,7 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
} }
}else if (status == 1){ //派单 }else if (status == 1){ //派单
Long recipient_id = Long.parseLong(params.get("recipient_id").toString()); Long recipient_id = Long.parseLong(params.get("recipient_id").toString());
if (pensionOrderEntity.getStatus() == 5) { if (pensionOrderEntity.getStatus() == 5 || pensionOrderEntity.getStatus() == 0) {
pensionOrderEntity.setStatus(1); pensionOrderEntity.setStatus(1);
pensionOrderEntity.setStatusName(Constant.OrderStatus.ORDER.getMessage()); pensionOrderEntity.setStatusName(Constant.OrderStatus.ORDER.getMessage());
UserEntity recipient = userService.getUserByUserId(recipient_id); UserEntity recipient = userService.getUserByUserId(recipient_id);
......
...@@ -38,11 +38,11 @@ spring: ...@@ -38,11 +38,11 @@ spring:
max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制) max-wait: -1ms # 连接池最大阻塞等待时间(使用负值表示没有限制)
max-idle: 10 # 连接池中的最大空闲连接 max-idle: 10 # 连接池中的最大空闲连接
min-idle: 5 # 连接池中的最小空闲连接 min-idle: 5 # 连接池中的最小空闲连接
# mvc: mvc:
# static-path-pattern: /static/** static-path-pattern: /static/**
# resources: resources:
# static-locations: file:${QR.download-path},classpath:/META-INF/resources/, classpath:/resources/, classpath:/static/, classpath:/public/ static-locations: file:${QR.download-path},classpath:/META-INF/resources/, classpath:/resources/, classpath:/static/, classpath:/public/
# #静态资源对外暴露的访问路径 #静态资源对外暴露的访问路径
hmit: hmit:
redis: redis:
...@@ -72,4 +72,4 @@ mybatis-plus: ...@@ -72,4 +72,4 @@ mybatis-plus:
jdbc-type-for-null: 'null' jdbc-type-for-null: 'null'
QR: QR:
# download-path: D:/123/ /home/websoft/java_jar/pension_service/myfile/ # download-path: D:/123/ /home/websoft/java_jar/pension_service/myfile/
download-path: D:/123/ download-path: /home/websoft/java_jar/pension_service/myfile/
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment