dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system

Browse Source
This commit is contained in:
PQZ 2024-09-20 16:24:25 +08:00
commit ca3e41a501
19 changed files with 164 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java
View File

@ -99,5 +99,11 @@ public class CustomerMain extends TenantBaseDO {
* 客户状态
*/
private String status;
/**
*
* 会员表id
*
*/
private String memberLevelId;
}

2
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CarMainRespVO.java
View File

@ -42,4 +42,6 @@ public class CarMainRespVO extends CarMain {
String bxCont;
/**车辆品牌型号数组*/
List<String> brandAndModel;
/** 车辆类型 */
private String brandType;
}

2
dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java
View File

@ -28,6 +28,8 @@ public class CustomerMainRespVO extends CustomerMain {
List<BusiLabel> labelList;
/**车辆品牌型号数组*/
List<String> brandAndModel;
/**会员名称 */
private String levelName;
/**是否车主（0否1是）*/
private String isOwner;

13
dl-module-base/src/main/java/cn/iocoder/yudao/module/member/controller/admin/MemberLevelController.java
View File

@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@ -114,6 +116,15 @@ public class MemberLevelController {
Page<MemberLevelRespVO> page = new Page<>(pageNo, pageSize);
return success(levelService.queryListPage(pageReqVO,page));
}
/**
* 获取全部会员
*
**/
@GetMapping("/all")
@Operation(summary = "获得全部会员")
@PreAuthorize("@ss.hasPermission('member:level:query')")
public CommonResult<List<MemberLevel>> getLevelAll(MemberLevelPageReqVO pageReqVO) {
return success(levelService.queryListAll(pageReqVO));
}
}

4
dl-module-base/src/main/java/cn/iocoder/yudao/module/member/entity/ActiveMain.java
View File

@ -61,5 +61,9 @@ public class ActiveMain extends TenantBaseDO {
private String isPack;
/**是否关联卡券*/
private String isCoupon;
/**
* 是否重复参与
*/
private String isParticipate;
}

9
dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/MemberLevelService.java
View File

@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* 会员等级 Service 接口
*
@ -54,4 +56,11 @@ public interface MemberLevelService extends IService<MemberLevel> {
**/
IPage<MemberLevelRespVO> queryListPage(MemberLevelPageReqVO pageReqVO, Page<MemberLevelRespVO> page);
/**
* 获取全部会员
*
**/
List<MemberLevel> queryListAll(MemberLevelPageReqVO pageReqVO);
}

11
dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/impl/MemberLevelServiceImpl.java
View File

@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.member.service.MemberLevelService;
import cn.iocoder.yudao.module.member.vo.MemberLevelPageReqVO;
import cn.iocoder.yudao.module.member.vo.MemberLevelRespVO;
import cn.iocoder.yudao.module.member.vo.MemberLevelSaveReqVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.List;
/**
* 会员等级 Service 实现类
@ -82,5 +84,14 @@ public class MemberLevelServiceImpl extends ServiceImpl<MemberLevelMapper, Membe
return levelMapper.selectListPage(pageReqVO,page);
}
@Override
public List<MemberLevel> queryListAll(MemberLevelPageReqVO pageReqVO) {
QueryWrapper<MemberLevel> q = new QueryWrapper<>();
q.eq("status","01");
List<MemberLevel> memberLevels = this.levelMapper.selectList(q);
return memberLevels;
}
}

1
dl-module-base/src/main/resources/mapper/custom/CarMainMapper.xml
View File

@ -117,6 +117,7 @@
bcm.phone_number AS phoneNumber,
bcb.brand_name AS brandStr,
bcmm.model_name AS modelStr,
bcb.brand_type AS brand_type,
DATEDIFF(tbcm.next_inspection_date, CURDATE()) AS njCont,
DATEDIFF(tbcm.next_maintenance_date, CURDATE()) AS byCont,
DATEDIFF(tbcm.insurance_expiry_date, CURDATE()) AS bxCont

4
dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
View File

@ -36,10 +36,12 @@
main.inviter AS inviter,
main.inviter_type AS inviterType,
main.status AS status,
group_concat(item.ser_content) AS serContents
group_concat(item.ser_content) AS serContents,
memberLevel.name AS levelName
FROM
base_customer_main main
LEFT JOIN base_customer_item item ON main.id = item.cus_id AND item.deleted = 0
LEFT JOIN dl_member_level memberLevel ON main.member_level_id = memberLevel.id
<where>
main.deleted = 0
<if test="entity.cusName != null and entity.cusName != ''">

1
dl-module-repair/src/main/java/cn/iocoder/yudao/common/RepairErrorCodeConstants.java
View File

@ -9,4 +9,5 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
**/
public interface RepairErrorCodeConstants {
ErrorCode GOODS_IS_EMPTY = new ErrorCode(500, "商品为空");
ErrorCode ITEM_IS_EMPTY = new ErrorCode(500, "工单内容");
}

