From 51a0cc85367ffa303d4f1c2e23e3490d9d984495 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Thu, 9 Jan 2025 19:12:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=87=E6=B3=A8=E4=BB=A5=E5=8F=8A=E5=B9=B4?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9=202=E3=80=81=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=203=E3=80=81=E9=A2=84=E7=BA=A6=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E3=80=81=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 169 ++++++++++++++------- .../controller/CarrentGoodsController.java | 2 +- .../modules/carrentGoods/entity/CarrentGoods.java | 44 ++++-- .../carrentGoods/mapper/CarrentGoodsMapper.java | 2 +- .../carrentGoods/service/ICarrentGoodsService.java | 2 +- .../service/impl/CarrentGoodsServiceImpl.java | 2 +- .../modules/carrentGoods/vue/CarrentGoodsList.vue | 55 +++++-- .../carrentGoods/vue/modules/CarrentGoodsForm.vue | 26 +++- .../modules/carrentGoods/vue3/CarrentGoods.data.ts | 74 ++++++--- .../api/carrentController/ApplyController.java | 15 +- .../api/carrentController/GoodsController.java | 6 + .../api/carrentController/OrderController.java | 12 ++ .../org/jeecg/modules/apiService/ApplyService.java | 16 ++ .../org/jeecg/modules/apiService/GoodsService.java | 8 + .../org/jeecg/modules/apiService/OrderService.java | 16 ++ .../modules/apiService/impl/ApplyServiceImpl.java | 103 +++++++++++-- .../modules/apiService/impl/GoodsServiceImpl.java | 113 ++++++++++++-- .../modules/apiService/impl/OrderServiceImpl.java | 97 ++++++++++-- 18 files changed, 610 insertions(+), 152 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 09dfc51..aff4052 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,25 @@ - - - - - - + + + + + + + + + + + + + + + + + + @@ -148,7 +162,7 @@ - + 1731385713383 @@ -227,7 +241,49 @@ - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java index 943c14d..6e83c66 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/controller/CarrentGoodsController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-01-07 + * @Date: 2025-01-08 * @Version: V1.0 */ @Api(tags="商品信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java index 1eca5c8..f91350a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/entity/CarrentGoods.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -20,7 +21,7 @@ import lombok.experimental.Accessors; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-01-07 + * @Date: 2025-01-08 * @Version: V1.0 */ @Data @@ -67,12 +68,10 @@ public class CarrentGoods implements Serializable { @Excel(name = "品牌", width = 15) @ApiModelProperty(value = "品牌") private java.lang.String brand; - /**时间*/ - @Excel(name = "时间", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "时间") - private java.util.Date goodsTime; + /**年限*/ + @Excel(name = "年限", width = 15) + @ApiModelProperty(value = "年限") + private java.lang.Integer goodsTime; /**公里数*/ @Excel(name = "公里数", width = 15) @ApiModelProperty(value = "公里数") @@ -81,14 +80,14 @@ public class CarrentGoods implements Serializable { @Excel(name = "型号", width = 15) @ApiModelProperty(value = "型号") private java.lang.String model; - /**详情*/ - @Excel(name = "详情", width = 15) - @ApiModelProperty(value = "详情") - private java.lang.String detail; /**库存*/ @Excel(name = "库存", width = 15) @ApiModelProperty(value = "库存") private java.lang.Integer inventory; + /**详情*/ + @Excel(name = "详情", width = 15) + @ApiModelProperty(value = "详情") + private java.lang.String detail; /**车辆照片(前)*/ @Excel(name = "车辆照片(前)", width = 15) @ApiModelProperty(value = "车辆照片(前)") @@ -121,10 +120,15 @@ public class CarrentGoods implements Serializable { @Excel(name = "所在区域", width = 15) @ApiModelProperty(value = "所在区域") private java.lang.String area; - /**关联商品类型id*/ - @Excel(name = "关联商品类型id", width = 15, dictTable = "carrent_categoryone", dicText = "name", dicCode = "id") + /**审核状态*/ + @Excel(name = "审核状态", width = 15, dicCode = "authentic_status") + @Dict(dicCode = "authentic_status") + @ApiModelProperty(value = "审核状态") + private java.lang.String status; + /**关联一级分类id*/ + @Excel(name = "关联一级分类id", width = 15, dictTable = "carrent_categoryone", dicText = "name", dicCode = "id") @Dict(dictTable = "carrent_categoryone", dicText = "name", dicCode = "id") - @ApiModelProperty(value = "关联商品类型id") + @ApiModelProperty(value = "关联一级分类id") private java.lang.String cartypeId; /**关联二级分类id*/ @Excel(name = "关联二级分类id", width = 15, dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id") @@ -136,4 +140,16 @@ public class CarrentGoods implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "关联用户id") private java.lang.String userId; + /**审核备注*/ + @Excel(name = "审核备注", width = 15) + @ApiModelProperty(value = "审核备注") + private java.lang.String remark; + + //一级分类名称 + @TableField(exist = false) + private java.lang.String categoryoneName; + + //二级分类名称 + @TableField(exist = false) + private java.lang.String categorytwoName; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java index 8701c12..f791f1d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/mapper/CarrentGoodsMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-01-07 + * @Date: 2025-01-08 * @Version: V1.0 */ public interface CarrentGoodsMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java index 37c9ca5..1726d0b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/ICarrentGoodsService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-01-07 + * @Date: 2025-01-08 * @Version: V1.0 */ public interface ICarrentGoodsService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java index db86790..20be66a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/service/impl/CarrentGoodsServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2025-01-07 + * @Date: 2025-01-08 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue index 8131cf2..9db26fe 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/CarrentGoodsList.vue @@ -4,6 +4,26 @@
+ + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -149,12 +169,9 @@ dataIndex: 'brand' }, { - title:'时间', + title:'年限', align:"center", - dataIndex: 'goodsTime', - customRender:function (text) { - return !text?"":(text.length>10?text.substr(0,10):text) - } + dataIndex: 'goodsTime' }, { title:'公里数', @@ -167,14 +184,14 @@ dataIndex: 'model' }, { - title:'详情', + title:'库存', align:"center", - dataIndex: 'detail' + dataIndex: 'inventory' }, { - title:'库存', + title:'详情', align:"center", - dataIndex: 'inventory' + dataIndex: 'detail' }, { title:'车辆照片(前)', @@ -222,7 +239,12 @@ dataIndex: 'area' }, { - title:'关联商品类型id', + title:'审核状态', + align:"center", + dataIndex: 'status_dictText' + }, + { + title:'关联一级分类id', align:"center", dataIndex: 'cartypeId_dictText' }, @@ -236,6 +258,11 @@ align:"center", dataIndex: 'userId_dictText' }, + { + title:'审核备注', + align:"center", + dataIndex: 'remark' + }, { title: '操作', dataIndex: 'action', @@ -275,11 +302,11 @@ fieldList.push({type:'BigDecimal',value:'price',text:'商品价格',dictCode:''}) fieldList.push({type:'int',value:'views',text:'浏览量',dictCode:''}) fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''}) - fieldList.push({type:'date',value:'goodsTime',text:'时间'}) + fieldList.push({type:'int',value:'goodsTime',text:'年限',dictCode:''}) fieldList.push({type:'int',value:'mileage',text:'公里数',dictCode:''}) fieldList.push({type:'string',value:'model',text:'型号',dictCode:''}) - fieldList.push({type:'Text',value:'detail',text:'详情',dictCode:''}) fieldList.push({type:'int',value:'inventory',text:'库存',dictCode:''}) + fieldList.push({type:'Text',value:'detail',text:'详情',dictCode:''}) fieldList.push({type:'Text',value:'imageFront',text:'车辆照片(前)',dictCode:''}) fieldList.push({type:'Text',value:'imageBack',text:'车辆照片(后)',dictCode:''}) fieldList.push({type:'Text',value:'imageLeft',text:'车辆照片(左)',dictCode:''}) @@ -288,9 +315,11 @@ fieldList.push({type:'string',value:'userName',text:'联系人',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'联系人电话',dictCode:''}) fieldList.push({type:'string',value:'area',text:'所在区域',dictCode:''}) - fieldList.push({type:'string',value:'cartypeId',text:'关联商品类型id',dictCode:"carrent_categoryone,name,id"}) + fieldList.push({type:'string',value:'status',text:'审核状态',dictCode:'authentic_status'}) + fieldList.push({type:'string',value:'cartypeId',text:'关联一级分类id',dictCode:"carrent_categoryone,name,id"}) fieldList.push({type:'string',value:'categorytwoId',text:'关联二级分类id',dictCode:"carrent_categorytwo,name,id"}) fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"}) + fieldList.push({type:'string',value:'remark',text:'审核备注',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue index 415aab6..b8f9cb0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue/modules/CarrentGoodsForm.vue @@ -29,8 +29,8 @@ - - + + @@ -44,13 +44,13 @@ - - + + - - + + @@ -94,8 +94,13 @@ - - + + + + + + + @@ -108,6 +113,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts index c276fa4..bcc4eda 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentGoods/vue3/CarrentGoods.data.ts @@ -31,12 +31,9 @@ export const columns: BasicColumn[] = [ dataIndex: 'brand' }, { - title: '时间', + title: '年限', align:"center", - dataIndex: 'goodsTime', - customRender:({text}) =>{ - return !text?"":(text.length>10?text.substr(0,10):text) - }, + dataIndex: 'goodsTime' }, { title: '公里数', @@ -49,14 +46,14 @@ export const columns: BasicColumn[] = [ dataIndex: 'model' }, { - title: '详情', + title: '库存', align:"center", - dataIndex: 'detail' + dataIndex: 'inventory' }, { - title: '库存', + title: '详情', align:"center", - dataIndex: 'inventory' + dataIndex: 'detail' }, { title: '车辆照片(前)', @@ -104,7 +101,12 @@ export const columns: BasicColumn[] = [ dataIndex: 'area' }, { - title: '关联商品类型id', + title: '审核状态', + align:"center", + dataIndex: 'status_dictText' + }, + { + title: '关联一级分类id', align:"center", dataIndex: 'cartypeId_dictText' }, @@ -118,9 +120,32 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId_dictText' }, + { + title: '审核备注', + align:"center", + dataIndex: 'remark' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "审核状态", + field: "status", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"authentic_status" + }, + colProps: {span: 6}, + }, + { + label: "关联一级分类id", + field: "cartypeId", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"carrent_categoryone,name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -152,9 +177,9 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '时间', + label: '年限', field: 'goodsTime', - component: 'DatePicker', + component: 'InputNumber', }, { label: '公里数', @@ -166,16 +191,16 @@ export const formSchema: FormSchema[] = [ field: 'model', component: 'Input', }, - { - label: '详情', - field: 'detail', - component: 'Input', - }, { label: '库存', field: 'inventory', component: 'InputNumber', }, + { + label: '详情', + field: 'detail', + component: 'Input', + }, { label: '车辆照片(前)', field: 'imageFront', @@ -227,7 +252,15 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '关联商品类型id', + label: '审核状态', + field: 'status', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"authentic_status" + }, + }, + { + label: '关联一级分类id', field: 'cartypeId', component: 'JDictSelectTag', componentProps:{ @@ -250,4 +283,9 @@ export const formSchema: FormSchema[] = [ dictCode:"han_hai_member,nick_name,id" }, }, + { + label: '审核备注', + field: 'remark', + component: 'Input', + }, ]; 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 ad83848..a41ee48 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 @@ -32,8 +32,14 @@ public class ApplyController { return applyService.queryApplyList(token, pageBean); } +// @ApiOperation(value="寻车申请-申请详情", notes="寻车申请-申请详情") +// @RequestMapping(value = "/queryApplyById", method = {RequestMethod.GET}) +// public Result queryApplyById(@RequestHeader("X-Access-Token") String token, String applyId){ +// return applyService.queryApplyById(token, applyId); +// } + @ApiOperation(value="寻车申请-添加申请", notes="寻车申请-添加申请") - @RequestMapping(value = "/addApply", method = {RequestMethod.GET}) + @RequestMapping(value = "/addApply", method = {RequestMethod.POST}) public Result addApply(@RequestHeader("X-Access-Token") String token, CarrentApply carrentApply){ String message = ""; @@ -58,4 +64,11 @@ public class ApplyController { } +// @ApiOperation(value="寻车申请-删除申请", notes="寻车申请-删除申请") +// @RequestMapping(value = "/deleteApply", method = {RequestMethod.POST}) +// public Result deleteApply(@RequestHeader("X-Access-Token") String token, String applyId){ +// return applyService.deleteApply(token, applyId); +// +// } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java index 6b2ee1f..ea20e28 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/GoodsController.java @@ -79,4 +79,10 @@ public class GoodsController { return Result.error(message); } + @ApiOperation(value="商品信息-车辆信息删除", notes="商品信息-车辆信息删除") + @RequestMapping(value = "/deleteGoods", method = {RequestMethod.POST}) + public Result deleteGoods(@RequestHeader("X-Access-Token") String token, String goodsId){ + return goodsService.deleteGoods(token, goodsId); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java index 45a8b89..51b1dac 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java @@ -32,6 +32,12 @@ public class OrderController { return orderService.queryOrderList(token, typeId, pageBean); } +// @ApiOperation(value="车辆预约-车辆预约详情", notes="车辆预约-车辆预约详情") +// @RequestMapping(value = "/queryOrderById", method = {RequestMethod.GET}) +// public Result queryOrderById(@RequestHeader("X-Access-Token") String token, String orderId){ +// return orderService.queryOrderById(token, orderId); +// } + @ApiOperation(value="车辆预约-提交预约信息", notes="车辆预约-提交预约信息") @RequestMapping(value = "/addOrder", method = {RequestMethod.POST}) public Result addOrder(@RequestHeader("X-Access-Token") String token, CarrentOrder carrentOrder){ @@ -53,4 +59,10 @@ public class OrderController { return Result.error(message); } +// @ApiOperation(value="车辆预约-删除预约信息", notes="车辆预约-删除预约信息") +// @RequestMapping(value = "/deleteOrder", method = {RequestMethod.POST}) +// public Result deleteOrder(@RequestHeader("X-Access-Token") String token, String orderId){ +// return orderService.deleteOrder(token, orderId); +// } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java index d175ae4..dc9bc90 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ApplyService.java @@ -15,6 +15,14 @@ public interface ApplyService { */ public Result queryApplyList(@RequestHeader("X-Access-Token") String token, PageBean pageBean); + /** + * 寻车申请-申请详情 + * @param token + * @param applyId + * @return + */ + public Result queryApplyById(String token, String applyId); + /** * 寻车申请-添加申请 * @param token @@ -23,4 +31,12 @@ public interface ApplyService { */ public Result addApply(@RequestHeader("X-Access-Token") String token, CarrentApply carrentApply); + /** + * 寻车申请-删除申请 + * @param token + * @param applyId + * @return + */ + public Result deleteApply(String token, String applyId); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java index 8887f0c..e55d3b5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java @@ -30,4 +30,12 @@ public interface GoodsService { */ public Result addGoods(String token, CarrentGoods goods); + /** + * 商品信息-车辆信息删除 + * @param token + * @param goodsId + * @return + */ + public Result deleteGoods(String token, String goodsId); + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java index e4a2476..b56a73a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java @@ -16,6 +16,14 @@ public interface OrderService { */ public Result queryOrderList(@RequestHeader("X-Access-Token") String token, String typeId, PageBean pageBean); + /** + * 商品预约-查看预约详情 + * @param token + * @param orderId + * @return + */ + public Result queryOrderById(String token, String orderId); + /** * 商品预约-提交预约信息 * @param token @@ -24,4 +32,12 @@ public interface OrderService { */ public Result addOrder(String token, CarrentOrder carrentOrder); + /** + * 商品预约-删除预约信息 + * @param token + * @param orderId + * @return + */ + public Result deleteOrder(String token, String orderId); + } 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 915504d..5c53a00 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 @@ -7,6 +7,9 @@ import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ApplyService; import org.jeecg.modules.carrentApply.entity.CarrentApply; import org.jeecg.modules.carrentApply.service.ICarrentApplyService; +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.springframework.stereotype.Service; @@ -28,12 +31,12 @@ public class ApplyServiceImpl implements ApplyService { //寻车申请-申请列表 @Override public Result queryApplyList(String token, PageBean pageBean) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 String message = "寻车申请列表查询失败!"; //新闻列表 Page pageList = null; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); try{ //分页 @@ -60,30 +63,106 @@ public class ApplyServiceImpl implements ApplyService { } } + //寻车申请-根据id获取申请详情 + @Override + public Result queryApplyById(String token, String applyId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 + String message = "获取寻车申请详情失败！"; + //寻车申请详情 + CarrentApply one = null; + + try{ + //获取寻车申请详情 + one = carrentApplyService + .lambdaQuery() + .eq(CarrentApply::getUserId, hanHaiMember.getId()) + .eq(CarrentApply::getId, applyId) + .one(); + + //判断执行结果 + if(null != one){ + message = "寻车申请详情信息"; + }else { + message = "寻车申请详情信息为空"; + } + + //返回执行结果 + return Result.OK(message, one); + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message, one); + } + } + //寻车申请-添加申请 @Override public Result addApply(String token, CarrentApply carrentApply) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); //返回信息 - String message = "添加申请失败"; + String message = "寻车申请添加失败"; //执行结果 boolean result = false; - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - carrentApply.setUserId(hanHaiMember.getId()); try{ - //执行寻车申请添加 - result = carrentApplyService.save(carrentApply); + CarrentApply apply = null; - //判断执行结果 - if(result){ - message = "添加申请成功！"; + if(null != carrentApply.getId()){ + //查询商品信息 + apply = carrentApplyService.getById(carrentApply.getId()); + } + + if(null != apply){ + //修改商品信息 + carrentApply.setId(apply.getId()); + result = carrentApplyService.updateById(carrentApply); + message = "寻车申请信息修改成功！"; }else { - message = "添加申请失败！"; + //添加商品信息 + carrentApply.setUserId(hanHaiMember.getId()); + result = carrentApplyService.save(carrentApply); + message = "寻车申请信息提交成功！"; } //返回执行结果 + if(result){ + return Result.OK(message); + }else { + return Result.error(message); + } + + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); return Result.OK(message); + } + } + + //寻车申请-删除申请 + @Override + public Result deleteApply(String token, String applyId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 + String message = "寻车申请删除失败"; + //执行结果 + boolean result = false; + + try{ + + //执行删除申请操作 + result = carrentApplyService.removeById(applyId); + + //返回执行结果 + if(result){ + message = "寻车申请删除成功"; + return Result.OK(message); + }else { + return Result.error(message); + } }catch (Exception e){ //错误信息打印 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 86b03e9..3b25755 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 @@ -6,12 +6,21 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.GoodsService; +import org.jeecg.modules.carrentCategoryone.entity.CarrentCategoryone; +import org.jeecg.modules.carrentCategoryone.service.ICarrentCategoryoneService; +import org.jeecg.modules.carrentCategorytwo.entity.CarrentCategorytwo; +import org.jeecg.modules.carrentCategorytwo.service.ICarrentCategorytwoService; +import org.jeecg.modules.carrentCompany.entity.CarrentCompany; import org.jeecg.modules.carrentGoods.entity.CarrentGoods; import org.jeecg.modules.carrentGoods.service.ICarrentGoodsService; +import org.jeecg.modules.carrentOrder.entity.CarrentOrder; +import org.jeecg.modules.carrentOrder.service.ICarrentOrderService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; @Service public class GoodsServiceImpl implements GoodsService { @@ -24,6 +33,18 @@ public class GoodsServiceImpl implements GoodsService { @Resource private ICarrentGoodsService carrentGoodsService; + //一级分类信息 + @Resource + private ICarrentCategoryoneService carrentCategoryoneService; + + //一级分类信息 + @Resource + private ICarrentCategorytwoService carrentCategorytwoService; + + //车辆预约信息 + @Resource + private ICarrentOrderService carrentOrderService; + /*************************************************************************************/ //商品信息-获取商品列表 @Override @@ -50,17 +71,21 @@ public class GoodsServiceImpl implements GoodsService { query.eq(CarrentGoods::getCategorytwoId, goods.getCategorytwoId()); } if(null != goods.getGoodsTime()){ - //时间 - query.le(CarrentGoods::getGoodsTime, goods.getGoodsTime()); + //时间 大于：ge、gt + query.ge(CarrentGoods::getGoodsTime, goods.getGoodsTime()); } if(null != goods.getMileage()){ - //公里数 - query.between(CarrentGoods::getMileage, 0, goods.getMileage()); + //公里数 小于：le、lt + query.le(CarrentGoods::getMileage, goods.getMileage()); } if(null != goods.getGoodsName()){ //商品名称 query.like(CarrentGoods::getGoodsName, goods.getGoodsName()); } + if(null != goods.getStatus()){ + //审核状态(0-审核中 1-已通过 2-未通过) + query.eq(CarrentGoods::getStatus, goods.getStatus()); + } if(null != token){ //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -102,6 +127,24 @@ public class GoodsServiceImpl implements GoodsService { //获取商品信息详情 one = carrentGoodsService.getById(goodsId); + //获取一级分类列表 + List categoryoneList = carrentCategoryoneService.list(); + for (CarrentCategoryone categoryone : categoryoneList) { + if(one.getCartypeId().equals(categoryone.getId())){ + one.setCategoryoneName(categoryone.getName()); + break; + } + } + + //获取二级分类列表 + List categorytwoList = carrentCategorytwoService.list(); + for (CarrentCategorytwo categorytwo : categorytwoList) { + if(one.getCategorytwoId().equals(categorytwo.getId())){ + one.setCategorytwoName(categorytwo.getName()); + break; + } + } + //判断执行结果 if(null != one){ message = "商品详情信息"; @@ -122,30 +165,68 @@ public class GoodsServiceImpl implements GoodsService { @Override public Result addGoods(String token, CarrentGoods goods) { //返回信息 - String message = "车辆信息发布失败！"; - //执行结果 - boolean flag = false; + String message = "车辆信息发布失败"; //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - goods.setUserId(hanHaiMember.getId()); try{ - //获取商品信息详情 - flag = carrentGoodsService.save(goods); - //判断执行结果 - if(flag){ - message = "车辆信息发布成功"; + CarrentGoods carrentGoods = null; + + if(null != goods.getId()){ + //查询商品信息 + carrentGoods = carrentGoodsService.getById(goods.getId()); + } + + if(null != carrentGoods){ + //修改商品信息 + goods.setId(carrentGoods.getId()); + goods.setStatus("0"); + carrentGoodsService.updateById(goods); + message = "车辆发布信息修改成功！"; }else { - message = "车辆信息发布失败"; + //添加商品信息 + goods.setUserId(hanHaiMember.getId()); + boolean result = carrentGoodsService.save(goods); + message = "车辆发布成功！"; } + return Result.OK(message); + }catch (Exception e){ + e.printStackTrace(); + return Result.error(message); + } + + } + + //商品信息-车辆信息删除 + @Override + public Result deleteGoods(String token, String goodsId) { + String message = "车辆删除失败"; + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + try{ + //1、删除车辆相关的预约信息 + List orderList = carrentOrderService + .lambdaQuery() + .eq(CarrentOrder::getGoodsId, goodsId) + .list(); + List orderIds = new ArrayList<>(); + for (CarrentOrder order : orderList) { + orderIds.add(order.getId()); + } + carrentOrderService.removeByIds(orderIds); + + //2、执行车辆删除操作 + boolean result = carrentGoodsService.removeById(goodsId); + message = "车辆删除成功"; - //返回执行结果 return Result.OK(message); }catch (Exception e){ - //错误信息打印 e.printStackTrace(); return Result.error(message); } + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index 23f790d..cee7f8f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -6,6 +6,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.OrderService; +import org.jeecg.modules.carrentApply.entity.CarrentApply; import org.jeecg.modules.carrentGoods.entity.CarrentGoods; import org.jeecg.modules.carrentGoods.service.ICarrentGoodsService; import org.jeecg.modules.carrentOrder.entity.CarrentOrder; @@ -63,32 +64,110 @@ public class OrderServiceImpl implements OrderService { return Result.OK("预约列表", pageList); } + //寻车申请-根据id获取预约信息详情 + @Override + public Result queryOrderById(String token, String orderId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 + String message = "获取预约信息详情失败！"; + //预约信息详情 + CarrentOrder one = null; + + try{ + //获取预约信息详情 + one = carrentOrderService + .lambdaQuery() + .eq(CarrentOrder::getUserId, hanHaiMember.getId()) + .eq(CarrentOrder::getId, orderId) + .one(); + + //判断执行结果 + if(null != one){ + //获取预约车辆信息 + CarrentGoods carrentGoods = carrentGoodsService.getById(one.getGoodsId()); + one.setCarrentGoods(carrentGoods); + message = "预约信息详情"; + }else { + message = "预约信息详情为空"; + } + + //返回执行结果 + return Result.OK(message, one); + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message, one); + } + } + //商品预约-提交预约信息 @Override public Result addOrder(String token, CarrentOrder carrentOrder) { - //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - carrentOrder.setUserId(hanHaiMember.getId()); - //返回信息 String message = "预约信息提交失败"; //执行结果 boolean result = false; try{ - //执行预约信息提交 - result = carrentOrderService.save(carrentOrder); + CarrentOrder order = null; - //判断执行结果 + if(null != carrentOrder.getId()){ + //查询商品信息 + order = carrentOrderService.getById(carrentOrder.getId()); + } + + if(null != order){ + //修改商品信息 + carrentOrder.setId(order.getId()); + result = carrentOrderService.updateById(carrentOrder); + message = "预约信息修改成功！"; + }else { + //添加商品信息 + carrentOrder.setUserId(hanHaiMember.getId()); + result = carrentOrderService.save(carrentOrder); + message = "预约提交成功！"; + } + + //返回执行结果 if(result){ - message = "预约信息提交成功！"; + return Result.OK(message); }else { - message = "预约信息提交失败！"; + return Result.error(message); } + }catch (Exception e){ + //错误信息打印 + e.printStackTrace(); + return Result.error(message); + } + + } + + //商品预约-提交预约信息 + @Override + public Result deleteOrder(String token, String orderId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //返回信息 + String message = "预约信息删除失败"; + //执行结果 + boolean result = false; + + try{ + + //执行预约信息删除操作 + result = carrentOrderService.removeById(orderId); + //返回执行结果 - return Result.OK(message); + if(result){ + message = "预约信息删除成功"; + return Result.OK(message); + }else { + return Result.error(message); + } }catch (Exception e){ //错误信息打印