From dde91a7108b34bbb817839f0049930b0d6a4a1c7 Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Fri, 12 Jan 2024 13:58:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8F=B0=E5=A2=9E=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/indexcomponents/topindex.vue | 27 +- fuintAdmin/src/views/member/userInfo.vue | 21 +- .../member/userInfoOrder/balanceRecord.vue | 15 +- fuintAdmin_zt/src/api/allOrder.js | 29 ++ fuintAdmin_zt/src/views/Service/details.vue | 8 +- .../src/views/components/Service/allOrder.vue | 384 ++++++++++++++++++ .../mapper/xml/CardFuelChangeMapper.xml | 10 +- .../impl/CardFuelRecordServiceImpl.java | 11 +- .../impl/CardValueRecordServiceImpl.java | 14 +- .../controller/AllOrderInfoController.java | 30 ++ .../order/mapper/AllOrderInfoMapper.java | 9 + .../order/mapper/xml/AllOrderInfoMapper.xml | 69 ++++ .../mapper/xml/CardBalanceChangeMapper.xml | 2 +- .../order/service/AllOrderInfoService.java | 20 + .../service/impl/AllOrderInfoServiceImpl.java | 35 +- .../service/impl/OilOrderServiceImpl.java | 8 +- .../business/order/vo/AllOrderInfoVo.java | 11 + .../system/dept/mapper/xml/SysDeptMapper.xml | 2 +- .../views/cashier/NewComponents/Integral.vue | 36 +- 19 files changed, 697 insertions(+), 44 deletions(-) create mode 100644 fuintAdmin_zt/src/api/allOrder.js create mode 100644 fuintAdmin_zt/src/views/components/Service/allOrder.vue create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java diff --git a/fuintAdmin/src/views/indexcomponents/topindex.vue b/fuintAdmin/src/views/indexcomponents/topindex.vue index 6917c1eed..fc1bc9803 100644 --- a/fuintAdmin/src/views/indexcomponents/topindex.vue +++ b/fuintAdmin/src/views/indexcomponents/topindex.vue @@ -15,7 +15,7 @@ -->
- {{ this.statisticsData.today_sum ? parseFloat(this.statisticsData.today_sum).toFixed(2) : 0 }} + {{ this.statisticsData.today_sum ? this.statisticsData.today_sum : 0 }}
@@ -41,7 +41,7 @@ 本周流水总额
- {{ this.statisticsData.this_week_sum?parseFloat(this.statisticsData.this_week_sum).toFixed(2):0 }} + {{ this.statisticsData.this_week_sum?this.statisticsData.this_week_sum:0 }}
@@ -70,7 +70,7 @@ 本月流水总额
- {{this.statisticsData.this_month_sum?parseFloat(this.statisticsData.this_month_sum).toFixed(2):0}} + {{this.statisticsData.this_month_sum?this.statisticsData.this_month_sum:0}}
@@ -229,8 +229,17 @@ export default { getDate() { this.loading = true turnoverStatisticsApi().then(res=>{ - if (res.code == 200) { + if (res.code === 200) { this.statisticsData = res.data + // 遍历 this.statisticsData 对象的所有属性 + for (const key in this.statisticsData) { + if (Object.hasOwnProperty.call(this.statisticsData, key)) { + // 如果属性值是数字类型，则保留两位小数 + if (typeof this.statisticsData[key] === 'number') { + this.statisticsData[key] = this.statisticsData[key].toFixed(2); + } + } + } this.loading = false } @@ -278,8 +287,11 @@ export default { font-size: 14px; } .icon-lv{ - width: 71px; + //width: 71px; + width: auto; height: 24px; + padding-left: 10px; + padding-right: 10px; background: #E3F9E9; border-radius: 3px 3px 3px 3px; display: flex; @@ -290,7 +302,10 @@ export default { } .icon-lv2{ - width: 71px; + //width: 71px; + width: auto; + padding-left: 10px; + padding-right: 10px; height: 24px; background: #f9e3e3; border-radius: 3px 3px 3px 3px; diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index 6dc1e5f1e..cfc23ce8e 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -118,26 +118,26 @@
- + + + + diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js new file mode 100644 index 000000000..e7496c469 --- /dev/null +++ b/fuintAdmin_zt/src/api/allOrder.js @@ -0,0 +1,29 @@ +import request from '@/utils/request' + +// 分页查询所有的订单信息 +export function getOrderListApi(query) { + return request({ + url: 'business/allOrderInfo/getPageList', + method: 'get', + params: query + + }) +} +// 分页查询所有的订单信息 +export function getSumPayMoneyApi(query) { + return request({ + url: 'business/allOrderInfo/sumPayMoney', + method: 'get', + params: query + + }) +} + +// 查询订单信息 +export function getOrderInfo(orderId) { + return request({ + url: 'backendApi/order/info/' + orderId, + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/fuintAdmin_zt/src/views/Service/details.vue b/fuintAdmin_zt/src/views/Service/details.vue index 565c46ea9..3d2618fe0 100644 --- a/fuintAdmin_zt/src/views/Service/details.vue +++ b/fuintAdmin_zt/src/views/Service/details.vue @@ -9,13 +9,14 @@ - + + + @@ -29,6 +30,7 @@ // import peizhi from '../components/Service/peizhi' import payment from '../components/Service/payment' import staff from '../components/Service/staff' + import allOrder from '../components/Service/allOrder' import jcindex from '../components/Service/index' export default { name: 'details', @@ -41,7 +43,7 @@ // peizhi components:{ - jcindex,staff,payment, + jcindex,staff,payment,allOrder }, created() { this.id = this.$route.query.id diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue new file mode 100644 index 000000000..be1920da0 --- /dev/null +++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue @@ -0,0 +1,384 @@ + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml index b7a342751..9116854c5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml @@ -136,8 +136,9 @@ cfc.change_type changeType, cfc.balance balance, cfc.order_no orderNo, - cfc.from_type from_type, - cfc.create_time createTime + cfc.from_type fromType, + cfc.create_time createTime, + cfc.after_the_change afterTheChange from card_fuel_change cfc left join mt_store ms on ms.id = cfc.store_id @@ -148,12 +149,13 @@ and cfc.store_id = #{cardFuelChange.storeId} + order by cfc.id desc - insert into card_fuel_change(user_id, chain_store_id, store_id, change_type, from_type, balance, create_time, create_by, update_time, update_by, type, oil_type, unit,order_no) - values (#{userId}, #{chainStoreId}, #{storeId}, #{changeType}, #{fromType}, #{balance}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}, #{type}, #{oilType}, #{unit},#{orderNo}) + insert into card_fuel_change(user_id, chain_store_id, store_id, change_type, from_type, balance, create_time, create_by, update_time, update_by, type, oil_type, unit,order_no,after_the_change) + values (#{userId}, #{chainStoreId}, #{storeId}, #{changeType}, #{fromType}, #{balance}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}, #{type}, #{oilType}, #{unit},#{orderNo},#{afterTheChange}) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 3296351e8..ad901beaa 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -248,6 +248,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { @Autowired private RedisLock redisLock; + private static String beforeLitres = new String("0"); /** * 查询支付状态 修改相关关联表 * @param id @@ -264,8 +265,10 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { // 查询用户信息 LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(cardFuelRecord.getMtUserId(),cardFuelRecord.getChainStoreId()); + beforeLitres = "0"; // 修改该用户的余额信息 if (!ObjectUtil.isEmpty(ljUserVos)) { + UserBalance userBalance = editRefuelMoney(cardFuelRecord, ljUserVos); if (!ObjectUtil.isEmpty(userBalance)) { userBalanceService.updateUserBalance(userBalance); @@ -274,6 +277,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { // 添加余额充值纪录表 CardFuelChange cardFuelChange = editFuelChange(cardFuelRecord); + cardFuelChange.setAfterTheChange(Double.valueOf(beforeLitres)); cardFuelChangeService.insert(cardFuelChange); // 积分表变动 if (!ObjectUtil.isEmpty(cardFuelRecord.getPoints()) && cardFuelRecord.getPoints() != 0) { @@ -294,6 +298,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { } public UserBalance editRefuelMoney(CardFuelRecord cardFuelRecord,LJUserVo ljUserVos) { + beforeLitres = "0"; List> refuelMoneyList = new ArrayList<>(); UserBalance userBalance = new UserBalance(); userBalance.setId(ljUserVos.getBalanceId()); @@ -305,6 +310,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { refuelMoney.put("type",cardFuelRecord.getType()); refuelMoney.put("oilType",cardFuelRecord.getOilType()); refuelMoney.put("refuelMoney",cardFuelRecord.getIncomeLitres().toString()); + beforeLitres = cardFuelRecord.getIncomeLitres().toString(); refuelMoneyList.add(refuelMoney); String jsonString = JSON.toJSONString(refuelMoneyList); @@ -323,6 +329,9 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { BigDecimal ref = new BigDecimal(refuelMoney); BigDecimal inconLitres = new BigDecimal(cardFuelRecord.getIncomeLitres().toString()); BigDecimal add = ref.add(inconLitres); + beforeLitres = add.toString(); + + stringObjectMap.put("refuelMoney",add.toString()); flag = false; break; @@ -349,7 +358,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { cardFuelChange.setStoreId(cardFuelRecord.getStoreId()); cardFuelChange.setUserId(cardFuelRecord.getMtUserId()); cardFuelChange.setChangeType("1"); - cardFuelChange.setFromType("油卡充值赠送"); + cardFuelChange.setFromType("油卡充值"); cardFuelChange.setBalance(cardFuelRecord.getIncomeLitres()); cardFuelChange.setType(cardFuelRecord.getType()); cardFuelChange.setOilType(cardFuelRecord.getOilType()); 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 9c19d659d..3c422b6de 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 @@ -405,14 +405,23 @@ public class CardValueRecordServiceImpl extends ServiceImplepsilon) { cardBalanceChange.setFromType("余额充值赠送"); cardBalanceChange.setBalance(cardValueRecord.getGiftBalance()); cardBalanceChange.setStoreId(cardValueRecord.getStoreId()); cardBalanceChange.setChainStoreId(cardValueRecord.getChainStoreId()); + cardBalanceChange.setOrderNo(cardValueRecord.getPaymentNo()); + + // 处理赠送 + BigDecimal resCardBalance = new BigDecimal(userBalance.getCardBalance().toString()); // 原有数据 + BigDecimal getGiftBalance = resCardBalance.add(new BigDecimal(cardValueRecord.getGiftBalance().toString())); // 原有数据 + userBalance.setCardBalance(Double.valueOf(getGiftBalance.toString())); + userBalanceService.updateUserBalance(userBalance); + cardBalanceChange.setAfterTheChange(userBalance.getCardBalance()); cardBalanceChange.setCreateBy(cardValueRecord.getMtStaffId().toString()); cardBalanceChangeService.insertCardBalance2(cardBalanceChange); @@ -454,6 +463,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl list = allOrderInfoService.getPageList(page, allOrderInfo); + return getSuccessResult(list); + } + + + + @GetMapping("sumPayMoney") + public ResponseObject sumPayMoney(AllOrderInfo allOrderInfo) { + String sum = allOrderInfoService.sumPayMoney(allOrderInfo); + return getSuccessResult(sum); + } + /** * 根据订单号修改订单支付状态 * @param map diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java index 80d98ed87..a8d85eec2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java @@ -1,7 +1,12 @@ package com.fuint.business.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.entity.AllOrderInfo; +import com.fuint.business.order.entity.CardBalanceChange; +import com.fuint.business.order.vo.AllOrderInfoVo; +import com.fuint.business.order.vo.CardBalanceChangeVo; import com.fuint.business.store.entity.MtStore; import org.apache.ibatis.annotations.Param; @@ -9,6 +14,10 @@ import java.math.BigDecimal; import java.util.List; public interface AllOrderInfoMapper extends BaseMapper { + + IPage getPageList(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo); + + String sumPayMoney( @Param("allOrderInfo") AllOrderInfo allOrderInfo); // 根据storeId List查询总流水 BigDecimal allStream(@Param("list") List mtStoreList); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml index 778467da9..760725821 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml @@ -12,4 +12,73 @@ + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml index 212515caf..978218608 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml @@ -24,6 +24,6 @@ and cbc.store_id = #{cardBalanceChange.storeId} -order by cbc.create_time DESC +order by cbc.id DESC \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java index 82f11ccdd..793e7e8ab 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java @@ -1,8 +1,28 @@ package com.fuint.business.order.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.order.entity.AllOrderInfo; +import com.fuint.business.order.vo.AllOrderInfoVo; +import com.fuint.business.order.vo.CardBalanceChangeVo; public interface AllOrderInfoService { + + /** + * 分页查询全部订单信息 + * @param allOrderInfo + * @param page + * @return + */ + IPage getPageList(Page page, AllOrderInfo allOrderInfo); + + /** + * 统计总的金额 + * @param allOrderInfo + * @return + */ + String sumPayMoney(AllOrderInfo allOrderInfo); + /** * 根据订单号查询所有订单信息 * @param orderNo diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 905846bb4..b3e69d257 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -2,19 +2,50 @@ package com.fuint.business.order.service.impl; import cn.hutool.core.util.ObjectUtil; 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.api.fuyou.service.MerchantConfigService; import com.fuint.business.order.entity.AllOrderInfo; import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.service.AllOrderInfoService; import com.fuint.business.order.service.OilOrderService; +import com.fuint.business.order.vo.AllOrderInfoVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class AllOrderInfoServiceImpl extends ServiceImpl implements AllOrderInfoService { + + @Autowired + private MerchantConfigService merchantConfigService; + + @Autowired + private OilOrderService orderService; + + @Resource + AllOrderInfoMapper allOrderInfoMapper; + @Override + public IPage getPageList(Page page, AllOrderInfo allOrderInfo) { + IPage pageList = allOrderInfoMapper.getPageList(page, allOrderInfo); + return pageList; + } + + public String sumPayMoney(AllOrderInfo allOrderInfo){ + String sumPayMoney = allOrderInfoMapper.sumPayMoney(allOrderInfo); + + if (ObjectUtil.isEmpty(sumPayMoney)) { + sumPayMoney = "-1"; + } + return sumPayMoney; + } + @Override public AllOrderInfo selectAllOrderInfoByOrderNo(String orderNo) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -27,8 +58,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl i ); // 计算对应的环比 - chainMaps(mergedMap); + Map stringDoubleMap = chainMaps(mergedMap); // 数据组装 - - return mergedMap; +return stringDoubleMap; +// return mergedMap; } // 员工统计 @@ -1231,6 +1231,8 @@ public class OilOrderServiceImpl extends ServiceImpl i // 计算环比增长率 double growthRate = (res - last) / last * 100; +// double growthRate = ((res - last) / Math.abs(last)) * 100.0; + // 使用DecimalFormat将结果格式化为两位小数 DecimalFormat decimalFormat = new DecimalFormat("#.##"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java new file mode 100644 index 000000000..26882bfa5 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java @@ -0,0 +1,11 @@ +package com.fuint.business.order.vo; + +import com.fuint.business.order.entity.AllOrderInfo; +import lombok.Data; + +@Data +public class AllOrderInfoVo extends AllOrderInfo { + private String userName; + private String userMobile; + private Double sumPayMoney; +} 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 3f6eee40d..008b6971b 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 @@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"