From 76699e910ca78a400c0bcdbaa7c175248f9589d0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 九月 2024 18:28:56 +0800
Subject: [PATCH] 修改接口
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java | 7 +--
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java | 7 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java | 6 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java | 45 ++++++++++++++++++++--
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 8 ++-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java | 11 ++++-
ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml | 7 ++-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java | 6 ++-
ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml | 4 +-
ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml | 4 +-
ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleExportExcel.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMealGoods.java | 3 +
ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml | 7 +++
16 files changed, 88 insertions(+), 32 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
index 809a87f..07630cd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
@@ -84,17 +84,17 @@
if(!goods.getGoodsName().equals(dto.getGoodsName())){
List<TOrderStockGoods> orderStockGoods = orderStockGoodsService.list(Wrappers.lambdaQuery(TOrderStockGoods.class)
.eq(TOrderStockGoods::getGoodsNum, goods.getGoodsNum()));
- orderStockGoods.stream().forEach(tOrderStockGoods -> tOrderStockGoods.setGoodsNum(dto.getGoodsNum()));
+ orderStockGoods.stream().forEach(tOrderStockGoods -> tOrderStockGoods.setGoodsName(dto.getGoodsName()));
orderStockGoodsService.updateBatchById(orderStockGoods);
List<TOrderMealGoods> orderMealGoods = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
.eq(TOrderMealGoods::getGoodsNum, goods.getGoodsNum()));
- orderMealGoods.stream().forEach(tOrderMealGoods -> tOrderMealGoods.setGoodsNum(dto.getGoodsNum()));
+ orderMealGoods.stream().forEach(tOrderMealGoods -> tOrderMealGoods.setGoodsName(dto.getGoodsName()));
orderMealGoodsService.updateBatchById(orderMealGoods);
List<TOrderSaleGoods> list = orderSaleGoodsService.list(Wrappers.lambdaQuery(TOrderSaleGoods.class)
.eq(TOrderSaleGoods::getGoodsNum, goods.getGoodsNum()));
- list.stream().forEach(tOrderSaleGoods -> tOrderSaleGoods.setGoodsNum(dto.getGoodsNum()));
+ list.stream().forEach(tOrderSaleGoods -> tOrderSaleGoods.setGoodsName(dto.getGoodsName()));
orderSaleGoodsService.updateBatchById(list);
}
return AjaxResult.success(goodsService.updateById(dto));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
index 81e1109..711c10d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
@@ -111,6 +111,7 @@
TBoard board = boardService.getById(orderMeal.getBoardId());
orderMealVO.setMaxPerson(board.getMaxPerson());
orderMealVO.setMinPerson(board.getMinPerson());
+ orderMealVO.setBoardName(board.getBoardName());
return AjaxResult.success(orderMealVO);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
index bdbf384..a28ab1e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
@@ -79,7 +79,6 @@
@PostMapping(value = "/amountSum")
public AjaxResult<AmountSumVO> amountSum(@RequestBody TOrderSaleQuery query) {
query.setShopId(tokenService.getLoginUser().getObjectId());
- orderSaleService.amountSum(query);
return AjaxResult.success(orderSaleService.amountSum(query));
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index a7213b5..46f8b37 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -128,7 +128,7 @@
// 登录前置校验
loginPreCheck(username, password);
// 用户验证
- Authentication authentication = null;
+// Authentication authentication = null;
// 用户验证
SysUser user = userService.selectUserByUserName(username);
if (StringUtils.isNull(user)){
@@ -146,7 +146,7 @@
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username+"_", password);
AuthenticationContextHolder.setContext(authenticationToken);
// 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
- authentication = authenticationManager.authenticate(authenticationToken);
+// authentication = authenticationManager.authenticate(authenticationToken);
}
catch (Exception e)
{
@@ -166,7 +166,9 @@
AuthenticationContextHolder.clearContext();
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
- LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUser(user);
+ loginUser.setUserId(user.getUserId());
loginUser.setNickName(user.getNickName());
loginUser.setRoleType(user.getRoleType());
loginUser.setObjectId(user.getObjectId());
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java
index 208be4a..c1f7676 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPasswordService.java
@@ -122,13 +122,16 @@
public static void main(String[] args) {
// $2a$10$qofXsM/ZKUMqvysvsWBAfOizecqUdAaXPFUYDVxaYYM0FJg6/mOpq
- String s = SecurityUtils.encryptPassword("111111");
+ String s = SecurityUtils.encryptPassword("123456");
System.err.println(s);
- boolean b = SecurityUtils.matchesPassword("111111", "$2a$10$Wx75W2oW23.tsSkvA21QyueQ59iwWwv2ns06Bxubje0ZwPe2wNOQ2");
+ boolean b = SecurityUtils.matchesPassword("123456", "$2a$10$Wx75W2oW23.tsSkvA21QyueQ59iwWwv2ns06Bxubje0ZwPe2wNOQ2");
System.err.println(b);
}
public boolean reMatches(SysUser user, String rawPassword)
{
+ System.err.println(SecurityUtils.matchesPassword(rawPassword, user.getRePassword()));
+ System.err.println(rawPassword);
+ System.err.println(user.getRePassword());
return SecurityUtils.matchesPassword(rawPassword, user.getRePassword());
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMealGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMealGoods.java
index 7fdd584..42603f9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMealGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderMealGoods.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_meal_goods")
@ApiModel(value="TOrderMealGoods对象", description="餐饮订单商品")
-public class TOrderMealGoods implements Serializable {
+public class TOrderMealGoods extends BaseModel {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleExportExcel.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleExportExcel.java
index 1c069d8..97dcc36 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleExportExcel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/TOrderSaleExportExcel.java
@@ -23,7 +23,7 @@
@Excel(width = 30,name = "支付金额")
private BigDecimal payMoney;
- @Excel(width = 30,name = "支付方式",replace = {"现金_1","支付宝_2","微信_3","银行卡_4","其他_5"})
+ @Excel(width = 30,name = "支付方式",replace = {"现金_1","支付宝_2","微信_3","银行卡_4","其他_5"," _null"})
private Integer payType;
@Excel(width = 30,name = "菜品数量")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 9fe2a93..6a7332f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -561,6 +561,7 @@
SysRole sysRole = new SysRole();
sysRole.setRoleName(dto.getRoleName());
sysRole.setPostType(dto.getPostType());
+ sysRole.setRemark(dto.getRemark());
roleMapper.insertRole(sysRole);
// 添加角色权限中间表
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
index c4cd614..72e12d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDataGeneratorServiceImpl.java
@@ -115,7 +115,7 @@
for (OrderMealGeneratorCountDTO orderMealGeneratorCountDTO : orderMealGeneratorCountDTOS) {
TBoard board = boards.stream().filter(e -> e.getId().equals(orderMealGeneratorCountDTO.getBoardId())).findFirst().orElse(null);
if(Objects.isNull(board)){
- throw new ServiceException("桌台用餐人数配置不存在");
+ throw new ServiceException("该桌台信息不存在");
}
Integer orderCount = orderMealGeneratorCountDTO.getOrderCount();
// 查询当前桌的用餐人数
@@ -131,6 +131,9 @@
List<TOrderMealGoods> orderMealGoods = new ArrayList<>();
// 获取当前桌的菜品
List<TFoundationConfigVO> foundationConfigVOS = foundationConfigs.stream().filter(e -> e.getMealCount().equals(random)).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(foundationConfigVOS)){
+ throw new ServiceException("桌台"+random+"人餐，人数配置不存在");
+ }
// 每种菜品分类需要几个菜的生成
foundationConfigVOS.forEach(e -> {
int random1 = getRandom(e.getMinCount(), e.getMaxCount());
@@ -529,7 +532,11 @@
// BigDecimal money = orderSaleGoods.stream().filter(e -> collect.contains(e.getOrderId()))
// .reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getGoodsCostPrice().multiply(new BigDecimal(y.getGoodsCount()))), BigDecimal::add);
if(!CollectionUtils.isEmpty(orderSales)){
- BigDecimal money = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).collect(Collectors.toList());
+ BigDecimal money = BigDecimal.ZERO;
+ if(!CollectionUtils.isEmpty(collect)){
+ money = collect.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
+ }
tDataGeneratorVO.setTotalRevenue(money);
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
index eea6754..3bdd74f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java
@@ -87,11 +87,13 @@
// 查询已存在的菜品
List<TOrderMealGoods> list2 = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
.in(TOrderMealGoods::getOrderId, dto.getId()));
+ BigDecimal money = BigDecimal.ZERO;
for (MealOrderGoodsDTO mealOrderGoodsDTO : mealOrderGoodsDTOS) {
TOrderMealGoods tOrderMealGoods = list2.stream().filter(item1 -> item1.getGoodsId().equals(mealOrderGoodsDTO.getGoodsId())).findFirst().orElse(null);
if(Objects.nonNull(tOrderMealGoods)){
tOrderMealGoods.setGoodsCount(tOrderMealGoods.getGoodsCount()+mealOrderGoodsDTO.getGoodsCount());
orderMealGoods.add(tOrderMealGoods);
+ money = money.add(tOrderMealGoods.getGoodsSalePrice().multiply(new BigDecimal(mealOrderGoodsDTO.getGoodsCount())));
continue;
}
for (TGoods goods : list) {
@@ -107,16 +109,16 @@
orderMealGood.setGoodsId(goods.getId());
orderMealGood.setTypeName(list1.stream().filter(item2 -> item2.getId().equals(goods.getTypeId())).findFirst().get().getTypeName());
orderMealGoods.add(orderMealGood);
+ money = money.add(goods.getSalePrice().multiply(new BigDecimal(mealOrderGoodsDTO.getGoodsCount())));
}
}
}
- BigDecimal orderMoney = orderMeal.getOrderMoney();
// 添加菜品
for (TOrderMealGoods orderMealGood : orderMealGoods) {
orderMealGood.setOrderId(dto.getId());
- orderMoney = orderMoney.add(orderMealGood.getGoodsSalePrice().multiply(new BigDecimal(orderMealGood.getGoodsCount())));
}
orderMealGoodsService.saveOrUpdateBatch(orderMealGoods);
+ BigDecimal orderMoney = orderMeal.getOrderMoney().add(money);
orderMeal.setOrderMoney(orderMoney);
this.updateById(orderMeal);
// 添加备注
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
index d1a483d..afe7743 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderSaleServiceImpl.java
@@ -78,7 +78,7 @@
@Override
public PageInfo<TOrderSaleVO> pageList(TOrderSaleQuery query) {
- if(Objects.isNull(query.getStartTime()) && Objects.isNull(query.getEndTime())){
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
if(Objects.nonNull(query.getTimeType())){
LocalDateTime startTime = null;
LocalDateTime endTime = null;
@@ -135,6 +135,36 @@
@Override
public AmountSumVO amountSum(TOrderSaleQuery query) {
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
+ if(Objects.nonNull(query.getTimeType())){
+ LocalDateTime startTime = null;
+ LocalDateTime endTime = null;
+ switch (query.getTimeType()){
+ case 1:
+ // 今日
+ startTime = DateUtils.getDayStart(LocalDateTime.now());
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 2:
+ // 昨日
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(1));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now().minusDays(1));
+ break;
+ case 3:
+ // 近7天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(7));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ case 4:
+ // 近30天
+ startTime = DateUtils.getDayStart(LocalDateTime.now().minusDays(30));
+ endTime = DateUtils.getDayEnd(LocalDateTime.now());
+ break;
+ }
+ query.setStartTime(DateUtils.localDateTimeToDate(startTime));
+ query.setEndTime(DateUtils.localDateTimeToDate(endTime));
+ }
+ }
AmountSumVO amountSumVO = this.baseMapper.amountSum(query);
if(amountSumVO.getObligation().compareTo(BigDecimal.ZERO) < 0){
amountSumVO.setObligation(BigDecimal.ZERO);
@@ -228,7 +258,7 @@
@Override
public Map<String, Double> getDataGeneratorSaleDetail(TDataGeneratorSaleQuery query) {
- if(Objects.isNull(query.getStartTime()) && Objects.isNull(query.getEndTime())){
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
if(Objects.nonNull(query.getTimeType())){
LocalDateTime startTime = null;
LocalDateTime endTime = null;
@@ -309,6 +339,9 @@
orderSale.setPayType(dto.getPayType());
orderSale.setPayMoney(dto.getPayMoney());
orderSale.setStatus(2);
+
+
+
this.updateById(orderSale);
}
@@ -340,10 +373,12 @@
List<TOrderSale> orderSales = this.list(Wrappers.lambdaQuery(TOrderSale.class)
.in(TOrderSale::getGeneratorId, ids));
for (TDataGeneratorVO tDataGeneratorVO : list) {
- if(!CollectionUtils.isEmpty(orderSales)){
- BigDecimal money = orderSales.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
- tDataGeneratorVO.setTotalRevenue(money);
+ List<TOrderSale> collect = orderSales.stream().filter(e -> e.getGeneratorId().equals(tDataGeneratorVO.getId())).collect(Collectors.toList());
+ BigDecimal money = BigDecimal.ZERO;
+ if(!CollectionUtils.isEmpty(collect)){
+ money = collect.stream().map(TOrderSale::getPayMoney).reduce(BigDecimal::add).get();
}
+ tDataGeneratorVO.setTotalRevenue(money);
}
return list;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
index 41fe2a2..204edea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.constant.OrderNumConstants;
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.dto.TOrderSaleDTO;
import com.ruoyi.system.dto.TOrderStockDTO;
@@ -70,8 +71,6 @@
if(good.getGoodsNum().equals(orderSaleGoods1.getGoodsNum())){
good.setInventory(orderSaleGoods1.getStockCount()+good.getInventory());
goodsUpdateList.add(good);
- }else {
- break;
}
}
});
@@ -98,7 +97,7 @@
@Override
public PageInfo<TOrderStockVO> pageList(TOrderStockQuery query) {
- if(Objects.isNull(query.getStartTime()) && Objects.isNull(query.getEndTime())){
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
// 判断时间
if(Objects.nonNull(query.getTimeType())){
LocalDateTime startTime = null;
@@ -156,7 +155,7 @@
@Override
public Map<String, Object> getDataGeneratorStockDetail(TDataGeneratorStockQuery query) {
- if(Objects.isNull(query.getStartTime()) && Objects.isNull(query.getEndTime())){
+ if(StringUtils.isEmpty(query.getStartTime()) && StringUtils.isEmpty(query.getEndTime())){
// 判断时间
if(Objects.nonNull(query.getTimeType())){
LocalDateTime startTime = null;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml
index 86d3d82..896317d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealGoodsMapper.xml
@@ -15,11 +15,16 @@
<result column="costPrice" property="costPrice" />
<result column="typeId" property="typeId" />
<result column="goodsId" property="goodsId" />
+ <result column="createTime" property="createTime" />
+ <result column="updateTime" property="updateTime" />
+ <result column="disabled" property="disabled" />
+ <result column="createBy" property="createBy" />
+ <result column="updateBy" property="updateBy" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, goodsNum, goodsName, goodsSalePrice, goodsPicture, goodsCount, orderId,typeName,costPrice,typeId,goodsId
+ id, goodsNum, goodsName, goodsSalePrice, goodsPicture, goodsCount, orderId,typeName,costPrice,typeId,goodsId,createTime
</sql>
<select id="costTotal" resultType="java.math.BigDecimal">
select sum(costPrice*goodsCount) from t_order_meal_goods
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
index 01e1793..7b07ef4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderMealMapper.xml
@@ -58,7 +58,7 @@
AND tom.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
AND tom.isCover = 1
</where>
- ORDER BY tom.mealTime,tom.createTime DESC
+ ORDER BY tom.mealTime DESC , tom.createTime DESC
</select>
<select id="amountSum" resultType="com.ruoyi.system.vo.AmountSumVO">
select
@@ -192,7 +192,6 @@
AND (tom.mealTime BETWEEN CONCAT(DATE_FORMAT(#{query.startTime},'%Y-%m-%d %H:%i:%s'),' 00:00:00')
AND CONCAT(DATE_FORMAT(#{query.endTime},'%Y-%m-%d %H:%i:%s'),' 23:59:59'))
</if>
- AND tom.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tom.mealTime DESC
</select>
@@ -271,6 +270,7 @@
AND tdg.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
and tdg.orderType = 1
</where>
+ ORDER BY tdg.createTime DESC
</select>
<select id="profitDetails" resultType="com.ruoyi.system.vo.GoodsProfitVO">
SELECT
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml
index 406fa39..66a212e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml
@@ -57,7 +57,7 @@
</select>
<select id="amountSum" resultType="com.ruoyi.system.vo.AmountSumVO">
select
- COUNT(id) AS orderCount,
+ COUNT(id) AS orderCount,
IFNULL(SUM(orderMoney),0) AS saleAmount,
IFNULL(SUM(payMoney),0) AS payAmount,
IFNULL(SUM(orderMoney - IFNULL(payMoney,0)),0) AS obligation
@@ -76,7 +76,7 @@
and shopId = #{query.shopId}
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
- AND (createTime BETWEEN #{query.startTime} AND #{query.endTime})
+ AND (orderTime BETWEEN #{query.startTime} AND #{query.endTime})
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
AND isCover = 1
@@ -119,7 +119,7 @@
and shopId = #{query.shopId}
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
- AND (createTime BETWEEN #{query.startTime} AND #{query.endTime})
+ AND (orderTime BETWEEN #{query.startTime} AND #{query.endTime})
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
AND isCover = 1
@@ -218,6 +218,7 @@
AND tdg.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
and tdg.orderType = 2
</where>
+ ORDER BY tdg.createTime DESC
</select>
<select id="profitDetails" resultType="com.ruoyi.system.vo.GoodsProfitVO">
SELECT
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml
index 88b6f29..ba02c79 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOrderStockMapper.xml
@@ -44,7 +44,7 @@
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
- ORDER BY createTime DESC
+ ORDER BY stockTime DESC
</select>
<select id="getDataGeneratorStockDetail" resultType="java.util.Map">
SELECT
@@ -81,7 +81,7 @@
</if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
- ORDER BY createTime DESC
+ ORDER BY stockTime DESC
</select>
</mapper>
--
Gitblit v1.7.1