21
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java
View File

@ -1,7 +1,12 @@
package cn.iocoder.yudao.module.tickets.controller.admin;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -13,12 +18,26 @@ import javax.annotation.Resource;
* @date 18:21 2024/9/13
**/
@RestController
@RequestMapping("dlRepairTickets")
@RequestMapping("/repair/tickets")
public class DlRepairTicketsController {
/**
* 服务对象
*/
@Resource
private DlRepairTicketsService dlRepairTicketsService;
/**
* 维修工单表 新增
*
* @author 小李
* @date 11:33 2024/9/20
* @param ticketsRespVO 新增对象
**/
@PostMapping("/create")
@Operation(summary = "维修工单表 新增")
public CommonResult<?> createTicket(@RequestBody DlRepairTicketsRespVO ticketsRespVO){
dlRepairTicketsService.createTickets(ticketsRespVO);
return CommonResult.ok();
}
}

2
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java
View File

@ -14,7 +14,7 @@ import javax.annotation.Resource;
* @date 18:21 2024/9/13
**/
@RestController
@RequestMapping("dlRepairTitem")
@RequestMapping("/repair/titem")
public class DlRepairTitemController {
/**
* 服务对象

17
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/entity/DlRepairTickets.java
View File

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 维修工单表
* @author 小李
@ -131,4 +133,19 @@ public class DlRepairTickets extends TenantBaseDO {
* 部门ID
*/
private Long deptId;
/** 工单子项的总数（每一个子项的数量） */
private Integer count;
/** 工单项目总价 */
private BigDecimal projectPrice;
/** 工单配件总价 */
private BigDecimal partPrice;
/** 工单其他总价 */
private BigDecimal otherPrice;
/** 工单总价 */
private BigDecimal totalPrice;
}

9
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.tickets.service;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@ -11,4 +12,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
**/
public interface DlRepairTicketsService extends IService<DlRepairTickets> {
/**
* 维修工单表 新增
*
* @author 小李
* @date 11:33 2024/9/20
* @param ticketsRespVO 新增对象
**/
void createTickets(DlRepairTicketsRespVO ticketsRespVO);
}

36
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
View File

@ -1,11 +1,22 @@
package cn.iocoder.yudao.module.tickets.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.common.RepairErrorCodeConstants;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import cn.iocoder.yudao.module.tickets.mapper.DlRepairTicketsMapper;
import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
import cn.iocoder.yudao.module.tickets.service.DlRepairTitemService;
import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
/**
* 针对表【dl_repair_tickets(维修工单表)】的数据库操作Service实现
*
@ -16,6 +27,31 @@ import org.springframework.stereotype.Service;
public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMapper, DlRepairTickets>
implements DlRepairTicketsService {
@Resource
private DlRepairTitemService titemService;
/**
* 维修工单表 新增
*
* @author 小李
* @date 11:33 2024/9/20
* @param ticketsRespVO 新增对象
**/
@Override
public void createTickets(DlRepairTicketsRespVO ticketsRespVO){
// 新增主表
baseMapper.insert(ticketsRespVO);
// 新增子表
if (CollectionUtil.isEmpty(ticketsRespVO.getItemList())){
throw exception(RepairErrorCodeConstants.ITEM_IS_EMPTY);
}
List<DlRepairTitem> itemList = ticketsRespVO.getItemList();
itemList.forEach(item -> {
item.setTichetId(ticketsRespVO.getId());
});
titemService.saveBatch(itemList);
}
}

