diff --git a/fuintAdmin_zt/src/api/payConfig/oilconfig.js b/fuintAdmin_zt/src/api/payConfig/oilconfig.js index 1b09e0412..acfa47fa3 100644 --- a/fuintAdmin_zt/src/api/payConfig/oilconfig.js +++ b/fuintAdmin_zt/src/api/payConfig/oilconfig.js @@ -1,10 +1,11 @@ import request from '@/utils/request' // 查询支付规则列表 -export function listOilConfig() { +export function listOilConfig(query) { return request({ - url: '/api/oilConfig/list', + url: '/api/oilConfig/listBystoreId', method: 'get', + params: query, }) } diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index f41a3fe6d..4a0976d1a 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -217,11 +217,11 @@ 新增 - 重置 + 保存 - 重置 + @@ -559,9 +559,21 @@ created() { this.getList(); + + }, components: { Treeselect }, methods: { + + // 页面初始化 + initPage() { + + this.activeName= 'list', + this.userList= 'list', + this.cleanUp() + this.getList() + }, + getswitch(e){ console.log(e) if(e == true){ @@ -619,8 +631,7 @@ message: '操作成功', type: 'success' }); - this.getList() - this.cleanUp + this.initPage() } }) } else { @@ -749,7 +760,7 @@ }, opendelete() { - this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { + this.$confirm('此操作将永久删除该机构, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -757,11 +768,11 @@ deptDelete(this.deleteid).then(res=>{ // console.log(res) if(res.code == 200){ - this.$message({ - type: 'success', - message: '删除成功!' - }); - this.getList() + this.initPage(); + this.$message({ + type: 'success', + message: '删除成功!' + }); this.cleanUp } }) diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue index 492ad281e..75fe90b7a 100644 --- a/fuintAdmin_zt/src/views/components/Service/payment.vue +++ b/fuintAdmin_zt/src/views/components/Service/payment.vue @@ -466,7 +466,7 @@ export default { } }) }) - listOilConfig().then( response => { + listOilConfig({storeId : this.id}).then( response => { this.oilConfigList = response.data; }) }, diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java index 84d40d8ea..7045d4c2d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java @@ -32,6 +32,11 @@ public class OilConfigController extends BaseController { return getSuccessResult(oilConfigService.selectOilConfigList()); } + @GetMapping("/listBystoreId") + public ResponseObject listBystoreId(Integer storeId){ + return getSuccessResult(oilConfigService.listBystoreId(storeId)); + } + /** * 查看支付配置规则是否开启 * @param map diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java index 53f4b6946..0d0609d3f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java @@ -32,6 +32,8 @@ public interface OilConfigService extends IService { */ public List selectOilConfigList(); + public List listBystoreId(Integer storeId); + /** * 根据id查询支付配置信息 * @param id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java index 309ee1e50..4ae11bd6c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java @@ -11,6 +11,7 @@ import com.fuint.api.fuyou.service.OilConfigService; import com.fuint.api.fuyou.vo.OilConfigVo; import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.config.ScheduledTaskRegistrar; import org.springframework.stereotype.Service; @@ -103,6 +104,11 @@ public class OilConfigServiceImpl extends ServiceImpl oilConfigs = baseMapper.selectOilConfigList(nowAccountInfo.getStoreId()); return oilConfigs; } + @Override + public List listBystoreId(Integer storeId) { + List oilConfigs = baseMapper.selectOilConfigList(storeId); + return oilConfigs; + } @Override public OilConfigVo selectOilConfigById(int id) { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java index a557c0822..6fce72826 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java @@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; +import com.fuint.business.order.entity.LJOrder; +import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.TokenUtil; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; import org.apache.ibatis.annotations.Param; @@ -43,6 +46,8 @@ public class CardValueRecordController extends BaseController { public ResponseObject selectAll(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, @Param("cardValueRecord") CardValueRecord cardValueRecord) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + cardValueRecord.setStoreId(nowAccountInfo.getStoreId()); Page page = new Page(pageNo, pageSize); return getSuccessResult(this.cardValueRecordService.page(page, new QueryWrapper<>(cardValueRecord))); } @@ -175,5 +180,12 @@ public class CardValueRecordController extends BaseController { public void testCharge(@PathVariable String orderNo) { this.cardValueRecordService.rechargeFinallDeal(orderNo); } + + + // 订单统计 + @GetMapping("/orderStatistics") + public ResponseObject orderStatistics( @Param("cardValueRecord") CardValueRecordDTO cardValueRecord){ + return getSuccessResult(cardValueRecordService.orderStatistics(cardValueRecord)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java index 847aa8e28..bc27899a1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java @@ -32,6 +32,7 @@ public interface CardValueRecordMapper extends BaseMapper { List> prepaidCardSales(@Param("storeId") Integer storeId); List> tunFuelCardSales(@Param("storeId") Integer storeId); + Map orderStatistics(@Param("cardValueRecord") CardValueRecordDTO cardValueRecord); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml index 048282fc9..9af5c0686 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml @@ -215,6 +215,17 @@ ORDER BY date_range.date + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java index 5bfe29fef..a685f1013 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java @@ -7,6 +7,7 @@ import com.fuint.api.fuyou.entity.ReturnParameter; import com.fuint.business.integral.entity.IntegralDetail; import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; +import com.fuint.business.order.entity.CashierOrder; import com.fuint.business.petrolStationManagement.entity.OilGun; import io.lettuce.core.dynamic.annotation.Param; @@ -64,4 +65,7 @@ public interface CardValueRecordService extends IService { * @return */ CardValueRecord selectCardValueRecordByUserId(); + + Map orderStatistics(CardValueRecordDTO cardValueRecord); + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index b8245c543..a5fc44251 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -39,6 +39,7 @@ import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrde import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.service.ILJStaffService; import com.fuint.business.order.entity.CardBalanceChange; +import com.fuint.business.order.entity.CashierOrder; import com.fuint.business.order.service.CardBalanceChangeService; import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.mapper.LJUserMapper; @@ -753,5 +754,24 @@ public class CardValueRecordServiceImpl extends ServiceImpl orderStatistics(CardValueRecordDTO cardValueRecord) { + +//充值笔数 +//充值总金额 +//赠送总额 +//实收总额 +//微信 +//支付宝 +//现金 + + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + Integer storeId = nowAccountInfo.getStoreId(); + cardValueRecord.setStoreId(storeId); + Map stringStringMap = baseMapper.orderStatistics(cardValueRecord); + + return stringStringMap; + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java index 31681be4a..04c432c68 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java @@ -63,4 +63,16 @@ public class CashierOrderController extends BaseController { String orderNo = map.get("orderNo"); return getSuccessResult(cashierOrderService.selectCashierOrder(orderNo)); } + + + + /** + * 收银台订单统计 + * @param order + * @return + */ + @GetMapping("/orderStatistics") + public ResponseObject orderStatistics(CashierOrder order){ + return getSuccessResult(cashierOrderService.orderStatistics(order)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java index 84fd1ad4b..131698953 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java @@ -3,6 +3,7 @@ package com.fuint.business.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.entity.LJOrder; +import com.fuint.business.order.entity.OilOrder; import com.fuint.business.order.service.LJOrderService; import com.fuint.business.order.vo.LJOrderVo; import com.fuint.framework.web.BaseController; @@ -91,4 +92,11 @@ public class LJOrderController extends BaseController { } return getSuccessResult(ljOrder); } + + + // 订单统计 + @GetMapping("/orderStatistics") + public ResponseObject orderStatistics(LJOrder order){ + return getSuccessResult(orderService.orderStatistics(order)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java index 3daab7bd9..5f94ae498 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java @@ -2,6 +2,7 @@ package com.fuint.business.order.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.order.entity.CashierOrder; import com.fuint.business.order.entity.LJOrder; import com.fuint.business.order.entity.OilOrder; import com.fuint.business.order.service.OilOrderService; @@ -236,4 +237,10 @@ public class OilOrderController extends BaseController { return getSuccessResult(orderService.salesByOilProduct(type)); } + + // 订单统计 + @GetMapping("/orderStatistics") + public ResponseObject orderStatistics(OilOrder order){ + return getSuccessResult(orderService.orderStatistics(order)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java index 229ac26e6..dc5def654 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java @@ -9,6 +9,7 @@ import com.fuint.business.order.vo.Excel.CashierOrderExcel; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; public interface CashierOrderMapper extends BaseMapper { @@ -29,4 +30,6 @@ public interface CashierOrderMapper extends BaseMapper { * @return */ public CashierOrderVo selectCashierOrderById(@Param("id") int id); + + Map orderStatistics(@Param("order") CashierOrder order); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java index 03fd511a2..01815dde2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java @@ -31,4 +31,8 @@ public interface LJOrderMapper extends BaseMapper { Map goodsStream(@Param("storeId") Integer storeId); List> merchandiseSales(@Param("storeId") Integer storeId); + + Map orderStatistics(@Param("order") LJOrder order); + + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java index fb99640e9..e6bba68d5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java @@ -100,4 +100,8 @@ public interface OilOrderMapper extends BaseMapper { * @return */ List selectActiveConsumption(@Param("storeId") Integer storeId, @Param("amount")BigDecimal amount); + + + Map orderStatistics( @Param("order") OilOrder order); + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml index d37e65bd5..9f17307dc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml @@ -75,5 +75,142 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml index f19a7b6eb..f849ee196 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml @@ -153,6 +153,38 @@ ORDER BY date_range.date; + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml index 1bdcb5adb..96cbe3bf3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml @@ -387,5 +387,49 @@ where ac.store_id = #{storeId} and ac.participation_condition_money <= #{amount} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java index 91a26d83e..4de17fc8f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.order.entity.CashierOrder; import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * 收银员订单信息 业务层 @@ -48,4 +49,6 @@ public interface CashierOrderService extends IService { * @return */ public int updateCashierOrder(CashierOrder order); + + Map orderStatistics(CashierOrder order); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java index ef4646c88..8bf9b1785 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java @@ -7,6 +7,7 @@ import com.fuint.business.order.entity.LJOrder; import com.fuint.business.order.vo.LJOrderVo; import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * 订单信息 业务层 @@ -53,4 +54,6 @@ public interface LJOrderService extends IService { * @return */ public int updateGoodOrder(LJOrder order); + + Map orderStatistics(LJOrder order); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java index 0f9114a4f..18d157989 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java @@ -131,6 +131,11 @@ public interface OilOrderService extends IService { List> oilSales(); List> salesByOilProduct(String type); + /** + * 流水订单统计 + * @return + */ + Map orderStatistics(OilOrder order); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java index d2ec0c260..c475cb4da 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; @Service public class CashierOrderServiceImpl extends ServiceImpl implements CashierOrderService { @@ -81,4 +82,21 @@ public class CashierOrderServiceImpl extends ServiceImpl orderStatistics(CashierOrder order) { + +//订单笔数 +//订单总金额 +//优惠总数/升数 +//实收总额/升数 +//油品总金额 +//商品总金额 + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + Integer storeId = nowAccountInfo.getStoreId(); + order.setStoreId(storeId); + Map stringStringMap = baseMapper.orderStatistics(order); + + return stringStringMap; + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java index 81dd5ed38..3984c4e84 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java @@ -5,22 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fuint.business.convenienceSore.entity.StockStatistic; -import com.fuint.business.convenienceSore.entity.StockTrack; -import com.fuint.business.convenienceSore.service.StockStatisticService; -import com.fuint.business.convenienceSore.service.StockTrackService; import com.fuint.business.order.entity.LJOrder; import com.fuint.business.order.mapper.LJOrderMapper; import com.fuint.business.order.service.LJOrderService; import com.fuint.business.order.vo.Excel.LJOrderExcel; import com.fuint.business.order.vo.LJOrderVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; +import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; @Service public class LJOrderServiceImpl extends ServiceImpl implements LJOrderService { @@ -93,4 +89,18 @@ public class LJOrderServiceImpl extends ServiceImpl impl int row = baseMapper.updateById(order); return row; } + + @Override + public Map orderStatistics(LJOrder order) { + //商品笔数 + //总金额 + //商品总数量 + //优惠金额 + //微信 + //支付宝 + //现金 + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + order.setStoreId(nowAccountInfo.getStoreId()); + return baseMapper.orderStatistics(order); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index e5280584c..6844b61be 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -1140,4 +1140,25 @@ public class OilOrderServiceImpl extends ServiceImpl i DecimalFormat decimalFormat = new DecimalFormat("#.##"); return Double.valueOf(decimalFormat.format(growthRate)); } + + + + + + @Override + public Map orderStatistics(OilOrder order) { +//油品笔数 +//油品总金额 +//优惠总额 +//交易数量 +//实收总额 +//微信 +//支付宝 +//现金 + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + Integer storeId = nowAccountInfo.getStoreId(); + order.setStoreId(storeId); + + return oilOrderMapper.orderStatistics(order); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java index d8a57d774..8aae9011f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java @@ -36,8 +36,10 @@ public interface MtStoreMapper extends BaseMapper { int editStatusBydeptIdList(@Param("list") List sysDeptsByjy); // 批量修改该状态根据部门 - int editStatusBydeptId(Long deptId); + int editStatusBydeptId(@Param("deptId") Long deptId); int editStatusByExpirationTime(); + int ifDeleteByDeptId(@Param("deptId") Long deptId); + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/ExportExcelService.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/ExportExcelService.xml index 9c5bbf89f..a30b63fe2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/ExportExcelService.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/ExportExcelService.xml @@ -40,7 +40,7 @@ update mt_store - status = 'jy' + set status = 'jy' contract_dept_id = #{deptId} @@ -49,7 +49,7 @@ update mt_store - status = 'jy' + set status = 'jy' contract_dept_id IN @@ -59,8 +59,13 @@ update mt_store - status = 'jy' + set status = 'jy' where expiration_time > NOW() and status = 'qy' + + update mt_store + set if_delete = '1' + where contract_dept_id = #{deptId} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java index aaf71b099..752d868ac 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java @@ -109,4 +109,8 @@ public interface StoreService extends IService { void flowflowConfiguration(); void petrolStationsAreExpired(); + + // 假删除店铺 + + boolean ifDeleteByDeptId(Long deptId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java index 53630fb44..4eedebb28 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java @@ -2,10 +2,12 @@ package com.fuint.business.store.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.mapper.AllOrderInfoMapper; +import com.fuint.business.store.entity.MtStore; +import com.fuint.business.store.mapper.MtStoreMapper; import com.fuint.business.store.service.StoreService; import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.StoreDto; @@ -15,16 +17,13 @@ import com.fuint.common.service.MerchantService; import com.fuint.common.util.TokenUtil; import com.fuint.framework.annoation.OperationServiceLog; import com.fuint.framework.exception.BusinessCheckException; -import com.fuint.framework.exception.GlobalExceptionHandler; import com.fuint.framework.pagination.PaginationRequest; import com.fuint.framework.pagination.PaginationResponse; import com.fuint.module.backendApi.response.LoginResponse; import com.fuint.repository.bean.StoreDistanceBean; import com.fuint.repository.mapper.MtMerchantMapper; -import com.fuint.business.store.mapper.MtStoreMapper; import com.fuint.repository.mapper.TAccountMapper; import com.fuint.repository.model.MtMerchant; -import com.fuint.business.store.entity.MtStore; import com.fuint.repository.model.TAccount; import com.fuint.system.dept.entity.SysDept; import com.fuint.system.dept.mapper.SysDeptMapper; @@ -44,10 +43,10 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; /** @@ -362,7 +361,7 @@ public class StoreServiceImpl extends ServiceImpl implem @Autowired public RedisTemplate redisTemplate; - @Autowired + @Resource TAccountMapper tAccountMapper; @Resource @@ -547,4 +546,16 @@ public class StoreServiceImpl extends ServiceImpl implem } + @Override + public boolean ifDeleteByDeptId(Long deptId) { + + + // 创建 UpdateWrapper，用于更新 if_delete 列 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("if_delete", "1"); + updateWrapper.eq("contract_dept_id",deptId); + // 使用 MyBatis-Plus 提供的 update 方法更新 + int affectedRows = mtStoreMapper.update(null, updateWrapper); + return affectedRows>0; + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java index e08814880..0c9135649 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java @@ -1,6 +1,7 @@ package com.fuint.system.dept.controller; +import com.fuint.business.store.service.StoreService; import com.fuint.business.storeInformation.entity.QRCode; import com.fuint.business.storeInformation.service.IQRCodeService; import com.fuint.common.constant.UserConstants; @@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** @@ -102,6 +104,8 @@ public class SysDeptController extends BaseController return getSuccessResult(deptService.updateDept(dept)); } + @Resource + StoreService storeService; /** * 删除部门 */ @@ -116,6 +120,8 @@ public class SysDeptController extends BaseController { return getFailureResult("部门存在用户,不允许删除"); } + // 删除store表的dept + storeService.ifDeleteByDeptId(deptId); return getSuccessResult(deptService.deleteDeptById(deptId)); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml index ed9d3207c..e1f2f5c4e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/fuintCashierWeb/src/api/cashier/cardvaluerecord.js b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js index ff5e805d9..746a9169d 100644 --- a/fuintCashierWeb/src/api/cashier/cardvaluerecord.js +++ b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js @@ -8,6 +8,14 @@ export function listCardValueRecord(cardValueRecord) { params: cardValueRecord }) } +// 查询会员充值统计 +export function orderStatisticsApi(cardValueRecord) { + return request({ + url: '/business/marketingActivity/cardValueRecord/orderStatistics', + method: 'get', + params: cardValueRecord + }) +} // 查询挂账信息列表 export function cardValueRecordInfo(id) { diff --git a/fuintCashierWeb/src/api/cashier/cashierorder.js b/fuintCashierWeb/src/api/cashier/cashierorder.js index cf5850c8e..f3c169db4 100644 --- a/fuintCashierWeb/src/api/cashier/cashierorder.js +++ b/fuintCashierWeb/src/api/cashier/cashierorder.js @@ -25,3 +25,11 @@ export function cashierOrderByOrderNo(data) { data: data }) } +// 根据订单号查询油品订单信息 +export function orderStatisticsApi(query) { + return request({ + url: '/business/cashierOrder/orderStatistics', + method: 'get', + params: query + }) +} diff --git a/fuintCashierWeb/src/api/cashier/goodsorder.js b/fuintCashierWeb/src/api/cashier/goodsorder.js index a3942218c..3abfb6cdd 100644 --- a/fuintCashierWeb/src/api/cashier/goodsorder.js +++ b/fuintCashierWeb/src/api/cashier/goodsorder.js @@ -8,6 +8,14 @@ export function listOrder(query) { params: query }) } +// 查询商品订单统计 +export function orderStatisticsApi(query) { + return request({ + url: '/business/order/orderStatistics', + method: 'get', + params: query + }) +} // 根据订单id查询商品订单信息 export function getOrderGoods(data) { diff --git a/fuintCashierWeb/src/api/cashier/oilorder.js b/fuintCashierWeb/src/api/cashier/oilorder.js index 0116b3d5c..791e1ab39 100644 --- a/fuintCashierWeb/src/api/cashier/oilorder.js +++ b/fuintCashierWeb/src/api/cashier/oilorder.js @@ -7,6 +7,13 @@ export function listOilOrder(query) { method: 'get', params: query }) +}// 订单统计 +export function orderStatisticsApi(query) { + return request({ + url: '/business/oilOrder/orderStatistics', + method: 'get', + params: query + }) } // 根据id查询油品订单信息 diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index ebcbcb7ad..2ad8f1b49 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -53,9 +53,29 @@ 收银台订单统计
-
-
订单总数
-
55
+
+
笔数
+
{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}
+
+
+
订单总金额
+
{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}
+
+
+
实付总金额
+
{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}
+
+
+
油品优惠
+
{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}
+
+
+
油品总金额
+
{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}
+
+
+
商品总金额
+
{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}
@@ -258,7 +278,7 @@