Skip to content

P
peizhen-java
Commit 60f6be1b by Wangmin
Options

新增订单消息相关业务

parent b1b91cd0
Showing with 651 additions and 21 deletions
pz-admin/src/main/java/com/pz/web/controller/system/OrderMessageController.java 0 → 100644
package com.pz.web.controller.system;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.pz.common.annotation.RepeatSubmit;
import com.pz.common.annotation.Log;
import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R;
import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup;
import com.pz.common.enums.BusinessType;
import com.pz.common.utils.poi.ExcelUtil;
import com.pz.system.domain.vo.OrderMessageVo;
import com.pz.system.domain.bo.OrderMessageBo;
import com.pz.system.service.IOrderMessageService;
import com.pz.common.core.page.TableDataInfo;
/**
* 订单消息
*
* @author Wang Min
* @date 2023-10-09
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/message")
public class OrderMessageController extends BaseController {
private final IOrderMessageService iOrderMessageService;
/**
* 查询订单消息列表
*/
@SaCheckPermission("system:message:list")
@GetMapping("/list")
public TableDataInfo<OrderMessageVo> list(OrderMessageBo bo, PageQuery pageQuery) {
return iOrderMessageService.queryPageList(bo, pageQuery);
}
/**
* 导出订单消息列表
*/
@SaCheckPermission("system:message:export")
@Log(title = "订单消息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(OrderMessageBo bo, HttpServletResponse response) {
List<OrderMessageVo> list = iOrderMessageService.queryList(bo);
ExcelUtil.exportExcel(list, "订单消息", OrderMessageVo.class, response);
}
/**
* 获取订单消息详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:message:query")
@GetMapping("/{id}")
public R<OrderMessageVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iOrderMessageService.queryById(id));
}
/**
* 新增订单消息
*/
@SaCheckPermission("system:message:add")
@Log(title = "订单消息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderMessageBo bo) {
return toAjax(iOrderMessageService.insertByBo(bo));
}
/**
* 修改订单消息
*/
@SaCheckPermission("system:message:edit")
@Log(title = "订单消息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderMessageBo bo) {
return toAjax(iOrderMessageService.updateByBo(bo));
}
/**
* 删除订单消息
*
* @param ids 主键串
*/
@SaCheckPermission("system:message:remove")
@Log(title = "订单消息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iOrderMessageService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
pz-applet/src/main/java/com/pz/applet/AppletOrderMessageController.java 0 → 100644
package com.pz.applet;
import cn.dev33.satoken.annotation.SaIgnore;
import com.pz.applet.util.CityIdUtils;
import com.pz.common.core.domain.R;
import com.pz.system.domain.vo.AppletOrderMessageVo;
import com.pz.system.service.IOrderMessageService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 订单消息
* <p>created in 2023/10/9 10:23
*
* @author WangMin
* @version 1.0
*/
@RequiredArgsConstructor
@RestController
@RequestMapping("/applet/orderMessage")
@SaIgnore
public class AppletOrderMessageController {
private final IOrderMessageService iOrderMessageService;
/**
* 查询订单消息列表
*/
@GetMapping("/list")
public R<List<AppletOrderMessageVo>> list(HttpServletRequest request) {
Integer cityId = CityIdUtils.setCityIdPasInteger(request);
return R.ok(iOrderMessageService.messageList(cityId));
}
}
pz-system/src/main/java/com/pz/system/domain/OrderMessage.java 0 → 100644
package com.pz.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 订单消息对象 order_message
*
* @author Wang Min
* @date 2023-10-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("order_message")
public class OrderMessage extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 主订单Id
*/
private Long totalOrderId;
/**
* 城市
*/
private Integer cityId;
/**
* 购买用户
*/
private String userName;
/**
* 业务
*/
private String businessName;
/**
* 服务
*/
private String serviceName;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/bo/OrderMessageBo.java 0 → 100644
package com.pz.system.domain.bo;
import com.pz.common.core.domain.BaseEntity;
import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 订单消息业务对象 order_message
*
* @author Wang Min
* @date 2023-10-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class OrderMessageBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long id;
/**
* 主订单Id
*/
private Long totalOrderId;
/**
* 城市
*/
@NotNull(message = "城市不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer cityId;
/**
* 购买用户
*/
@NotBlank(message = "购买用户不能为空", groups = { AddGroup.class, EditGroup.class })
private String userName;
/**
* 业务
*/
@NotBlank(message = "业务不能为空", groups = { AddGroup.class, EditGroup.class })
private String businessName;
/**
* 服务
*/
@NotBlank(message = "服务不能为空", groups = { AddGroup.class, EditGroup.class })
private String serviceName;
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/vo/AppletOrderMessageVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
/**
* <p>created in 2023/10/9 10:52
*
* @author WangMin
* @version 1.0
*/
@Data
public class AppletOrderMessageVo {
/**
* 买家姓名
*/
private String userName;
/**
* 头像
*/
private String avatar;
}
pz-system/src/main/java/com/pz/system/domain/vo/OrderMessageVo.java 0 → 100644
package com.pz.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.pz.common.annotation.ExcelDictFormat;
import com.pz.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 订单消息视图对象 order_message
*
* @author Wang Min
* @date 2023-10-09
*/
@Data
@ExcelIgnoreUnannotated
public class OrderMessageVo {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 主订单Id
*/
@ExcelProperty(value = "主订单Id")
private Long totalOrderId;
/**
* 城市
*/
@ExcelProperty(value = "城市")
private Integer cityId;
/**
* 购买用户
*/
@ExcelProperty(value = "购买用户")
private String userName;
/**
* 业务
*/
@ExcelProperty(value = "业务")
private String businessName;
/**
* 服务
*/
@ExcelProperty(value = "服务")
private String serviceName;
/**
* 购买时间
*/
@ExcelProperty(value = "购买时间")
private Date createTime;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}
pz-system/src/main/java/com/pz/system/mapper/OrderMessageMapper.java 0 → 100644
package com.pz.system.mapper;
import com.pz.system.domain.OrderMessage;
import com.pz.system.domain.vo.AppletOrderMessageVo;
import com.pz.system.domain.vo.OrderMessageVo;
import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 订单消息Mapper接口
*
* @author Wang Min
* @date 2023-10-09
*/
@Mapper
public interface OrderMessageMapper extends BaseMapperPlus<OrderMessageMapper, OrderMessage, OrderMessageVo> {
/**
* 查询最近10条数据
*
* @param cityId 　城市ID
* @return 结果
*/
List<AppletOrderMessageVo> selectLastTenRecord(Integer cityId);
}
pz-system/src/main/java/com/pz/system/mapper/TotalOrderMapper.java
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.pz.merchant.domain.Company;
import com.pz.merchant.domain.vo.FinanceOrderInfoVo;
import com.pz.system.domain.OrderMessage;
import com.pz.system.domain.TotalOrder;
import com.pz.system.domain.vo.AccompanyDemandVo;
import com.pz.system.domain.vo.AppOrderVo;
......@@ -52,4 +53,11 @@ public interface TotalOrderMapper extends BaseMapperPlus<TotalOrderMapper, Total
IPage<TotalOrderVo> selectAppOrder(IPage<TotalOrderVo> page, @Param(Constants.WRAPPER) Wrapper<TotalOrder> queryWrapper);
TotalOrderVo selectByOrderId(@Param("id") Integer id);
/**
* 查询主订单相关数据转换为订单消息
* @param id 主订单ID
* @return 主订单数据转订单消息
*/
OrderMessage selectDataToMessageById(Long id);
}
pz-system/src/main/java/com/pz/system/service/IOrderMessageService.java 0 → 100644
package com.pz.system.service;
import com.pz.system.domain.OrderMessage;
import com.pz.system.domain.vo.AppletOrderMessageVo;
import com.pz.system.domain.vo.OrderMessageVo;
import com.pz.system.domain.bo.OrderMessageBo;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 订单消息Service接口
*
* @author Wang Min
* @date 2023-10-09
*/
public interface IOrderMessageService {
/**
* 查询订单消息
*/
OrderMessageVo queryById(Long id);
/**
* 查询订单消息列表
*/
TableDataInfo<OrderMessageVo> queryPageList(OrderMessageBo bo, PageQuery pageQuery);
/**
* 根据城市查询订单消息列表，只返回最近10条数据
*
* @param cityId 城市ID
* @return 消息结果
*/
List<AppletOrderMessageVo> messageList(Integer cityId);
/**
* 查询订单消息列表
*/
List<OrderMessageVo> queryList(OrderMessageBo bo);
/**
* 新增订单消息
*/
Boolean insertByBo(OrderMessageBo bo);
/**
* 修改订单消息
*/
Boolean updateByBo(OrderMessageBo bo);
/**
* 校验并批量删除订单消息信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}
pz-system/src/main/java/com/pz/system/service/impl/OrderMessageServiceImpl.java 0 → 100644
package com.pz.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.common.utils.StringUtils;
import com.pz.system.domain.vo.AppletOrderMessageVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.OrderMessageBo;
import com.pz.system.domain.vo.OrderMessageVo;
import com.pz.system.domain.OrderMessage;
import com.pz.system.mapper.OrderMessageMapper;
import com.pz.system.service.IOrderMessageService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 订单消息Service业务层处理
*
* @author Wang Min
* @date 2023-10-09
*/
@RequiredArgsConstructor
@Service
public class OrderMessageServiceImpl implements IOrderMessageService {
private final OrderMessageMapper baseMapper;
/**
* 查询订单消息
*/
@Override
public OrderMessageVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
/**
* 查询订单消息列表
*/
@Override
public TableDataInfo<OrderMessageVo> queryPageList(OrderMessageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<OrderMessage> lqw = buildQueryWrapper(bo);
Page<OrderMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 根据城市查询订单消息列表，只返回最近10条数据
*
* @param cityId 城市ID
* @return 消息结果
*/
@Override
public List<AppletOrderMessageVo> messageList(Integer cityId) {
return baseMapper.selectLastTenRecord(cityId);
}
/**
* 查询订单消息列表
*/
@Override
public List<OrderMessageVo> queryList(OrderMessageBo bo) {
LambdaQueryWrapper<OrderMessage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<OrderMessage> buildQueryWrapper(OrderMessageBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OrderMessage> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getUserName()), OrderMessage::getUserName, bo.getUserName());
lqw.like(StringUtils.isNotBlank(bo.getBusinessName()), OrderMessage::getBusinessName, bo.getBusinessName());
lqw.like(StringUtils.isNotBlank(bo.getServiceName()), OrderMessage::getServiceName, bo.getServiceName());
return lqw;
}
/**
* 新增订单消息
*/
@Override
public Boolean insertByBo(OrderMessageBo bo) {
OrderMessage add = BeanUtil.toBean(bo, OrderMessage.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改订单消息
*/
@Override
public Boolean updateByBo(OrderMessageBo bo) {
OrderMessage update = BeanUtil.toBean(bo, OrderMessage.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(OrderMessage entity) {
// TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除订单消息
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
// TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
......@@ -44,6 +44,7 @@ import com.pz.system.domain.vo.StoreGoodsVo;
import com.pz.system.domain.vo.TotalOrderVo;
import com.pz.system.domain.vo.UserAddressVo;
import com.pz.system.mapper.*;
import com.pz.system.service.IOrderMessageService;
import com.pz.system.service.IPayService;
import com.pz.system.service.ITotalOrderService;
import lombok.RequiredArgsConstructor;
......@@ -126,6 +127,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
private final CompanyMapper companyMapper;
private final OrderMessageMapper orderMessageMapper;
// 时间格式化
private static final DateTimeFormatter FORMATTER = new DateTimeFormatterBuilder()
.parseCaseInsensitive()
......@@ -170,9 +173,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
Optional.ofNullable(departmentMapper.selectById(yypzOrder.getDid()))
.map(Department::getTitle)
.ifPresent(totalOrderVo::setDepartment);
//totalOrderVo.setHospital(hospitalMapper.selectById(yypzOrder.getHid()).getName());
//totalOrderVo.setVisitor(userVsitorMapper.selectById(yypzOrder.getVisitor()).getName());
//totalOrderVo.setDepartment(departmentMapper.selectById(yypzOrder.getDid()).getTitle());
// totalOrderVo.setHospital(hospitalMapper.selectById(yypzOrder.getHid()).getName());
// totalOrderVo.setVisitor(userVsitorMapper.selectById(yypzOrder.getVisitor()).getName());
// totalOrderVo.setDepartment(departmentMapper.selectById(yypzOrder.getDid()).getTitle());
totalOrderVo.setPhone(yypzOrder.getPhone());
totalOrderVo.setVisitTime(yypzOrder.getVisitTime());
totalOrderVo.setOverTime(yypzOrder.getOverTime());
......@@ -318,7 +321,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
);
StoreGoodsVo storeGoods = storeGoodsMapper.selectVoById(storeOrder.getGoodsId());
if(null != storeGoods){
if (null != storeGoods) {
List<Integer> ids = JsonUtils.parseArray(storeGoods.getTags(), Integer.class);
List<StoreGoodsTag> storeGoodsTags = storeGoodsTagMapper.selectList(new LambdaQueryWrapper<StoreGoodsTag>().in(StoreGoodsTag::getId, ids).select(StoreGoodsTag::getTitle));
totalOrderVo.setTags(storeGoodsTags);
......@@ -330,12 +333,12 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
totalOrderVo.setGoodsId(storeGoods.getId());
}
UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
if(null != userAddressVo){
if (null != userAddressVo) {
totalOrderVo.setUserAddressVo(userAddressVo);
}
if (StringUtils.isNotEmpty(storeOrder.getLogisticsCode())) {
TotalOrderBo totalOrderBo = new TotalOrderBo();
if(null != userAddressVo){
if (null != userAddressVo) {
totalOrderBo.setPhone(userAddressVo.getPhone());
}
......@@ -423,7 +426,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
);
StoreGoods storeGoods = storeGoodsMapper.selectById(storeOrder.getGoodsId());
if(StringUtils.isNotEmpty(storeGoods.getTags())){
if (StringUtils.isNotEmpty(storeGoods.getTags())) {
List<Integer> ids = JsonUtils.parseArray(storeGoods.getTags(), Integer.class);
List<StoreGoodsTag> storeGoodsTags = storeGoodsTagMapper.selectList(new LambdaQueryWrapper<StoreGoodsTag>().in(StoreGoodsTag::getId, ids).select(StoreGoodsTag::getTitle));
totalOrderVo.setTags(storeGoodsTags);
......@@ -681,14 +684,15 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
double money = 0;
if(services.getFenmo() == 0){
if (services.getFenmo() == 0) {
money = totalOrder1.getPayMoney();
}else if(services.getFenmo() != 0){
} else if (services.getFenmo() != 0) {
double fenmo = (double) services.getFenmo() / 100;
double v = totalOrder1.getPayMoney() * fenmo;
money = totalOrder1.getPayMoney() - v;;
money = totalOrder1.getPayMoney() - v;
;
}
Employees employees = employeesMapper.selectById(totalOrder1.getEmId());
......@@ -723,7 +727,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
}
if(totalOrder1.getBusinessId() == 0 && totalOrder1.getStatus() == 1){
if (totalOrder1.getBusinessId() == 0 && totalOrder1.getStatus() == 1) {
ISonOrderService orderService = serviceBuilder.getSonOrderService(totalOrder1.getBusinessId());
// 修改子订单状态
......@@ -745,11 +749,11 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
orderRequest.setBody(bo.getOrderTitle());
orderRequest.setOutTradeNo(totalOrder.getOrderSn());
orderRequest.setTotalFee(money);// 元转成分
if(null != bo.getPaymentType()){
if(bo.getPaymentType() == 0){
if (null != bo.getPaymentType()) {
if (bo.getPaymentType() == 0) {
orderRequest.setOpenid(openId);
orderRequest.setTradeType("JSAPI");
}else if(bo.getPaymentType() == 1){
} else if (bo.getPaymentType() == 1) {
orderRequest.setTradeType("APP");
TotalOrder totalOrder1 = baseMapper.selectOne(new LambdaQueryWrapper<TotalOrder>().eq(TotalOrder::getOrderSn, totalOrder.getOrderSn()));
if (totalOrder1.getStatus() == 0) {
......@@ -767,7 +771,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
return true;
}
}
}else {
} else {
orderRequest.setOpenid(openId);
orderRequest.setTradeType("JSAPI");
}
......@@ -799,6 +803,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
paymentRecord.setMoney(totalOrder.getPayMoney());
paymentRecord.setUid(totalOrder.getUid());
paymentRecordMapper.insert(paymentRecord);
// 添加消息记录
OrderMessage orderMessage = baseMapper.selectDataToMessageById(totalOrder.getId());
Optional.ofNullable(orderMessage).ifPresent(orderMessageMapper::insert);
return true;
}
return false;
......@@ -833,7 +840,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
double money = 0;
if (services.getFenmo() == 0) {
money = totalOrder.getPayMoney();
}else if(services.getFenmo() != 0){
} else if (services.getFenmo() != 0) {
double fenmo = (double) services.getFenmo() / 100;
double v = totalOrder.getPayMoney() * fenmo;
......@@ -899,10 +906,10 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
// 订单退款金额
double money = 0;
if (null != bo.getIsPcRefund() && bo.getIsPcRefund() == 1){
if (null != bo.getIsPcRefund() && bo.getIsPcRefund() == 1) {
money = totalOrder.getRefundAmount();
//pc是否同意退款1-完成退款，2-取消退款
if(bo.getIsPcRefundStatus() == 1 ){
// pc是否同意退款1-完成退款，2-取消退款
if (bo.getIsPcRefundStatus() == 1) {
WxPayRefundRequest request = new WxPayRefundRequest();
request.setOutTradeNo(totalOrder.getOrderSn());
......@@ -918,9 +925,9 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
e.printStackTrace();
return false;
}
}else if(bo.getIsPcRefundStatus() == 2){
} else if (bo.getIsPcRefundStatus() == 2) {
//后台取消直接将订单完成
// 后台取消直接将订单完成
totalOrder.setStatus(TotalOrderStatus.DONE.getCode());
baseMapper.updateById(totalOrder);
......@@ -1348,6 +1355,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
System.out.println(money);
}
public int getIsRefund(int businessId, int businessStatus, int ServiceStatus) {
int IsRefund = 0;
if ((businessStatus == 1 && ServiceStatus == 0) || (businessStatus == 1 && ServiceStatus == 1)) {
......
pz-system/src/main/resources/mapper/system/OrderMessageMapper.xml 0 → 100644
<?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">
<mapper namespace="com.pz.system.mapper.OrderMessageMapper">
<resultMap type="com.pz.system.domain.OrderMessage" id="OrderMessageResult">
<result property="id" column="id"/>
<result property="totalOrderId" column="total_order_id"/>
<result property="cityId" column="city_id"/>
<result property="userName" column="user_name"/>
<result property="businessName" column="business_name"/>
<result property="serviceName" column="service_name"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<select id="selectLastTenRecord" resultType="com.pz.system.domain.vo.AppletOrderMessageVo">
select ifnull(order_message.user_name, '') as userName,
ifnull(user.avatar, '') as avatar
from order_message
join total_order on total_order.id = order_message.total_order_id
left join sys_user as user on user.user_id = total_order.uid
order by order_message.id desc
limit 10
</select>
</mapper>
pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml
......@@ -72,4 +72,17 @@
where t.id = #{id}
</select>
<select id="selectDataToMessageById" resultType="com.pz.system.domain.OrderMessage">
select total_order.id as totalOrderId,
total_order.city_id,
business.name as businessName,
services.name as serviceName,
sys_user.nick_name as userName
from total_order
left join business on total_order.business_id = business.id
left join services on total_order.service_id = services.id
left join sys_user on sys_user.user_id = total_order.uid
where total_order.id = #{id}
</select>
</mapper>
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