6
dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlRepairTicketsRespVO.java
View File

@ -1,8 +1,11 @@
package cn.iocoder.yudao.module.tickets.vo;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTickets;
import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
import lombok.Data;
import java.util.List;
/**
* 维修工单表 响应VO
* @author 小李
@ -10,4 +13,7 @@ import lombok.Data;
**/
@Data
public class DlRepairTicketsRespVO extends DlRepairTickets {
/** 子表数组 */
private List<DlRepairTitem> itemList;
}

12
dl-module-repair/src/main/resources/mapper/tickets/DlRepairTicketsMapper.xml
View File

@ -28,6 +28,11 @@
<result property="ticketType" column="ticket_type" jdbcType="VARCHAR"/>
<result property="corpId" column="corp_id" jdbcType="VARCHAR"/>
<result property="deptId" column="dept_id" jdbcType="BIGINT"/>
<result property="count" column="count" />
<result property="projectPrice" column="project_price" />
<result property="partPrice" column="part_price" />
<result property="otherPrice" column="other_price" />
<result property="totalPrice" column="total_price" />
</resultMap>
<sql id="Base_SQL">
@ -53,7 +58,12 @@
remark,
ticket_type,
corp_id,
dept_id
dept_id,
count,
project_price,
part_price,
other_price,
total_price
from dl_repair_tickets drt
where drt.deleted = '0'
</sql>

21
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/SysLoginController.java
View File

@ -212,6 +212,10 @@ public class SysLoginController {
AuthLoginReqVO authLoginReqVO = new AuthLoginReqVO();
authLoginReqVO.setUsername(loginBody.getUsername());
authLoginReqVO.setPassword(loginBody.getPassword());
if(org.apache.commons.lang3.StringUtils.isEmpty(user.getMobile())){
// 借用此字段设置需要填写手机号标志 为1时弹出验证手机号页面
authLoginReqVO.setSocialState("1");
}
return success(loginService.login(authLoginReqVO));
}
@ -230,20 +234,16 @@ public class SysLoginController {
}
/**
* 汽修小程序注册方法
* 汽修小程序更新用户手机号方法
*
* @param registerVO 登录信息
* @return 结果
*/
@PostMapping("/registerQx")
@TenantIgnore
@PostMapping("/updateUserQx")
public CommonResult registerQx(@RequestBody RegisterVO registerVO){
if(org.apache.commons.lang3.StringUtils.isEmpty(registerVO.getPhone())){
return error(500,"手机号不能为空");
}
if(org.apache.commons.lang3.StringUtils.isEmpty(registerVO.getPassword())){
return error(500,"密码不能为空");
}
if(org.apache.commons.lang3.StringUtils.isEmpty(registerVO.getCode())){
return error(500,"验证码不能为空");
}
@ -253,12 +253,13 @@ public class SysLoginController {
}
redisCache2.deleteObject(registerVO.getPhone() + "-registerCode");
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
UserSaveReqVO userSaveReqVO = new UserSaveReqVO();
userSaveReqVO.setUsername(registerVO.getPhone());
userSaveReqVO.setPassword(passwordEncoder.encode(registerVO.getPassword()));
userSaveReqVO.setId(loginUser.getId());
userSaveReqVO.setMobile(registerVO.getPhone());
userService.createUser(userSaveReqVO);
return success("注册成功");
userService.updateUser(userSaveReqVO);
return success("成功");
}

2
yudao-server/src/main/resources/application.yaml
View File

@ -68,7 +68,7 @@ flowable:
mybatis-plus:
configuration:
map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config:
db-config:
id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。