Skip to content

P
peizhen-java
Commit a6969eb5 by sdif
Options

Merge remote-tracking branch 'origin/dev' into dev

parents b1d8208d 29c4fe4f
Showing with 176 additions and 65 deletions
pz-admin/src/main/java/com/pz/web/controller/system/SysUserController.java
......@@ -162,6 +162,7 @@ public class SysUserController extends BaseController {
} else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
}
user.setPassword(BCrypt.hashpw(user.getPassword()));
return toAjax(userService.updateUser(user));
}
......
pz-common/src/main/java/com/pz/common/core/domain/entity/SysUser.java
......@@ -91,7 +91,6 @@ public class SysUser extends BaseEntity {
* 用户头像
*/
private String avatar;
/**
* 密码
*/
......@@ -164,6 +163,9 @@ public class SysUser extends BaseEntity {
@TableField(exist = false)
private Long roleId;
@TableField(exist = false)
private String roleName;
public SysUser(Long userId) {
this.userId = userId;
}
......
pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java
......@@ -253,6 +253,8 @@ public class CompanyServiceImpl implements ICompanyService {
wrapper.set(Company::getBalance, balance)
.set(Company::getFreezeBalance, freeze)
.eq(Company::getId, company.getId());
return baseMapper.update(null, wrapper) > 0;
// 目前不满足资质，拒绝提现操作
throw new UnsupportedOperationException("资质不足，无法提现");
// return baseMapper.update(null, wrapper) > 0;
}
}
pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java
......@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pz.common.core.domain.R;
import com.pz.common.core.domain.entity.SysUser;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
......@@ -13,6 +14,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.common.enums.UserType;
import com.pz.common.exception.ServiceException;
import com.pz.common.utils.StringUtils;
import com.pz.common.utils.redis.RedisUtils;
import com.pz.merchant.domain.Company;
import com.pz.merchant.domain.bo.EmployeesListBo;
import com.pz.merchant.domain.bo.OrderBo;
......@@ -101,6 +103,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
public TableDataInfo<EmployeesListVo> employeesList(EmployeesListBo bo, PageQuery pageQuery) {
QueryWrapper<Employees> wrapper = Wrappers.query();
wrapper.like(StringUtils.isNotEmpty(bo.getEmployeeName()), "employees.name", bo.getEmployeeName())
.eq(bo.getCompanyId() != null, "employees.company_id", bo.getCompanyId())
.eq(bo.getEmployeeType() != null, "employees.now_type", bo.getEmployeeType());
IPage<EmployeesListVo> result = baseMapper.selectEmployeesList(pageQuery.build(), wrapper);
return TableDataInfo.build(result);
......@@ -148,7 +151,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
*/
SysUser sysUser = new SysUser();
sysUser.setUserId(bo.getUid().longValue());
//sysUser.setPhonenumber(bo.getPhone());
// sysUser.setPhonenumber(bo.getPhone());
if (bo.getIdentity() == 2) {
Employees add = BeanUtil.toBean(bo, Employees.class);
add.setNowType(1);
......@@ -283,21 +286,26 @@ public class EmployeesServiceImpl implements IEmployeesService {
*/
@Override
public boolean disableOrRecover(Integer emId) {
EmployeesVo employeesVo = baseMapper.selectVoById(emId);
Objects.requireNonNull(employeesVo, "查无此人");
Integer status = employeesVo.getStatus();
Employees employees = baseMapper.selectById(emId);
Objects.requireNonNull(employees, "查无此人");
Integer status = employees.getStatus();
if (status == 0) {
throw new ServiceException("该用户待审核通过，暂无法修改状态");
}
Integer modifyStatus = status == 1 ? 2 : 1;
employeesVo.setStatus(modifyStatus);
return baseMapper.updateById(BeanUtil.toBean(employeesVo, Employees.class)) > 0;
int modifyStatus = status == 1 ? 2 : 1;
// 若切换状态为1(正常),则需清除账户的取消订单次数
if (modifyStatus == 1) {
RedisUtils.delCacheMapValue(ISonOrderService.ORDER_CANCEL_CACHE_PREFIX, String.valueOf(emId));
employees.setKillOrder(0);
}
employees.setStatus(modifyStatus);
return baseMapper.updateById(employees) > 0;
}
@Override
public EmployeesVo queryByUserId(Long userId) {
EmployeesVo employeesVo = baseMapper.selectVoOne(Wrappers.<Employees>lambdaQuery().eq(Employees::getUid, userId));
//获取所属商户
// 获取所属商户
Optional.ofNullable(companyMapper.selectVoById(employeesVo.getCompanyId()))
.ifPresent(companyVo -> employeesVo.setCompanyName(companyVo.getName()));
......@@ -319,7 +327,8 @@ public class EmployeesServiceImpl implements IEmployeesService {
wrapper.set(Employees::getBalance, balance)
.set(Employees::getFreezeBalance, freeze)
.eq(Employees::getId, employees.getId());
return baseMapper.update(null, wrapper) > 0;
throw new UnsupportedOperationException("资质不足，无法提现");
// return baseMapper.update(null, wrapper) > 0;
}
/**
......
pz-system/src/main/java/com/pz/system/domain/vo/AccompanyDemandVo.java
package com.pz.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.util.Date;
......@@ -60,6 +59,11 @@ public class AccompanyDemandVo {
private String description;
/**
* 主订单状态
*/
private Integer orderStatus;
/**
* 服务状态，0：已发布，1：已接单，2：已完成，3：退款中 ，4：已退款,6：进行中
*/
private Integer sonOrderStatus;
......
pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderVo.java
......@@ -135,4 +135,8 @@ public class DbghOrderVo {
private Integer tStatus;
private Date createTime;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderVo.java
......@@ -173,4 +173,9 @@ public class DbmyOrderVo {
*/
@ExcelProperty(value = "订单状态")
private Integer tStatus;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderVo.java
......@@ -165,4 +165,9 @@ public class DbwzOrderVo {
*/
@ExcelProperty(value = "订单状态")
private Integer tStatus;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/domain/vo/ZqghOrderVo.java
......@@ -141,4 +141,6 @@ public class ZqghOrderVo {
* 预约数量
*/
private Integer num;
private String serviceName;
}
pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderVo.java
......@@ -148,4 +148,8 @@ public class ZyphOrderVo {
private UserVsitorVo userVsitorVo;
private Date createTime;
private String isSatisfaction;
private String evaluationContent;
}
pz-system/src/main/java/com/pz/system/service/impl/DbghOrderServiceImpl.java
......@@ -202,8 +202,8 @@ public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService
// 若设置了就诊时间，在取消订单时需要检查是否在18小时之前
// 取消次数
Integer cancel = RedisUtils.<Integer>getCacheMapValue(ISonOrderService.ORDER_CANCEL_CACHE_PREFIX, String.valueOf(emId));
if (dbghOrder.getOverTime() != null) {
LocalDateTime visitTime = LocalDateTime.ofInstant(dbghOrder.getOverTime().toInstant(), ZoneId.systemDefault());
if (dbghOrder.getVisitTime() != null) {
LocalDateTime visitTime = LocalDateTime.ofInstant(dbghOrder.getVisitTime().toInstant(), ZoneId.systemDefault());
LocalDateTime currentDate = LocalDateTime.ofInstant(new Date().toInstant(), ZoneId.systemDefault());
// 若缓存为空，则查询数据表
if (cancel == null) {
......
pz-system/src/main/java/com/pz/system/service/impl/DbmyOrderServiceImpl.java
......@@ -272,6 +272,7 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService
Objects.requireNonNull(totalOrder, "主订单不存在");
if (totalOrder.getStatus() != 1 || totalOrder.getEmId() == 0) { // 用户已付款
throw new ServiceException("主订单不符合开始服务要求");
}
DbmyOrder suborder = baseMapper.selectOne(Wrappers.<DbmyOrder>lambdaQuery().eq(DbmyOrder::getOrderId, totalOrder.getId()));
Objects.requireNonNull(suborder, "子订单不存在");
......
pz-system/src/main/java/com/pz/system/service/impl/DbwzOrderServiceImpl.java
......@@ -229,13 +229,13 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService
if (employeesMapper.update(null,
Wrappers.<Employees>lambdaUpdate()
.set(Employees::getStatus, 2)
.set(Employees::getKillOrder, cancel)
// .set(Employees::getKillOrder, cancel)
.eq(Employees::getId, emId)) < 0) {
throw new ServiceException("用户冻结失败");
}
}
if (cancel != null) {
RedisUtils.setCacheMapValue(ISonOrderService.ORDER_CANCEL_CACHE_PREFIX, String.valueOf(emId), cancel);
// RedisUtils.setCacheMapValue(ISonOrderService.ORDER_CANCEL_CACHE_PREFIX, String.valueOf(emId), cancel);
}
return true;
}
......
pz-system/src/main/java/com/pz/system/service/impl/StoreApplyServiceImpl.java
......@@ -3,6 +3,7 @@ package com.pz.system.service.impl;
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.pz.common.core.domain.entity.SysRole;
import com.pz.common.core.domain.entity.SysUser;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
......@@ -12,8 +13,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.common.enums.UserType;
import com.pz.common.helper.LoginHelper;
import com.pz.system.domain.StoreInfo;
import com.pz.system.domain.SysUserRole;
import com.pz.system.mapper.StoreInfoMapper;
import com.pz.system.mapper.SysUserMapper;
import com.pz.system.mapper.SysUserRoleMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.StoreApplyBo;
......@@ -45,6 +48,8 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
private final StoreInfoMapper storeInfoMapper;
private final SysUserRoleMapper sysUserRoleMapper;
/**
* 查询商城商户申请
*/
......@@ -55,7 +60,7 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
@Override
public StoreApplyVo queryByUserId() {
return baseMapper.selectVoOne(new LambdaQueryWrapper<StoreApply>().eq(StoreApply::getUid,LoginHelper.getLoginUser().getUserId()));
return baseMapper.selectVoOne(new LambdaQueryWrapper<StoreApply>().eq(StoreApply::getUid, LoginHelper.getLoginUser().getUserId()));
}
/**
......@@ -146,6 +151,11 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
sysUser.setPassword(BCrypt.hashpw("123456"));
sysUserMapper.insert(sysUser);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setUserId(sysUser.getUserId());
sysUserRole.setRoleId(3L);
sysUserRoleMapper.insert(sysUserRole);
});
}
return baseMapper.updateById(update) > 0;
......
pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.common.constant.CacheNames;
......@@ -42,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/**
* 用户 业务层处理
......@@ -65,6 +67,19 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override
public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
Optional.ofNullable(page.getRecords()).ifPresent(
sysUsers -> {
sysUsers.forEach(sysUser -> {
Optional.ofNullable(userRoleMapper.selectOne(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, sysUser.getUserId())))
.ifPresent(sysUserRole -> {
Optional.ofNullable(roleMapper.selectById(sysUserRole.getRoleId()))
.ifPresent(sysRole -> {
sysUser.setRoleName(sysRole.getRoleName());
});
});
});
}
);
return TableDataInfo.build(page);
}
......@@ -311,14 +326,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Transactional(rollbackFor = Exception.class)
public int updateUser(SysUser user) {
Long userId = user.getUserId();
/*// 删除用户与角色关联
// 删除用户与角色关联
userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
// 新增用户与角色管理
insertUserRole(user);
// 删除用户与岗位关联
userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
// 新增用户与岗位管理
insertUserPost(user);*/
// // 删除用户与岗位关联
// userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
// // 新增用户与岗位管理
// insertUserPost(user);
return baseMapper.updateById(user);
}
......@@ -492,17 +507,17 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
public UserIdentityVo checkUserIdentity(Integer userId) {
UserIdentityVo userIdentityVo = new UserIdentityVo();
SysUser sysUser = baseMapper.selectById(userId);
if(null == sysUser){
if (null == sysUser) {
return userIdentityVo;
}
if(sysUser.getUserType().equals(UserType.SYS_USER.getUserType())){
if (sysUser.getUserType().equals(UserType.SYS_USER.getUserType())) {
userIdentityVo.setUserType(1);
}else if(sysUser.getUserType().equals(UserType.APP_USER.getUserType())){
} else if (sysUser.getUserType().equals(UserType.APP_USER.getUserType())) {
Employees employees = employeesMapper.selectOne(new LambdaQueryWrapper<Employees>().eq(Employees::getUid, sysUser.getUserId()));
userIdentityVo.setUserType(2);
userIdentityVo.setEmCmId(employees.getId());
userIdentityVo.setEmCmStatus(employees.getStatus());
}else if(sysUser.getUserType().equals(UserType.AMERCHANT_USER.getUserType())){
} else if (sysUser.getUserType().equals(UserType.AMERCHANT_USER.getUserType())) {
Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, sysUser.getUserId()));
userIdentityVo.setUserType(3);
userIdentityVo.setEmCmId(company.getId());
......
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
......@@ -270,7 +270,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
totalOrderVo.setStoreGoodsVo(storeGoods);
UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
totalOrderVo.setUserAddressVo(userAddressVo);
if(StringUtils.isNotEmpty(storeOrder.getLogisticsCode())){
if (StringUtils.isNotEmpty(storeOrder.getLogisticsCode())) {
TotalOrderBo totalOrderBo = new TotalOrderBo();
totalOrderBo.setId(totalOrderVo.getId());
totalOrderBo.setPhone(userAddressVo.getPhone());
......@@ -921,9 +921,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
// 筛选未分配订单
wrapper.eq("total_order.em_id", emId) // 未分配陪诊员订单
.eq("total_order.status", 2) // 订单已完成
.ne("total_order.is_satisfaction", 0)
.between("total_order.business_id", 1, 5)
.orderByDesc("total_order.id");
;
IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
// 装载子订单信息
result.getRecords().forEach(order -> {
......
pz-system/src/main/resources/mapper/merchant/CompanyMapper.xml
......@@ -45,20 +45,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectAllOrder" resultType="com.pz.merchant.domain.vo.FinanceOrderInfoVo">
select total_order.id as orderId,
total_order.status as orderStatus,
business.name as project,
employees.name as emName,
services.cover,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission,
services.bid
select total_order.id as orderId,
total_order.status as orderStatus,
business.name as businessName,
services.name as project,
employees.name as emName,
services.cover,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission,
services.bid as businessId
from total_order
left join business on total_order.business_id = business.id
left join employees on employees.id = total_order.em_id
left join services on total_order.service_id = services.id
left join business on total_order.business_id = business.id
left join employees on employees.id = total_order.em_id
left join services on total_order.service_id = services.id
<where>
and total_order.business_id != 0
and total_order.business_id != 0
<if test="ew.emptyOfWhere == false">
and ${ew.sqlSegment}
</if>
......
pz-system/src/main/resources/mapper/system/SysUserMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pz.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
......@@ -81,43 +81,87 @@
r.data_scope,
r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
</sql>
<select id="selectPageUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
select u.user_id,
u.dept_id,
u.nick_name,
u.user_name,
u.email,
u.avatar,
u.phonenumber,
u.sex,
u.status,
u.del_flag,
u.login_ip,
u.login_date,
u.create_by,
u.create_time,
u.remark,
d.dept_name,
d.leader
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
select u.user_id,
u.dept_id,
u.nick_name,
u.user_name,
u.email,
u.avatar,
u.phonenumber,
u.sex,
u.status,
u.del_flag,
u.login_ip,
u.login_date,
u.create_by,
u.create_time,
u.remark,
d.dept_name,
d.leader
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
${ew.getCustomSqlSegment}
</select>
<select id="selectAllocatedList" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id,
u.dept_id,
u.user_name,
u.nick_name,
u.email,
u.phonenumber,
u.status,
u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUnallocatedList" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id,
u.dept_id,
u.user_name,
u.nick_name,
u.email,
u.phonenumber,
u.status,
u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role sur on u.user_id = sur.user_id
left join sys_role r on r.role_id = sur.role_id
${ew.getCustomSqlSegment}
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
......
pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml
......@@ -14,7 +14,8 @@
total_order.remark as description,
total_order.evaluation_content,
total_order.is_satisfaction as evaluation_flag,
total_order.uid as uid
total_order.uid as uid,
total_order.status as orderStatus
from total_order
left join services on total_order.service_id = services.id
left join business on total_order.business_id = business.id
......
pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml
......@@ -40,7 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tlo.evaluation_content AS evaluationContent,
yyod.over_time AS overtime,
yyod.voucher AS voucher,
yyod.create_time as createTime
yyod.create_time as createTime,
yyod.visitor as visitor
FROM yypz_order AS yyod
LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
LEFT JOIN city AS c ON c.id = tlo.city_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment