czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
SongZhang 2024-09-27 09:12:25 +08:00
parent 1b88298536 86dc91cb4e
commit b4f227878a
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java
View File

@ -136,20 +136,20 @@ public interface TbOrderDetailRepository extends JpaRepository<TbOrderDetail, In
"ORDER BY salesNum DESC") "ORDER BY salesNum DESC")
List<TbOrderSalesCountByDayVo> queryTbOrderSalesCountByDay(@Param("shopId") Integer shopId,@Param("cateId")String cateId,@Param("proName")String proName, @Param("startTime") Date startTime, @Param("endTime") Date endTime); List<TbOrderSalesCountByDayVo> queryTbOrderSalesCountByDay(@Param("shopId") Integer shopId,@Param("cateId")String cateId,@Param("proName")String proName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
@Query(value = "SELECT" + @Query("SELECT new cn.ysk.cashier.vo.CountStockByDayVo(" +
" SUM( CASE WHEN orders.order_type != 'return' THEN info.price_amount ELSE 0 END )-SUM( CASE WHEN orders.order_type = 'return' THEN info.price_amount ELSE 0 END ) as sale_amount," + " (SUM( CASE WHEN orders.orderType != 'return' THEN info.priceAmount ELSE 0 END ) - SUM( CASE WHEN orders.orderType = 'return' THEN info.priceAmount ELSE 0 END )) as sale_amount," +
" SUM( CASE WHEN orders.order_type != 'return' THEN info.num ELSE 0 END )-SUM( CASE WHEN orders.order_type = 'return' THEN info.num ELSE 0 END ), as sale_num" + " (SUM( CASE WHEN orders.orderType != 'return' THEN info.num ELSE 0 END )-SUM( CASE WHEN orders.orderType = 'return' THEN info.num ELSE 0 END )) as sale_num," +
" orders.trade_day " + " orders.tradeDay)" +
"FROM" + "FROM" +
" tb_order_info orders" + " TbOrderInfo orders" +
" LEFT JOIN tb_order_detail info ON orders.id = info.order_id" + " LEFT JOIN TbOrderDetail info ON orders.id = info.orderId" +
"WHERE" + " WHERE " +
" info.shop_id = :shopId" + " info.shopId = :shopId" +
" AND info.create_time > :startTime" + " AND info.createTime > :startTime" +
" AND info.create_time < :endTime" + " AND info.createTime < :endTime" +
" AND ( info.STATUS = 'closed' OR info.STATUS = 'refund' ) " + " AND ( info.status = 'closed' OR info.status = 'refund' ) " +
"GROUP BY orders.trade_day " + "GROUP BY orders.tradeDay " +
"ORDER BY orders.trade_day DESC",nativeQuery = true) "ORDER BY orders.tradeDay DESC")
List<CountStockByDayVo> countStockByDay(@Param("shopId") Integer shopId,@Param("startTime") Date startTime, @Param("endTime") Date endTime); List<CountStockByDayVo> countStockByDay(@Param("shopId") Integer shopId,@Param("startTime") Date startTime, @Param("endTime") Date endTime);
@Query("SELECT new cn.ysk.cashier.vo.TbOrderSalesCountByDayVo(" + @Query("SELECT new cn.ysk.cashier.vo.TbOrderSalesCountByDayVo(" +

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
View File

@ -188,6 +188,8 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
stockDetail.setProductName(product.getName()); stockDetail.setProductName(product.getName());
stockDetail.setUnitName(tbShopUnit==null?"":tbShopUnit.getName()); stockDetail.setUnitName(tbShopUnit==null?"":tbShopUnit.getName());
tbProductStockDetailRepository.save(stockDetail); tbProductStockDetailRepository.save(stockDetail);
stockDetail.setCreatedAt(System.currentTimeMillis());
stockDetail.setUpdatedAt(System.currentTimeMillis());
product.setStockNumber(product.getStockNumber()-stockDetail.getStockNumber().intValue()); product.setStockNumber(product.getStockNumber()-stockDetail.getStockNumber().intValue());
tbProductRepository.save(product); tbProductRepository.save(product);
} }

21
eladmin-system/src/main/java/cn/ysk/cashier/vo/CountStockByDayVo.java
View File

@ -7,8 +7,25 @@ import java.math.BigDecimal;
@Data @Data
public class CountStockByDayVo { public class CountStockByDayVo {
// private String tradeDay;
//
// private Integer saleNum;
// private BigDecimal saleAmount;
//
// public CountStockByDayVo(BigDecimal saleAmount, Integer saleNum, String tradeDay) {
// this.tradeDay = tradeDay;
// this.saleNum = saleNum;
// this.saleAmount = saleAmount;
// }
private Object saleAmount;
private Object saleNum;
private String tradeDay; private String tradeDay;
private Integer saleNum; public CountStockByDayVo(Object saleAmount, Object saleNum, String tradeDay) {
private BigDecimal saleAmount; this.saleAmount = saleAmount;
this.saleNum = saleNum;
this.tradeDay = tradeDay;
}
} }