diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8715536..48d8d95 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,18 @@ + + + + + + + + + + + + @@ -174,6 +186,12 @@ + + + + + + @@ -255,26 +273,33 @@ + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -610,7 +651,9 @@ - @@ -629,62 +672,62 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -693,10 +736,10 @@ - + - + @@ -722,4 +765,20 @@ + + + + + file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java + 195 + + + file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java + 159 + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index 1c8a367..98a2c2b 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/ +//VUE_APP_API_BASE_URL=https://carrentadmin.jthj8.com/carrent-admin/ VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index 1d9206d..1171989 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production -//VUE_APP_API_BASE_URL=https://carrentadmin.augcl.com/carrent-admin/ +//VUE_APP_API_BASE_URL=https://carrentadmin.jthj8.com/carrent-admin/ VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java index a41ee48..ac827e0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/ApplyController.java @@ -41,27 +41,7 @@ public class ApplyController { @ApiOperation(value="寻车申请-添加申请", notes="寻车申请-添加申请") @RequestMapping(value = "/addApply", method = {RequestMethod.POST}) public Result addApply(@RequestHeader("X-Access-Token") String token, CarrentApply carrentApply){ - - String message = ""; - //申请信息验证 - if(StringUtils.isEmpty(carrentApply.getCategorytwoId())){ - message = "车辆分类id未填写，请填写车辆分类id"; - }else if(StringUtils.isEmpty(carrentApply.getModel())){ - message = "车辆型号未填写，请填写车辆型号"; - }else if(null == carrentApply.getCarTime() || "".equals(carrentApply.getCarTime())){ - message = "车辆年限未填写，请填写车辆年限"; - }else if(null == carrentApply.getMileage() || "".equals(carrentApply.getMileage())){ - message = "车辆公里数未填写，请填写车辆公里数"; - }else if(StringUtils.isEmpty(carrentApply.getName())){ - message = "联系人未填写，请填写联系人"; - }else if(StringUtils.isEmpty(carrentApply.getPhone())){ - message = "联系人电话未填写，填写联系人电话"; - }else { - return applyService.addApply(token, carrentApply); - } - - return Result.error(message); - + return applyService.addApply(token, carrentApply); } // @ApiOperation(value="寻车申请-删除申请", notes="寻车申请-删除申请") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java index 5c53a00..f38b4c6 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ApplyServiceImpl.java @@ -11,6 +11,7 @@ import org.jeecg.modules.carrentGoods.entity.CarrentGoods; import org.jeecg.modules.carrentOrder.entity.CarrentOrder; import org.jeecg.modules.carrentOrder.service.ICarrentOrderService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; +import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java index 5096469..c86ceac 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java @@ -111,6 +111,17 @@ public class GoodsServiceImpl implements GoodsService { message = "商品列表信息为空"; } + //商品列表添加分类名称 + for (CarrentGoods record : pageList.getRecords()) { + //获取一级分类信息 + CarrentCategory categoryone = carrentCategoryService.getById(record.getCartypeId()); + record.setCategoryoneName(categoryone.getName()); + + //获取二级分类信息 + CarrentCategory categorytwo = carrentCategoryService.getById(record.getCategorytwoId()); + record.setCategorytwoName(categorytwo.getName()); + } + //返回执行结果 return Result.OK(message, pageList); diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 71d2027..ff12ae6 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -134,9 +134,9 @@ spring: # connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://8.138.162.67:3306/carrent?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false + url: jdbc:mysql://1.14.193.89:3306/carrent?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false username: root - password: Fk4q*h@V + password: jthj8.123456 driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 #multi-datasource1: @@ -147,7 +147,7 @@ spring: #redis 配置 redis: database: 10 - host: 8.138.162.67 + host: 1.14.193.89 lettuce: pool: max-active: -1 #最大连接数据库连接数,设 -1 为没有限制 @@ -155,7 +155,7 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 1000ms - password: 'gmmGMM@2024' + password: 'jthj8.123456' port: 6379 #mybatis plus 设置 mybatis-plus: @@ -199,11 +199,11 @@ jeecg : # staticDomain: https://img.augcl.com oss: - accessKey: LTAI5tQSs47izVy8DLVdwUU9 - secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq - endpoint: oss-cn-shenzhen.aliyuncs.com - bucketName: hanhaiimage - staticDomain: https://image.hhlm1688.com/ + accessKey: LTAI5tMJitfHeQ8jNAikvEu7 + secretKey: GodE2mPZiW2WhiMtEkPhNNOThLlSRj + endpoint: oss-cn-guangzhou.aliyuncs.com + bucketName: jthj8 + staticDomain: https://image.jthj8.com # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES