cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

springboot升级到2.7.2、售后bug处理、字典排序修复、SecurityConfig兼容新的写法、修复首页没配置group函数报错问题

Browse Source
This commit is contained in:
taozi
2022-08-14 22:31:27 +08:00
parent 6c4d00abdd
commit 6520e6fc92
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java
View File

@ -60,15 +60,15 @@ public interface StoreOrderMapper extends CoreMapper<YxStoreOrder> {
Double sumTotalPrice();
@Select("SELECT IFNULL(sum(pay_price),0) as num," +
"DATE_FORMAT(create_time, '%m-%d') as time " +
"DATE_FORMAT(ANY_VALUE(create_time), '%m-%d') as time " +
" FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= #{time}" +
" GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') " +
" ORDER BY create_time ASC")
" GROUP BY DATE_FORMAT(ANY_VALUE(create_time),'%Y-%m-%d') " +
" ORDER BY ANY_VALUE(create_time) ASC")
List<ChartDataDto> chartList(@Param("time") Date time);
@Select("SELECT count(id) as num," +
"DATE_FORMAT(create_time, '%m-%d') as time " +
"DATE_FORMAT(ANY_VALUE(create_time), '%m-%d') as time " +
" FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= #{time}" +
" GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') " +
" ORDER BY create_time ASC")
" GROUP BY DATE_FORMAT(ANY_VALUE(create_time),'%Y-%m-%d') " +
" ORDER BY ANY_VALUE(create_time) ASC")
List<ChartDataDto> chartListT(@Param("time") Date time);
}

4
yshop-mall/src/main/java/co/yixiang/modules/sales/service/impl/StoreAfterSalesServiceImpl.java
View File

@ -247,7 +247,7 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
storeAfterSales.setSalesState(1);
YxStoreOrder yxStoreOrder = storeOrderMapper.selectOne(Wrappers.<YxStoreOrder>lambdaQuery().eq(YxStoreOrder::getOrderId, key));
yxStoreOrder.setStatus(OrderInfoEnum.STATUS_0.getValue());
// yxStoreOrder.setStatus(OrderInfoEnum.STATUS_0.getValue());
yxStoreOrder.setRefundStatus(OrderInfoEnum.STATUS_0.getValue());
storeOrderMapper.updateById(yxStoreOrder);
@ -323,7 +323,7 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl<StoreAfterSalesM
storeAfterSalesStatusMapper.insert(storeAfterSalesStatus);
} else {
storeAfterSales.setState(AfterSalesStatusEnum.STATUS_1.getValue());
storeAfterSales.setState(AfterSalesStatusEnum.STATUS_3.getValue());
storeAfterSales.setSalesState(2);
//操作记录
StoreAfterSalesStatus storeAfterSalesStatus = new StoreAfterSalesStatus();