diff --git a/fuintAdmin/src/api/convenienceStore/goods.js b/fuintAdmin/src/api/convenienceStore/goods.js index 666ea2cc6..06679c043 100644 --- a/fuintAdmin/src/api/convenienceStore/goods.js +++ b/fuintAdmin/src/api/convenienceStore/goods.js @@ -20,11 +20,19 @@ export function selectTree(data) { // 联级选择器 树形数据结构 export function cvsGoodsTree() { - return request({ - url: '/business/cvsGoods/tree', - method: 'get', - }) - } + return request({ + url: '/business/cvsGoods/tree', + method: 'get', + }) +} + +// 联级选择器 树形数据结构 +export function cvsGoodsAll() { + return request({ + url: '/business/cvsGoods', + method: 'get', + }) +} // 查询一级分类 export function list(data) { diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue index 1cfae09ed..df3751b1f 100644 --- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue +++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue @@ -11,14 +11,6 @@ :options="cvsGoodOptions" :props="{ checkStrictly: true }" clearable> - - - - - - - - - - - + + + + + + + + + @@ -331,7 +327,7 @@ + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java index 812b46668..a00585fb7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java @@ -54,6 +54,15 @@ public class CvsGoodsController extends BaseController { return getSuccessResult(list); } + /** + * 查询当前店铺所有分类信息 + * @return + */ + @GetMapping + public ResponseObject selectAll(){ + return getSuccessResult(cvsGoodsService.selectCvsGoods()); + } + //查询一级菜单 @PostMapping("/list") public ResponseObject list(CvsGoods goods) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java index cd753a100..6c15bba81 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java @@ -36,6 +36,12 @@ public interface CvsGoodsService extends IService { */ List selectCvsGoodsList(CvsGoods goods); + /** + * 查询当前店铺所有分类信息 + * @return + */ + List selectCvsGoods(); + /** * 联级选择器 树形数据结构 * @return diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java index 1e5e46eac..b65635e5a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java @@ -126,6 +126,14 @@ public class CvsGoodsServiceImpl extends ServiceImpl im return baseMapper.selectList(queryWrapper); } + @Override + public List selectCvsGoods() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); + return baseMapper.selectList(queryWrapper); + } + /** * 联级选择器 树形数据结构 * @return 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 16889b9fa..c31de24bb 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/entity/CreditUnit.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java index 6a80bc657..07d612346 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java @@ -29,6 +29,14 @@ public class CreditUnit extends BaseEntity implements Serializable { @ApiModelProperty("自增ID") @TableId(value = "ID", type = IdType.AUTO) private Integer id; + /** + * 店铺id + */ + private Integer storeId; + /** + * 连锁店id + */ + private Integer chainStoreId; /** * 单位名称 */ 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/mapper/xml/HangBillMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml index 1fa0f42ba..028f25e72 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml @@ -45,9 +45,10 @@ \ 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 implements CreditUnitService { + @Autowired + private ILJStoreService storeService; @Override public List selectCreditUnitList() { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId()); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("status","qy"); + queryWrapper.eq("chain_store_id",store.getChainStoreId()); List list = baseMapper.selectList(queryWrapper); return list; } @@ -27,6 +37,10 @@ public class CreditUnitServiceImpl extends ServiceImpl i cashierOrder.setStatus(payStatus); if (payType.equals("CASH")){ cashierOrder.setPayTime(new Date()); + this.insertAllOrderInfo(orderNo,storeId,Double.valueOf(map.get("allAmount")),payType,userId,"PC","6","paid"); } cashierOrder.setOrderNo(orderNo); cashierOrder.setGoodsOrderAmount(goodsAmount); @@ -408,6 +409,7 @@ public class OilOrderServiceImpl extends ServiceImpl i orders.put("goodsOrder",goodsOrder1); cashierOrder.setGoodsOrderId(goodsOrder1.getId()); } + orders.put("orderNo",orderNo); cashierOrderService.insertCashierOrder(cashierOrder); return orders; } @@ -522,10 +524,11 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setOilOrderId(oilOrder.getId()); cashierOrderService.insertCashierOrder(cashierOrder); this.updateGrowthValue1(oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId); -// this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet"); + this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"PC","1","paid"); res.put("success","success"); } else { + String status = "unpaid"; if (ObjectUtil.isNotEmpty(refuelMoneys)){ for (Object refuelMoney : refuelMoneys) { @@ -542,7 +545,8 @@ public class OilOrderServiceImpl extends ServiceImpl i boolean flag = false; for (int i = 0;i < oilOrders.size();i++) { if (oilOrders.get(i).get("oilName").equals(oilName.getId().toString())){ - if (refuelMoneyLiters>=Double.valueOf(oilOrders.get(i).get("liters").toString())){ + if (refuelMoneyLiters>=Double.valueOf(oilOrders.get(i).get("liters").toString())) { + status = "paid"; flag = true; Double amount = Double.valueOf(oilOrders.get(i).get("amount").toString()); Double oilPrice = Double.valueOf(oilOrders.get(i).get("oilPrice").toString()); @@ -570,7 +574,7 @@ public class OilOrderServiceImpl extends ServiceImpl i order.setPayUser(userVo1.getMobile()); order.setPayType(map.get("payType")); order.setInvoicing("未开票"); - order.setOrderStatus("paid"); + order.setOrderStatus(status); order.setPayTime(new Date()); this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId()); @@ -582,15 +586,15 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setPayUser(userVo1.getMobile()); cashierOrder.setAmount(oilAmount); cashierOrder.setPayAmount(oilAmount); - cashierOrder.setStatus("paid"); + cashierOrder.setStatus(status); cashierOrder.setPayTime(new Date()); cashierOrder.setOrderNo(orderNo); cashierOrder.setOilOrderAmount(oilAmount); // cashierOrder.setOilDiscountAmount(Double.valueOf(map.get("oilDiscount"))); cashierOrder.setTerminal(map.get("terminal")); cashierOrder.setOilOrderId(oilOrder.getId()); - this.updateGrowthValue1(0.0,userId, Integer.valueOf(oilOrder.getOils()),refuelMoneyLiters-Double.valueOf(oilOrders.get(i).get("liters").toString()),storeId); - + this.updateGrowthValue1(0.0, userId, Integer.valueOf(oilOrder.getOils()), refuelMoneyLiters - Double.valueOf(oilOrders.get(i).get("liters").toString()), storeId); + this.insertAllOrderInfo(orderNo, storeId, oilAmount, map.get("payType"), userId, "PC", "1", status); } }else { res.put("error","囤油卡余额不足!"); @@ -619,17 +623,21 @@ public class OilOrderServiceImpl extends ServiceImpl i /** * 添加所有订单信息 */ - private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,String payType,Integer userId,String payChannel){ + private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,String payType,Integer userId,String payChannel,String type,String status){ AllOrderInfo allOrderInfo = new AllOrderInfo(); allOrderInfo.setOrderNo(orderNo); - allOrderInfo.setType("1"); + allOrderInfo.setType(type); allOrderInfo.setStoreId(storeId); allOrderInfo.setGoodsMoney(goodsMoney); allOrderInfo.setPayType(payType); allOrderInfo.setUserId(userId); allOrderInfo.setPayChannel(payChannel); - allOrderInfo.setStatus("paid"); - allOrderInfo.setContent("油品订单"); + allOrderInfo.setStatus(status); + if (type.equals("1")){ + allOrderInfo.setContent("油品订单"); + }else { + allOrderInfo.setContent("收银台订单"); + } allOrderInfoService.insertAllOrderInfo(allOrderInfo); } @@ -880,6 +888,7 @@ public class OilOrderServiceImpl extends ServiceImpl i userId = cardValudChildrens.getUserId(); } this.updateGrowthValue(oilOrder.getPayAmount(),userId, Integer.valueOf(oilOrder.getOils()),null,oilOrder.getStoreId()); + this.addOilTracks(oilOrder,oilOrder.getStoreId()); CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo); if (ObjectUtil.isNotEmpty(cashierOrder)){ cashierOrder.setPayTime(new Date()); @@ -1121,11 +1130,11 @@ public class OilOrderServiceImpl extends ServiceImpl i ); // 计算对应的环比 - chainMaps(mergedMap); + Map stringDoubleMap = chainMaps(mergedMap); // 数据组装 - - return mergedMap; +return stringDoubleMap; +// return mergedMap; } // 员工统计 @@ -1256,6 +1265,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"