diff --git a/admin-hanhai-vue/dist.zip b/admin-hanhai-vue/dist.zip new file mode 100644 index 0000000..3676a78 Binary files /dev/null and b/admin-hanhai-vue/dist.zip differ diff --git a/admin-hanhai-vue/src/assets/logo.png b/admin-hanhai-vue/src/assets/logo.png index a4b790c..1012491 100644 Binary files a/admin-hanhai-vue/src/assets/logo.png and b/admin-hanhai-vue/src/assets/logo.png differ diff --git a/admin-hanhai-vue/src/views/carrentCategoryOne/CarrentCategoryoneList.vue b/admin-hanhai-vue/src/views/carrentCategoryOne/CarrentCategoryoneList.vue index 03a1855..ee08d50 100644 --- a/admin-hanhai-vue/src/views/carrentCategoryOne/CarrentCategoryoneList.vue +++ b/admin-hanhai-vue/src/views/carrentCategoryOne/CarrentCategoryoneList.vue @@ -12,12 +12,12 @@
新增 - 导出 - - 导入 - + + + + - + 删除 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 aaaa63a..943c14d 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: 2024-12-12 + * @Date: 2025-01-07 * @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 72bf3ed..1eca5c8 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 @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 商品信息表 * @Author: jeecg-boot - * @Date: 2024-12-12 + * @Date: 2025-01-07 * @Version: V1.0 */ @Data @@ -122,8 +122,8 @@ public class CarrentGoods implements Serializable { @ApiModelProperty(value = "所在区域") private java.lang.String area; /**关联商品类型id*/ - @Excel(name = "关联商品类型id", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id") - @Dict(dictTable = "carrent_type", dicText = "name", dicCode = "id") + @Excel(name = "关联商品类型id", width = 15, dictTable = "carrent_categoryone", dicText = "name", dicCode = "id") + @Dict(dictTable = "carrent_categoryone", dicText = "name", dicCode = "id") @ApiModelProperty(value = "关联商品类型id") private java.lang.String cartypeId; /**关联二级分类id*/ 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 035fe45..8701c12 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: 2024-12-12 + * @Date: 2025-01-07 * @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 ad24112..37c9ca5 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: 2024-12-12 + * @Date: 2025-01-07 * @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 04f93db..db86790 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: 2024-12-12 + * @Date: 2025-01-07 * @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 85f7fa5..8131cf2 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 @@ -130,7 +130,8 @@ { title:'商品图片', align:"center", - dataIndex: 'image' + dataIndex: 'image', + scopedSlots: {customRender: 'imgSlot'} }, { title:'商品价格', @@ -178,27 +179,32 @@ { title:'车辆照片(前)', align:"center", - dataIndex: 'imageFront' + dataIndex: 'imageFront', + scopedSlots: {customRender: 'imgSlot'} }, { title:'车辆照片(后)', align:"center", - dataIndex: 'imageBack' + dataIndex: 'imageBack', + scopedSlots: {customRender: 'imgSlot'} }, { title:'车辆照片(左)', align:"center", - dataIndex: 'imageLeft' + dataIndex: 'imageLeft', + scopedSlots: {customRender: 'imgSlot'} }, { title:'车辆照片(右)', align:"center", - dataIndex: 'imageRight' + dataIndex: 'imageRight', + scopedSlots: {customRender: 'imgSlot'} }, { title:'车辆照片(驾驶室)', align:"center", - dataIndex: 'imageCab' + dataIndex: 'imageCab', + scopedSlots: {customRender: 'imgSlot'} }, { title:'联系人', @@ -265,7 +271,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'goodsName',text:'商品名称',dictCode:''}) - fieldList.push({type:'string',value:'image',text:'商品图片',dictCode:''}) + fieldList.push({type:'Text',value:'image',text:'商品图片',dictCode:''}) fieldList.push({type:'BigDecimal',value:'price',text:'商品价格',dictCode:''}) fieldList.push({type:'int',value:'views',text:'浏览量',dictCode:''}) fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''}) @@ -274,15 +280,15 @@ 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:'string',value:'imageFront',text:'车辆照片(前)',dictCode:''}) - fieldList.push({type:'string',value:'imageBack',text:'车辆照片(后)',dictCode:''}) - fieldList.push({type:'string',value:'imageLeft',text:'车辆照片(左)',dictCode:''}) - fieldList.push({type:'string',value:'imageRight',text:'车辆照片(右)',dictCode:''}) - fieldList.push({type:'string',value:'imageCab',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:''}) + fieldList.push({type:'Text',value:'imageRight',text:'车辆照片(右)',dictCode:''}) + fieldList.push({type:'Text',value:'imageCab',text:'车辆照片(驾驶室)',dictCode:''}) 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_type,name,id"}) + 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"}) 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 db7d1cd..415aab6 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 @@ -10,7 +10,7 @@ - + @@ -55,27 +55,27 @@ - + - + - + - + - + @@ -95,7 +95,7 @@ - + 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 5ebd5d7..c276fa4 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 @@ -12,7 +12,8 @@ export const columns: BasicColumn[] = [ { title: '商品图片', align:"center", - dataIndex: 'image' + dataIndex: 'image', + customRender:render.renderAvatar, }, { title: '商品价格', @@ -60,27 +61,32 @@ export const columns: BasicColumn[] = [ { title: '车辆照片(前)', align:"center", - dataIndex: 'imageFront' + dataIndex: 'imageFront', + customRender:render.renderAvatar, }, { title: '车辆照片(后)', align:"center", - dataIndex: 'imageBack' + dataIndex: 'imageBack', + customRender:render.renderAvatar, }, { title: '车辆照片(左)', align:"center", - dataIndex: 'imageLeft' + dataIndex: 'imageLeft', + customRender:render.renderAvatar, }, { title: '车辆照片(右)', align:"center", - dataIndex: 'imageRight' + dataIndex: 'imageRight', + customRender:render.renderAvatar, }, { title: '车辆照片(驾驶室)', align:"center", - dataIndex: 'imageCab' + dataIndex: 'imageCab', + customRender:render.renderAvatar, }, { title: '联系人', @@ -126,7 +132,9 @@ export const formSchema: FormSchema[] = [ { label: '商品图片', field: 'image', - component: 'Input', + component: 'JImageUpload', + componentProps:{ + }, }, { label: '商品价格', @@ -171,27 +179,37 @@ export const formSchema: FormSchema[] = [ { label: '车辆照片(前)', field: 'imageFront', - component: 'Input', + component: 'JImageUpload', + componentProps:{ + }, }, { label: '车辆照片(后)', field: 'imageBack', - component: 'Input', + component: 'JImageUpload', + componentProps:{ + }, }, { label: '车辆照片(左)', field: 'imageLeft', - component: 'Input', + component: 'JImageUpload', + componentProps:{ + }, }, { label: '车辆照片(右)', field: 'imageRight', - component: 'Input', + component: 'JImageUpload', + componentProps:{ + }, }, { label: '车辆照片(驾驶室)', field: 'imageCab', - component: 'Input', + component: 'JImageUpload', + componentProps:{ + }, }, { label: '联系人', @@ -213,7 +231,7 @@ export const formSchema: FormSchema[] = [ field: 'cartypeId', component: 'JDictSelectTag', componentProps:{ - dictCode:"carrent_type,name,id" + dictCode:"carrent_categoryone,name,id" }, }, { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java index 7d13e86..f06a36d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java @@ -28,7 +28,7 @@ public class CompanyController { @ApiOperation(value="企业信息-企业注册", notes="企业信息-企业注册") @RequestMapping(value = "/addCompany", method = {RequestMethod.POST}) - public Result addCompany(@RequestHeader("X-Access-Token") String token, CompanyBean companyBean){ + public Result addAuthenticationCompany(@RequestHeader("X-Access-Token") String token, CompanyBean companyBean){ //将注册信息注入实体bean中 CarrentCompany carrentCompany = new CarrentCompany(); @@ -52,10 +52,18 @@ public class CompanyController { message = "营业执照未填写，请上传营业执照!"; }else { //注册信息无误，进入业务流程处理 - return companyService.addCompany(token, carrentCompany); + return companyService.addAuthenticationCompany(token, carrentCompany); } //注册信息有误，返回错误信息 return Result.error(message); } + + @ApiOperation(value="企业信息-查询企业实名信息", notes="企业信息-查询企业实名信息") + @RequestMapping(value = "/queryAuthenticationCompany", method = {RequestMethod.GET}) + public Result queryAuthenticationCompany(@RequestHeader("X-Access-Token") String token){ + //业务处理 + return companyService.queryAuthenticationCompany(token); + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java index fd1d948..121461e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java @@ -21,14 +21,14 @@ import javax.annotation.Resource; @Slf4j public class UserController { - //预约信息 + //用户信息 @Resource private UserService userService; /****************************************************************************************************/ @ApiOperation(value="用户信息-个人注册", notes="用户信息-个人注册") @RequestMapping(value = "/addUser", method = {RequestMethod.POST}) - public Result addUser(@RequestHeader("X-Access-Token") String token, UserBean userBean){ + public Result addAuthenticationPerson(@RequestHeader("X-Access-Token") String token, UserBean userBean){ //将注册信息注入到实体bean中 CarrentUser carrentUser = new CarrentUser(); @@ -49,13 +49,23 @@ public class UserController { message = "身份证正面照片未填写，请上传身份证正面照片!"; }else { //注册信息无误，进入业务流程处理 - return userService.addUser(token, carrentUser); + return userService.addAuthenticationPerson(token, carrentUser); } //注册信息有误，返回错误信息 return Result.error(message); } + //用户信息-查询个人实名信息 + @ApiOperation(value="用户信息-查询个人实名信息", notes="用户信息-查询个人实名信息") + @RequestMapping(value = "/queryAuthenticationPerson", method = {RequestMethod.GET}) + public Result queryAuthenticationPerson(@RequestHeader("X-Access-Token") String token){ + //业务处理 + return userService.queryAuthenticationPerson(token); + } + + + /*****************************************************************************************************************/ //查看个人信息 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java index 31b411d..5067e30 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CompanyService.java @@ -11,6 +11,13 @@ public interface CompanyService { * @param carrentCompany 企业信息 * @return */ - public Result addCompany(String token, CarrentCompany carrentCompany); + public Result addAuthenticationCompany(String token, CarrentCompany carrentCompany); + + /** + * 企业信息-查询企业信息 + * @param token + * @return + */ + public Result queryAuthenticationCompany(String token); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java index 32bba20..11b6ec7 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java @@ -11,7 +11,14 @@ public interface UserService { * @param carrentUser 用户信息 * @return */ - public Result addUser(String token, CarrentUser carrentUser); + public Result addAuthenticationPerson(String token, CarrentUser carrentUser); + + /** + * 用户信息-查询个人实名信息 + * @param token + * @return + */ + public Result queryAuthenticationPerson(String token); /** * 查询个人信息接口 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java index bf38da5..dd918e5 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CompanyServiceImpl.java @@ -25,7 +25,7 @@ public class CompanyServiceImpl implements CompanyService { //企业信息-企业注册 @Override - public Result addCompany(String token, CarrentCompany carrentCompany) { + public Result addAuthenticationCompany(String token, CarrentCompany carrentCompany) { String message = "企业实名注册操作失败"; //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); @@ -57,4 +57,22 @@ public class CompanyServiceImpl implements CompanyService { return Result.error(message); } } + + //我的服务-查询企业实名认证信息 + @Override + public Result queryAuthenticationCompany(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + try{ + CarrentCompany one = carrentCompanyService.lambdaQuery() + .eq(CarrentCompany::getUserId, hanHaiMember.getId()) + .one(); + return Result.OK("企业实名认证信息", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("企业实名认证信息查询失败"); + } + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java index cfb08db..65c42af 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java @@ -40,7 +40,7 @@ public class UserServiceImpl implements UserService { /*************************************************************************************/ //用户信息-个人注册 @Override - public Result addUser(String token, CarrentUser carrentUser) { + public Result addAuthenticationPerson(String token, CarrentUser carrentUser) { //返回信息 String message = "个人注册失败！"; //权限验证 @@ -85,6 +85,25 @@ public class UserServiceImpl implements UserService { } + + //我的服务-查询个人实名认证信息 + @Override + public Result queryAuthenticationPerson(String token) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + try{ + CarrentUser one = carrentUserService.lambdaQuery() + .eq(CarrentUser::getUserId, hanHaiMember.getId()) + .one(); + return Result.OK("个人实名认证信息", one); + }catch (Exception e){ + e.printStackTrace(); + return Result.OK("个人实名认证信息查询失败"); + } + } + + + /******************************************************************************************************************/ //查询个人信息 @Override 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 40d5fbc..71d2027 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -191,12 +191,19 @@ jeecg : shiro: excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 +# oss: +# accessKey: LTAI5tPfZo39q2r9Sr5mW84u +# secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r +# endpoint: oss-cn-guangzhou.aliyuncs.com +# bucketName: augcl +# staticDomain: https://img.augcl.com + oss: - accessKey: LTAI5tPfZo39q2r9Sr5mW84u - secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r - endpoint: oss-cn-guangzhou.aliyuncs.com - bucketName: augcl - staticDomain: https://img.augcl.com + accessKey: LTAI5tQSs47izVy8DLVdwUU9 + secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq + endpoint: oss-cn-shenzhen.aliyuncs.com + bucketName: hanhaiimage + staticDomain: https://image.hhlm1688.com/ # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES