From 2bf46d2387bd58849f2a40e375280051c4d858d0 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Thu, 19 Sep 2024 17:13:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E7=BC=96=E7=A0=81=E3=80=81?= =?UTF-8?q?=E5=9F=8E=E5=B8=82=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppController.java | 47 +++++++-- .../controller/app/AppVerifyController.java | 46 +++++++++ .../controller/rl/RlCityCodeController.java | 98 +++++++++++++++++++ .../src/main/resources/application.yml | 8 ++ .../common/core/domain/entity/RlUser.java | 11 +++ .../com/ruoyi/common/enums/BusinessType.java | 8 +- .../utils/verify/VerifyIdentityUtil.java | 48 +++++++++ .../common/utils/verify/vo/IDResponse.java | 43 ++++++++ .../com/ruoyi/system/domain/city/RlCity.java | 10 +- .../ruoyi/system/domain/city/RlCityVO.java | 4 + .../system/domain/citycode/RlCityCode.java | 24 +++++ .../domain/citycode/RlCityCodeQuery.java | 8 ++ .../system/domain/citycode/RlCityCodeVO.java | 7 ++ .../ruoyi/system/domain/model/RlModel.java | 6 ++ .../domain/query/AuthenticationQuery.java | 23 +++++ .../com/ruoyi/system/domain/store/Store.java | 6 ++ .../ruoyi/system/domain/store/StoreVo.java | 5 +- .../ruoyi/system/mapper/RlCityCodeMapper.java | 62 ++++++++++++ .../com/ruoyi/system/mapper/RlCityMapper.java | 8 ++ .../com/ruoyi/system/mapper/StoreMapper.java | 2 +- .../system/service/IRlCityCodeService.java | 62 ++++++++++++ .../ruoyi/system/service/IRlCityService.java | 11 ++- .../ruoyi/system/service/IRlModelService.java | 1 + .../ruoyi/system/service/IRlUserService.java | 11 ++- .../service/impl/RlCityCodeServiceImpl.java | 95 ++++++++++++++++++ .../service/impl/RlCityServiceImpl.java | 30 ++++-- .../service/impl/RlModelServiceImpl.java | 3 + .../service/impl/RlUserServiceImpl.java | 33 ++++--- .../system/service/store/RlStoreService.java | 13 +++ .../service/store/impl/StoreServiceImpl.java | 45 +++++++++ .../mapper/system/RlCityCodeMapper.xml | 58 +++++++++++ .../resources/mapper/system/RlCityMapper.xml | 35 ++++--- .../resources/mapper/system/RlModelMapper.xml | 20 +++- .../resources/mapper/system/StoreMapper.xml | 12 +++ .../mapper/system/SysConfigMapper.xml | 33 ++++--- 35 files changed, 858 insertions(+), 78 deletions(-) create mode 100644 ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java create mode 100644 ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlCityCodeController.java create mode 100644 ridelease-common/src/main/java/com/ruoyi/common/utils/verify/VerifyIdentityUtil.java create mode 100644 ridelease-common/src/main/java/com/ruoyi/common/utils/verify/vo/IDResponse.java create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCode.java create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeQuery.java create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeVO.java create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/domain/query/AuthenticationQuery.java create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityCodeMapper.java create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityCodeService.java create mode 100644 ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityCodeServiceImpl.java create mode 100644 ridelease-system/src/main/resources/mapper/system/RlCityCodeMapper.xml diff --git a/ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index bbad3da..026db93 100644 --- a/ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -1,11 +1,10 @@ package com.ruoyi.web.controller.app; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.JSON; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.RlUser; import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.model.RlModel; import com.ruoyi.system.domain.agent.RlAgent; import com.ruoyi.system.domain.city.RlCity; import com.ruoyi.system.domain.city.RlCityQuery; @@ -17,6 +16,7 @@ import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.store.RlStoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -43,7 +43,7 @@ public class AppController extends BaseController private IRlAgentService rlAgentService; @Autowired - private IRlModelService eModelService; + private IRlModelService modelService; @Autowired private RlStoreService storeService; @@ -60,13 +60,13 @@ public class AppController extends BaseController } /** - * 获取出租周期列表 + * 获取字典类型列表 */ - @GetMapping("/getRentalPeriod") - public AjaxResult cityList() + @GetMapping("/getDictData") + public AjaxResult cityList(String dictType) { SysDictData sysDictData = new SysDictData(); - sysDictData.setDictType("rl_rental_period"); + sysDictData.setDictType(dictType); List list = dictDataService.selectDictDataList(sysDictData); return success(list); } @@ -91,7 +91,7 @@ public class AppController extends BaseController logger.info("根据城市id获取车型列表：【cityId="+cityId+"】"); RlAgent rlAgent = rlAgentService.selectRlAgentByCityId(cityId); if(rlAgent!=null){ - return success(eModelService.selectEModelListByAgentId(rlAgent.getAgentId())); + return success(modelService.selectEModelListByAgentId(rlAgent.getAgentId())); } return error("代理商不存在"); } @@ -104,7 +104,7 @@ public class AppController extends BaseController { logger.info("根据定位获取哪个城市：【lon="+lon+",lat="+lat+"】"); AjaxResult ajax = AjaxResult.success(); - String city = rlCityService.getCityByLocation(lon,lat); + RlCity city = rlCityService.getCityByLocation(lon, lat); ajax.put(AjaxResult.DATA_TAG, city); return ajax; } @@ -147,7 +147,34 @@ public class AppController extends BaseController return success(storeService.selectSmStoreList(storeQuery)); } + /** + * 根据车型id获取详情 + */ + @GetMapping("/getModelById") + public AjaxResult getModelById(Long modelId) + { + logger.info("根据车型id获取详情：【modelId="+modelId+"】"); + if(modelId==null){ + return error("车型id[modelId]未传"); + } + return success(modelService.selectEModelByModelId(modelId)); + } + /** + * 根据定位获取附近店铺列表 + */ + @GetMapping("/getStoreListByLocation") + public AjaxResult getStoreListByLocation(@RequestBody StoreQuery query) + { + logger.info("根据定位获取附近店铺列表：【StoreQuery="+ JSON.toJSONString(query)+"】"); + if(StrUtil.isBlank(query.getPhoneLon())){ + return error("经度[phoneLon]未传"); + } + if(StrUtil.isBlank(query.getPhoneLat())){ + return error("纬度[phoneLat]未传"); + } + return success(storeService.getStoreListByLocation(query)); + } diff --git a/ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java new file mode 100644 index 0000000..2c32b95 --- /dev/null +++ b/ridelease-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java @@ -0,0 +1,46 @@ +package com.ruoyi.web.controller.app; + +import com.alibaba.fastjson2.JSON; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.query.AuthenticationQuery; +import com.ruoyi.system.service.IRlUserService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * app接口（需要登录校验的） + * 校验 + * @author ruoyi + */ +@RestController +@RequestMapping("/appVerify") +public class AppVerifyController extends BaseController +{ + + @Resource + private IRlUserService rlUserService; + + /** + * 实名认证 + */ + @Log(title = "实名认证", businessType = BusinessType.AUTHENTICATION) + @GetMapping("/user/authentication") + public AjaxResult authentication(AuthenticationQuery authenticationQuery) + { + logger.info("【实名认证】请求参数：authenticationQuery={}", JSON.toJSON(authenticationQuery)); + Object authentication = rlUserService.authentication(authenticationQuery); + //判断o是否是字符串 + if(authentication instanceof String){ + return AjaxResult.error((String) authentication); + }else{ + return AjaxResult.success(authentication); + } + } + +} diff --git a/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlCityCodeController.java b/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlCityCodeController.java new file mode 100644 index 0000000..06c16f9 --- /dev/null +++ b/ridelease-admin/src/main/java/com/ruoyi/web/controller/rl/RlCityCodeController.java @@ -0,0 +1,98 @@ +package com.ruoyi.web.controller.rl; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.citycode.RlCityCode; +import com.ruoyi.system.service.IRlCityCodeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 城市区号Controller + * + * @author qzz + * @date 2024-09-19 + */ +@RestController +@RequestMapping("/system/code") +public class RlCityCodeController extends BaseController +{ + @Autowired + private IRlCityCodeService rlCityCodeService; + + /** + * 查询城市区号列表 + */ + @PreAuthorize("@ss.hasPermi('system:code:list')") + @GetMapping("/list") + public TableDataInfo list(RlCityCode rlCityCode) + { + startPage(); + List list = rlCityCodeService.selectRlCityCodeList(rlCityCode); + return getDataTable(list); + } + + /** + * 导出城市区号列表 + */ + @PreAuthorize("@ss.hasPermi('system:code:export')") + @Log(title = "城市区号", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RlCityCode rlCityCode) + { + List list = rlCityCodeService.selectRlCityCodeList(rlCityCode); + ExcelUtil util = new ExcelUtil(RlCityCode.class); + util.exportExcel(response, list, "城市区号数据"); + } + + /** + * 获取城市区号详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:code:query')") + @GetMapping(value = "/{code}") + public AjaxResult getInfo(@PathVariable("code") String code) + { + return success(rlCityCodeService.selectRlCityCodeByCode(code)); + } + + /** + * 新增城市区号 + */ + @PreAuthorize("@ss.hasPermi('system:code:add')") + @Log(title = "城市区号", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody RlCityCode rlCityCode) + { + return toAjax(rlCityCodeService.insertRlCityCode(rlCityCode)); + } + + /** + * 修改城市区号 + */ + @PreAuthorize("@ss.hasPermi('system:code:edit')") + @Log(title = "城市区号", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody RlCityCode rlCityCode) + { + return toAjax(rlCityCodeService.updateRlCityCode(rlCityCode)); + } + + /** + * 删除城市区号 + */ + @PreAuthorize("@ss.hasPermi('system:code:remove')") + @Log(title = "城市区号", businessType = BusinessType.DELETE) + @DeleteMapping("/{codes}") + public AjaxResult remove(@PathVariable Long[] codes) + { + return toAjax(rlCityCodeService.deleteRlCityCodeByCodeIds(codes)); + } +} diff --git a/ridelease-admin/src/main/resources/application.yml b/ridelease-admin/src/main/resources/application.yml index 47c70d1..957d955 100644 --- a/ridelease-admin/src/main/resources/application.yml +++ b/ridelease-admin/src/main/resources/application.yml @@ -187,3 +187,11 @@ geo: wx: appid: wx3428c498d5061192 appSecret: 398d2cd38583a33233eef897996cc7ca +et: + # 手续费 4/1000 千分之几 + handlingCharge: 5.4 + verifyUrl: https://zidv2.market.alicloudapi.com/idcheck/Post + appcode: 32b6c6445b1a42ed862dd4202392c47d + repairAdmin: wx + operateAdmin: root + diff --git a/ridelease-common/src/main/java/com/ruoyi/common/core/domain/entity/RlUser.java b/ridelease-common/src/main/java/com/ruoyi/common/core/domain/entity/RlUser.java index 831e518..1fb2ffd 100644 --- a/ridelease-common/src/main/java/com/ruoyi/common/core/domain/entity/RlUser.java +++ b/ridelease-common/src/main/java/com/ruoyi/common/core/domain/entity/RlUser.java @@ -104,6 +104,17 @@ public class RlUser extends BaseEntity /** 店铺id */ private Long storeId; + /** 是否认证：0-未认证；1-已认证 */ + public String isAuthentication; + + public String getIsAuthentication() { + return isAuthentication; + } + + public void setIsAuthentication(String isAuthentication) { + this.isAuthentication = isAuthentication; + } + public Long getStoreId() { return storeId; } diff --git a/ridelease-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/ridelease-common/src/main/java/com/ruoyi/common/enums/BusinessType.java index 2e17c4a..a806546 100644 --- a/ridelease-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/ridelease-common/src/main/java/com/ruoyi/common/enums/BusinessType.java @@ -2,7 +2,7 @@ package com.ruoyi.common.enums; /** * 业务操作类型 - * + * * @author ruoyi */ public enum BusinessType @@ -51,9 +51,13 @@ public enum BusinessType * 生成代码 */ GENCODE, - + /** * 清空数据 */ CLEAN, + /** + * 实名认证 + */ + AUTHENTICATION, } diff --git a/ridelease-common/src/main/java/com/ruoyi/common/utils/verify/VerifyIdentityUtil.java b/ridelease-common/src/main/java/com/ruoyi/common/utils/verify/VerifyIdentityUtil.java new file mode 100644 index 0000000..d35be2f --- /dev/null +++ b/ridelease-common/src/main/java/com/ruoyi/common/utils/verify/VerifyIdentityUtil.java @@ -0,0 +1,48 @@ +package com.ruoyi.common.utils.verify; + +import cn.hutool.http.HttpUtil; +import cn.hutool.http.Method; +import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.common.utils.verify.vo.IDResponse; +import lombok.extern.slf4j.Slf4j; + +import java.util.HashMap; +import java.util.Map; + +@Slf4j +public class VerifyIdentityUtil { + + /** + * 校验身份二要素是否一致 + * @param host 请求地址 + * @param appcode appcode + * @param idCard 身份证号 + * @param realName 姓名 + * @return Boolean + */ + public static Object verifyIdentity(String host,String appcode,String idCard,String realName){ + try { + Map headers = new HashMap<>(); + headers.put("Authorization", "APPCODE " + appcode); + //根据API的要求，定义相对应的Content-Type + headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8"); + Map bodys = new HashMap<>(); + bodys.put("cardNo", idCard); + bodys.put("realName", realName); + String result= HttpUtil.createRequest(Method.POST, host).addHeaders(headers).form(bodys).execute().body(); + log.info("实名认证请求返回==================="+result); + IDResponse idResponse = JSONObject.parseObject(result, IDResponse.class); + if("成功".equals(idResponse.getReason())){ + IDResponse.Result result1 = idResponse.getResult(); + return result1; + }else{ + return idResponse.getReason(); + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + +} diff --git a/ridelease-common/src/main/java/com/ruoyi/common/utils/verify/vo/IDResponse.java b/ridelease-common/src/main/java/com/ruoyi/common/utils/verify/vo/IDResponse.java new file mode 100644 index 0000000..a64de60 --- /dev/null +++ b/ridelease-common/src/main/java/com/ruoyi/common/utils/verify/vo/IDResponse.java @@ -0,0 +1,43 @@ +package com.ruoyi.common.utils.verify.vo; + +import lombok.Data; + +@Data +public class IDResponse { + + private int error_code; + + private String reason; + + private Result result; + + private String sn; + + @Data + public class Result { + private String realname; + + private String idcard; + + private Boolean isok; + + private IdCardInfor IdCardInfor; + + } + + @Data + public class IdCardInfor { + private String province; + + private String city; + + private String district; + + private String area; + + private String sex; + + private String birthday; + + } +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCity.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCity.java index 4fa8987..9b2e100 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCity.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCity.java @@ -28,8 +28,12 @@ public class RlCity extends BaseEntity @Excel(name = "拼音") private String pinyin; - /** 行政级别 */ - @Excel(name = "行政级别") - private String level; + /** 地址编码 */ + @Excel(name = "地址编码") + private String adcode; + + /** 城市编码 */ + @Excel(name = "城市编码") + private String citycode; } diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCityVO.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCityVO.java index 583c413..fa2cf27 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCityVO.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/city/RlCityVO.java @@ -1,5 +1,6 @@ package com.ruoyi.system.domain.city; +import com.ruoyi.common.annotation.Excel; import lombok.Data; /** @@ -12,4 +13,7 @@ import lombok.Data; public class RlCityVO extends RlCity { + @Excel(name = "城市名") + private String cityName; + } diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCode.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCode.java new file mode 100644 index 0000000..c4b7850 --- /dev/null +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCode.java @@ -0,0 +1,24 @@ +package com.ruoyi.system.domain.citycode; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 城市区号对象 rl_city_code + * + * @author qzz + * @date 2024-09-19 + */ +@Data +public class RlCityCode extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 编码id */ + private String code; + + /** 城市 */ + @Excel(name = "城市") + private String name; +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeQuery.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeQuery.java new file mode 100644 index 0000000..756eda3 --- /dev/null +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeQuery.java @@ -0,0 +1,8 @@ +package com.ruoyi.system.domain.citycode; + +import lombok.Data; + +@Data +public class RlCityCodeQuery extends RlCityCode{ + +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeVO.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeVO.java new file mode 100644 index 0000000..ce54c15 --- /dev/null +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/citycode/RlCityCodeVO.java @@ -0,0 +1,7 @@ +package com.ruoyi.system.domain.citycode; + +import lombok.Data; + +@Data +public class RlCityCodeVO extends RlCityCode{ +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/model/RlModel.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/model/RlModel.java index 3e04cf9..551c68f 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/domain/model/RlModel.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/model/RlModel.java @@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.BaseEntity; import lombok.Builder; import lombok.Data; +import java.math.BigDecimal; + /** * 车辆型号对象 et_model * @@ -44,4 +46,8 @@ public class RlModel extends BaseEntity @Excel(name = "简介") private String intro; + /** 押金 */ + @Excel(name = "押金") + private BigDecimal deposit; + } diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/query/AuthenticationQuery.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/query/AuthenticationQuery.java new file mode 100644 index 0000000..9d77e15 --- /dev/null +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/query/AuthenticationQuery.java @@ -0,0 +1,23 @@ +package com.ruoyi.system.domain.query; + + +import lombok.Data; + +/** + * 实名认证对象 + * + * @author 邱贞招 + * @date 2024-05-25 + */ +@Data +public class AuthenticationQuery { + + /** 真实姓名 */ + private String realName; + + /** 身份证 */ + private String idCard; + + /** 身份证 */ + private Long userId; +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/store/Store.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/store/Store.java index c7b9f98..bea337a 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/domain/store/Store.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/store/Store.java @@ -129,4 +129,10 @@ public class Store extends BaseEntity @ApiModelProperty("是否生效") private Boolean enabled; + + @ApiModelProperty("是否免费送取车") + private Boolean isFreeCar; + + @ApiModelProperty("门店客服电话") + private String serverPhone; } diff --git a/ridelease-system/src/main/java/com/ruoyi/system/domain/store/StoreVo.java b/ridelease-system/src/main/java/com/ruoyi/system/domain/store/StoreVo.java index c621c98..aadaf70 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/domain/store/StoreVo.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/domain/store/StoreVo.java @@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; - /** * @author 辉 * 2024/3/5 @@ -17,6 +15,9 @@ public class StoreVo extends Store { @ApiModelProperty("该店铺下的设备数量") private Integer deviceCount; + @ApiModelProperty("可租车辆") + private Integer rentalCar; + @ApiModelProperty("距离") private double distance; diff --git a/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityCodeMapper.java b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityCodeMapper.java new file mode 100644 index 0000000..9703bf8 --- /dev/null +++ b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityCodeMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.citycode.RlCityCode; + +import java.util.List; + +/** + * 城市区号Mapper接口 + * + * @author qzz + * @date 2024-09-19 + */ +public interface RlCityCodeMapper +{ + /** + * 查询城市区号 + * + * @param code 城市区号 + * @return 城市区号 + */ + public RlCityCode selectRlCityCodeByCode(String code); + + /** + * 查询城市区号列表 + * + * @param rlCityCode 城市区号 + * @return 城市区号集合 + */ + public List selectRlCityCodeList(RlCityCode rlCityCode); + + /** + * 新增城市区号 + * + * @param rlCityCode 城市区号 + * @return 结果 + */ + public int insertRlCityCode(RlCityCode rlCityCode); + + /** + * 修改城市区号 + * + * @param rlCityCode 城市区号 + * @return 结果 + */ + public int updateRlCityCode(RlCityCode rlCityCode); + + /** + * 删除城市区号 + * + * @param codeId 城市区号主键 + * @return 结果 + */ + public int deleteRlCityCodeByCodeId(Long codeId); + + /** + * 批量删除城市区号 + * + * @param codeIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRlCityCodeByCodeIds(Long[] codeIds); +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityMapper.java b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityMapper.java index b6774ba..52b6122 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityMapper.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/mapper/RlCityMapper.java @@ -59,4 +59,12 @@ public interface RlCityMapper * @return 结果 */ public int deleteRlCityByCityIds(Long[] cityIds); + + /** + * 根据地址编码查询城市 + * + * @param adcode 需要删除的数据主键集合 + * @return 结果 + */ + RlCity selectRlCityByAdcode(String adcode); } diff --git a/ridelease-system/src/main/java/com/ruoyi/system/mapper/StoreMapper.java b/ridelease-system/src/main/java/com/ruoyi/system/mapper/StoreMapper.java index 7927ba1..652dbf7 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/mapper/StoreMapper.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/mapper/StoreMapper.java @@ -30,7 +30,7 @@ public interface StoreMapper * @param store 商户 * @return 商户集合 */ - public List selectSmStoreList( @Param("query") StoreQuery store); + public List selectSmStoreList(@Param("query") StoreQuery store); /** * 新增商户 diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityCodeService.java b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityCodeService.java new file mode 100644 index 0000000..f53228b --- /dev/null +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityCodeService.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.service; + +import com.ruoyi.system.domain.citycode.RlCityCode; + +import java.util.List; + +/** + * 城市区号Service接口 + * + * @author qzz + * @date 2024-09-19 + */ +public interface IRlCityCodeService +{ + /** + * 查询城市区号 + * + * @param code 城市区号 + * @return 城市区号 + */ + public RlCityCode selectRlCityCodeByCode(String code); + + /** + * 查询城市区号列表 + * + * @param rlCityCode 城市区号 + * @return 城市区号集合 + */ + public List selectRlCityCodeList(RlCityCode rlCityCode); + + /** + * 新增城市区号 + * + * @param rlCityCode 城市区号 + * @return 结果 + */ + public int insertRlCityCode(RlCityCode rlCityCode); + + /** + * 修改城市区号 + * + * @param rlCityCode 城市区号 + * @return 结果 + */ + public int updateRlCityCode(RlCityCode rlCityCode); + + /** + * 批量删除城市区号 + * + * @param codeIds 需要删除的城市区号主键集合 + * @return 结果 + */ + public int deleteRlCityCodeByCodeIds(Long[] codeIds); + + /** + * 删除城市区号信息 + * + * @param codeId 城市区号主键 + * @return 结果 + */ + public int deleteRlCityCodeByCodeId(Long codeId); +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityService.java b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityService.java index 713c047..a1e1359 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityService.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlCityService.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service; import com.ruoyi.system.domain.city.RlCity; +import com.ruoyi.system.domain.citycode.RlCityCode; import java.util.List; @@ -20,6 +21,14 @@ public interface IRlCityService */ public RlCity selectRlCityByCityId(Long cityId); + /** + * 根据地址编码查询城市 + * + * @param adcode 地址编码 + * @return 城市 + */ + public RlCity selectRlCityByAdcode(String adcode); + /** * 查询城市列表 * @@ -63,7 +72,7 @@ public interface IRlCityService /** * 根据定位获取哪个城市 */ - String getCityByLocation(String lon, String lat); + RlCity getCityByLocation(String lon, String lat); /** * 根据定位获取地址 diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlModelService.java b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlModelService.java index 6c4fe6e..3a98b93 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlModelService.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlModelService.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service; import com.ruoyi.system.domain.model.RlModel; +import com.ruoyi.system.domain.store.StoreVo; import java.util.List; diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java index 6cfa5cf..8b746e9 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/IRlUserService.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service; import com.ruoyi.common.core.domain.entity.RlUser; +import com.ruoyi.system.domain.query.AuthenticationQuery; import java.util.List; @@ -219,11 +220,11 @@ public interface IRlUserService // */ // int bandSystemUser(EUser user); // -//// /** -//// * 实名认证 -//// * -//// */ -//// Object authentication(AuthenticationVo authenticationVo); + /** + * 实名认证 + * + */ + Object authentication(AuthenticationQuery authenticationQuery); // // /** // * 检测用户是否实名认证 diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityCodeServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityCodeServiceImpl.java new file mode 100644 index 0000000..35e6187 --- /dev/null +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityCodeServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.system.service.impl; + +import com.ruoyi.system.domain.citycode.RlCityCode; +import com.ruoyi.system.mapper.RlCityCodeMapper; +import com.ruoyi.system.service.IRlCityCodeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 城市区号Service业务层处理 + * + * @author qzz + * @date 2024-09-19 + */ +@Service +public class RlCityCodeServiceImpl implements IRlCityCodeService +{ + @Resource + private RlCityCodeMapper rlCityCodeMapper; + + /** + * 查询城市区号 + * + * @param code 城市区号 + * @return 城市区号 + */ + @Override + public RlCityCode selectRlCityCodeByCode(String code) + { + return rlCityCodeMapper.selectRlCityCodeByCode(code); + } + + + /** + * 查询城市区号列表 + * + * @param rlCityCode 城市区号 + * @return 城市区号 + */ + @Override + public List selectRlCityCodeList(RlCityCode rlCityCode) + { + return rlCityCodeMapper.selectRlCityCodeList(rlCityCode); + } + + /** + * 新增城市区号 + * + * @param rlCityCode 城市区号 + * @return 结果 + */ + @Override + public int insertRlCityCode(RlCityCode rlCityCode) + { + return rlCityCodeMapper.insertRlCityCode(rlCityCode); + } + + /** + * 修改城市区号 + * + * @param rlCityCode 城市区号 + * @return 结果 + */ + @Override + public int updateRlCityCode(RlCityCode rlCityCode) + { + return rlCityCodeMapper.updateRlCityCode(rlCityCode); + } + + /** + * 批量删除城市区号 + * + * @param codeIds 需要删除的城市区号主键 + * @return 结果 + */ + @Override + public int deleteRlCityCodeByCodeIds(Long[] codeIds) + { + return rlCityCodeMapper.deleteRlCityCodeByCodeIds(codeIds); + } + + /** + * 删除城市区号信息 + * + * @param codeId 城市区号主键 + * @return 结果 + */ + @Override + public int deleteRlCityCodeByCodeId(Long codeId) + { + return rlCityCodeMapper.deleteRlCityCodeByCodeId(codeId); + } +} diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityServiceImpl.java index f9ffe00..be383f6 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityServiceImpl.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlCityServiceImpl.java @@ -5,7 +5,9 @@ import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.city.RlCity; +import com.ruoyi.system.domain.citycode.RlCityCode; import com.ruoyi.system.mapper.RlCityMapper; +import com.ruoyi.system.service.IRlCityCodeService; import com.ruoyi.system.service.IRlCityService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +31,9 @@ public class RlCityServiceImpl implements IRlCityService @Resource private RlCityMapper rlCityMapper; + @Autowired + private IRlCityService cityService; + /** * 查询城市 * @@ -41,6 +46,19 @@ public class RlCityServiceImpl implements IRlCityService return rlCityMapper.selectRlCityByCityId(cityId); } + /** + * 根据地址编码查询城市 + * + * @param adcode 地址编码 + * @return 城市 + */ + @Override + public RlCity selectRlCityByAdcode(String adcode) + { + return rlCityMapper.selectRlCityByAdcode(adcode); + } + + /** * 查询城市列表 * @@ -105,24 +123,22 @@ public class RlCityServiceImpl implements IRlCityService * 根据定位获取哪个城市 */ @Override - public String getCityByLocation(String lon, String lat) { - String city = null; + public RlCity getCityByLocation(String lon, String lat) { try { String location = lon + "," + lat; String url = StrUtil.format("https://restapi.amap.com/v3/geocode/regeo?key={}&location={}&&radius=1000&extensions=all", GEO_WEB_KEY, location); String result = HttpUtils.sendGet(url); -// log.info("【根据定位获取地址】请求结果result:{}",result); //将json字符串转换为Object JSONObject jsonObject = JSONObject.parseObject(result,JSONObject.class); JSONObject regeocode1 = jsonObject.getJSONObject("regeocode"); JSONObject addressComponent = regeocode1.getJSONObject("addressComponent"); - city = addressComponent.getString("city"); -// log.info("【根据定位获取地址】address=:【{}】",result); - return city; + String adcode = addressComponent.getString("adcode"); + RlCity rlCity = cityService.selectRlCityByAdcode(adcode); + return rlCity; } catch (Exception e) { log.error("【根据定位获取地址】转换地址报错", e); } - return city; + return null; } /** diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlModelServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlModelServiceImpl.java index 041893c..0ca8921 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlModelServiceImpl.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlModelServiceImpl.java @@ -3,8 +3,10 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.map.GeoUtils; import com.ruoyi.system.domain.RlDevice; import com.ruoyi.system.domain.model.RlModel; +import com.ruoyi.system.domain.store.StoreVo; import com.ruoyi.system.mapper.RlModelMapper; import com.ruoyi.system.service.IRlDeviceService; import com.ruoyi.system.service.IRlModelService; @@ -16,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; /** * 车辆型号Service业务层处理 diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java index 7916e28..9284a6e 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/impl/RlUserServiceImpl.java @@ -3,10 +3,13 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.domain.entity.RlUser; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.verify.VerifyIdentityUtil; +import com.ruoyi.system.domain.query.AuthenticationQuery; import com.ruoyi.system.mapper.RlUserMapper; import com.ruoyi.system.service.IRlUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,11 +47,11 @@ public class RlUserServiceImpl implements IRlUserService{ // @Resource // private SysUserMapper userMapper; -// @Value("${et.verifyUrl}") -// private String verifyUrl; -// -// @Value("${et.appcode}") -// private String appcode; + @Value("${et.verifyUrl}") + private String verifyUrl; + + @Value("${et.appcode}") + private String appcode; /** * 根据条件分页查询用户列表 @@ -493,16 +496,16 @@ public class RlUserServiceImpl implements IRlUserService{ // return EUserMapper.updateUser(user); // } // -// /** -// * 实名认证 -// */ -// @Override -// public Object authentication(AuthenticationVo authenticationVo) { -// String idCard = authenticationVo.getIdCard(); -// String realName = authenticationVo.getRealName(); -// Object o = VerifyIdentityUtil.verifyIdentity(verifyUrl, appcode, idCard, realName); -// return o; -// } + /** + * 实名认证 + */ + @Override + public Object authentication(AuthenticationQuery authenticationQuery) { + String idCard = authenticationQuery.getIdCard(); + String realName = authenticationQuery.getRealName(); + Object o = VerifyIdentityUtil.verifyIdentity(verifyUrl, appcode, idCard, realName); + return o; + } // // /** // * 检测是否实名认证 diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/store/RlStoreService.java b/ridelease-system/src/main/java/com/ruoyi/system/service/store/RlStoreService.java index 422db0f..633f7a5 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/store/RlStoreService.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/store/RlStoreService.java @@ -34,6 +34,14 @@ public interface RlStoreService */ public List selectSmStoreList(StoreQuery store); + + /** + * 查询所有店铺列表 + * + * @return 商户集合 + */ + public List getAllStores(); + /** * 新增商户 * @@ -146,4 +154,9 @@ public interface RlStoreService * 条件更新 */ int updateByQuery(Store data, StoreQuery query); + + /** + * 根据定位获取附近店铺列表 + */ + List getStoreListByLocation(StoreQuery query); } diff --git a/ridelease-system/src/main/java/com/ruoyi/system/service/store/impl/StoreServiceImpl.java b/ridelease-system/src/main/java/com/ruoyi/system/service/store/impl/StoreServiceImpl.java index 7eb2a76..b1f404f 100644 --- a/ridelease-system/src/main/java/com/ruoyi/system/service/store/impl/StoreServiceImpl.java +++ b/ridelease-system/src/main/java/com/ruoyi/system/service/store/impl/StoreServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.common.utils.map.GeoUtils; import com.ruoyi.system.domain.store.*; import com.ruoyi.system.domain.store.enums.StoreGroupBy; import com.ruoyi.system.mapper.StoreMapper; +import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.store.RlStoreService; import com.ruoyi.system.service.store.StoreAssembler; import lombok.extern.slf4j.Slf4j; @@ -55,6 +56,9 @@ public class StoreServiceImpl implements RlStoreService // @Autowired // private StoreApplyConverter storeApplyConverter; + @Autowired + private ISysConfigService sysConfigService; + /** * 查询店铺 * @@ -91,6 +95,19 @@ public class StoreServiceImpl implements RlStoreService return storeVos; } + /** + * 查询所有店铺列表 + * + * @return 店铺 + */ + @Override + public List getAllStores() + { + StoreQuery query = new StoreQuery(); + return storeMapper.selectSmStoreList(query); + } + + /** * 新增店铺 * @@ -392,4 +409,32 @@ public class StoreServiceImpl implements RlStoreService return list.stream().collect(Collectors.toMap(keyMapper, StoreCountVO::getCount)); } + + /** + * 根据定位获取附近店铺列表 + */ + @Override + public List getStoreListByLocation(StoreQuery query) { + String nearby = sysConfigService.selectConfigByKey("nearby.store"); + double radiusInKm = Double.parseDouble(nearby); + // 根据定位获取附近方圆X公里的店铺列表 + double userLon = Double.parseDouble(query.getPhoneLon()); + double userLat = Double.parseDouble(query.getPhoneLat()); + // 获取所有店铺的列表 + List allStores = storeMapper.selectSmStoreList(query); + // 过滤出在方圆X公里内的店铺 + List nearbyStores = allStores.stream() + .filter(store -> { + double storeLon = store.getLng().doubleValue(); + double storeLat = store.getLat().doubleValue(); + double distance = GeoUtils.haversineDistance( + new double[]{userLon, userLat}, + new double[]{storeLon, storeLat} + ) / 1000; // 转换为公里 + return distance <= radiusInKm; + }) + .collect(Collectors.toList()); + return nearbyStores; + } + } diff --git a/ridelease-system/src/main/resources/mapper/system/RlCityCodeMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlCityCodeMapper.xml new file mode 100644 index 0000000..b773897 --- /dev/null +++ b/ridelease-system/src/main/resources/mapper/system/RlCityCodeMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + select code, name from rl_city_code + + + + + + + + insert into rl_city_code + + code, + name, + + + #{code}, + #{name}, + + + + + update rl_city_code + + name = #{name}, + + where code = #{code} + + + + delete from rl_city_code where code = #{code} + + + + delete from rl_city_code where code in + + #{code} + + + diff --git a/ridelease-system/src/main/resources/mapper/system/RlCityMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlCityMapper.xml index ebb8866..e672565 100644 --- a/ridelease-system/src/main/resources/mapper/system/RlCityMapper.xml +++ b/ridelease-system/src/main/resources/mapper/system/RlCityMapper.xml @@ -3,43 +3,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + - + + - select city_id, name, pinyin, level from rl_city + select c.city_id, c.name, c.pinyin, c.adcode, c.citycode, cc.name cityName from rl_city c + left join rl_city_code cc on c.citycode = cc.code - + + + insert into rl_city name, pinyin, - level, + adcode, + citycode, #{name}, #{pinyin}, - #{level}, + #{adcode}, + #{citycode}, @@ -48,7 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" name = #{name}, pinyin = #{pinyin}, - level = #{level}, + adcode = #{adcode}, + citycode = #{citycode}, where city_id = #{cityId} @@ -58,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from rl_city where city_id in + delete from rl_city where city_id in #{cityId} - \ No newline at end of file + diff --git a/ridelease-system/src/main/resources/mapper/system/RlModelMapper.xml b/ridelease-system/src/main/resources/mapper/system/RlModelMapper.xml index ff0212b..9a3a7de 100644 --- a/ridelease-system/src/main/resources/mapper/system/RlModelMapper.xml +++ b/ridelease-system/src/main/resources/mapper/system/RlModelMapper.xml @@ -15,16 +15,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select model_id, model, full_voltage, low_voltage, full_endurance, create_by, create_time, update_by, update_time, remark from rl_model + select model_id, model, full_voltage, low_voltage, full_endurance, create_by, create_time, update_by, update_time, remark, intro, agent_id, deposit from rl_model select m.model_id, m.model, m.full_voltage, m.low_voltage, m.full_endurance, m.create_by, m.create_time, - m.update_by, m.update_time, m.remark from rl_model m + m.update_by, m.update_time, m.remark, m.intro, m.agent_id, m.deposit from rl_model m where m.agent_id = #{agentId} @@ -62,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, + intro, + agent_id, + deposit, #{modelId}, @@ -74,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, + #{intro}, + #{agentId}, + #{deposit}, @@ -89,6 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + intro = #{intro}, + agent_id = #{agentId}, + deposit = #{deposit}, where model_id = #{modelId} diff --git a/ridelease-system/src/main/resources/mapper/system/StoreMapper.xml b/ridelease-system/src/main/resources/mapper/system/StoreMapper.xml index 016f4dd..01a3189 100644 --- a/ridelease-system/src/main/resources/mapper/system/StoreMapper.xml +++ b/ridelease-system/src/main/resources/mapper/system/StoreMapper.xml @@ -34,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ss.status, ss.enabled, ss.agent_id, + ss.is_free_car, + ss.server_phone, su.user_name as user_name from rl_store ss left join rl_user su on su.user_id = ss.user_id @@ -51,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and su.user_name like concat('%', #{query.userName}, '%') and ss.status = #{query.status} and ss.enabled = #{query.enabled} + and ss.is_free_car = #{query.isFreeCar} and ( ss.name like concat('%', #{query.keyword}, '%') @@ -158,6 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `show`, `status`, `enabled`, + agent_id, + is_free_car, + server_phone, #{name}, @@ -181,6 +187,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{show}, #{status}, #{enabled}, + #{agentId}, + #{isFreeCar}, + #{serverPhone}, @@ -213,6 +222,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `show` = #{data.show}, `status` = #{data.status}, `enabled` = #{data.enabled}, + agent_id = #{data.agentId}, + is_free_car = #{data.isFreeCar}, + server_phone = #{data.serverPhone}, diff --git a/ridelease-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ridelease-system/src/main/resources/mapper/system/SysConfigMapper.xml index a5ff114..d52b89c 100644 --- a/ridelease-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ridelease-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -15,12 +15,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark + select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark from sys_config - + @@ -32,12 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + - + - + - + insert into sys_config ( config_name, @@ -88,9 +89,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sysdate() ) - + - update sys_config + update sys_config config_name = #{configName}, config_key = #{configKey}, @@ -102,16 +103,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where config_id = #{configId} - + delete from sys_config where config_id = #{configId} - + - delete from sys_config where config_id in + delete from sys_config where config_id in #{configId} - - \ No newline at end of file + +