1
This commit is contained in:
parent
62c20b2c15
commit
1a5e536cf6
@ -21,8 +21,10 @@ import com.fuint.business.convenienceSore.dto.LJGoodsDto;
|
|||||||
import com.fuint.business.convenienceSore.mapper.LJGoodsMapper;
|
import com.fuint.business.convenienceSore.mapper.LJGoodsMapper;
|
||||||
import com.fuint.business.convenienceSore.service.LJGoodsService;
|
import com.fuint.business.convenienceSore.service.LJGoodsService;
|
||||||
import com.fuint.business.convenienceSore.service.StockTrackService;
|
import com.fuint.business.convenienceSore.service.StockTrackService;
|
||||||
|
import com.fuint.business.fleet.entity.FleetConsumeRecord;
|
||||||
import com.fuint.business.fleet.entity.FleetInfo;
|
import com.fuint.business.fleet.entity.FleetInfo;
|
||||||
import com.fuint.business.fleet.entity.FleetMember;
|
import com.fuint.business.fleet.entity.FleetMember;
|
||||||
|
import com.fuint.business.fleet.mapper.FleetConsumeRecordMapper;
|
||||||
import com.fuint.business.fleet.mapper.FleetInfoMapper;
|
import com.fuint.business.fleet.mapper.FleetInfoMapper;
|
||||||
import com.fuint.business.fleet.mapper.FleetLinesChangeMapper;
|
import com.fuint.business.fleet.mapper.FleetLinesChangeMapper;
|
||||||
import com.fuint.business.fleet.mapper.FleetMemberMapper;
|
import com.fuint.business.fleet.mapper.FleetMemberMapper;
|
||||||
@ -125,7 +127,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
|||||||
@Autowired
|
@Autowired
|
||||||
private FleetMemberMapper fleetMemberMapper;
|
private FleetMemberMapper fleetMemberMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private FleetLinesChangeMapper fleetLinesChangeMapper;
|
private FleetConsumeRecordMapper fleetConsumeRecordMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private FleetInfoMapper fleetInfoMapper;
|
private FleetInfoMapper fleetInfoMapper;
|
||||||
|
|
||||||
@ -595,7 +597,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
|||||||
// 参数
|
// 参数
|
||||||
String orderNo = map.get("orderNo");
|
String orderNo = map.get("orderNo");
|
||||||
|
|
||||||
|
|
||||||
// 1.根据 orderNo 查询 总订单表 收银台表 会员表 油品订单表
|
// 1.根据 orderNo 查询 总订单表 收银台表 会员表 油品订单表
|
||||||
AllOrderInfo allOrder = selectAllOrderInfoByOrderNo(orderNo);
|
AllOrderInfo allOrder = selectAllOrderInfoByOrderNo(orderNo);
|
||||||
CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
|
CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
|
||||||
@ -646,7 +647,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
|||||||
.eq("store_id", userBalance.getStoreId());
|
.eq("store_id", userBalance.getStoreId());
|
||||||
MtUserFuel mtUserFuel = mtUserFuelMapper.selectOne(q2);
|
MtUserFuel mtUserFuel = mtUserFuelMapper.selectOne(q2);
|
||||||
QueryWrapper<CardFuelChange> q4 = Wrappers.query();
|
QueryWrapper<CardFuelChange> q4 = Wrappers.query();
|
||||||
q2.eq("order_no", userBalance.getMtUserId());
|
q2.eq("order_no", allOrder.getOrderNo());
|
||||||
CardFuelChange cardFuelChange = cardFuelChangeMapper.selectOne(q4);
|
CardFuelChange cardFuelChange = cardFuelChangeMapper.selectOne(q4);
|
||||||
mtUserFuel.setFuelAmount(mtUserFuel.getFuelAmount() + cardFuelChange.getBalance());
|
mtUserFuel.setFuelAmount(mtUserFuel.getFuelAmount() + cardFuelChange.getBalance());
|
||||||
mtUserFuelMapper.updateById(mtUserFuel);
|
mtUserFuelMapper.updateById(mtUserFuel);
|
||||||
@ -660,7 +661,14 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
|||||||
q6.eq("id", fleetMember.getFleetId());
|
q6.eq("id", fleetMember.getFleetId());
|
||||||
FleetInfo fleetInfo = fleetInfoMapper.selectOne(q6);
|
FleetInfo fleetInfo = fleetInfoMapper.selectOne(q6);
|
||||||
|
|
||||||
// 待编辑
|
QueryWrapper<FleetConsumeRecord> q7 = Wrappers.query();
|
||||||
|
q7.eq("order_no", allOrder.getOrderNo());
|
||||||
|
FleetConsumeRecord fleetConsumeRecord = fleetConsumeRecordMapper.selectOne(q7);
|
||||||
|
|
||||||
|
fleetMember.setRemainingCreditLimit(fleetMember.getRemainingCreditLimit() + fleetConsumeRecord.getAfterTheChange());
|
||||||
|
fleetInfo.setTotalBalance(fleetInfo.getTotalBalance() + fleetConsumeRecord.getAfterTheChange());
|
||||||
|
fleetInfoMapper.updateById(fleetInfo);
|
||||||
|
fleetMemberMapper.updateById(fleetMember);
|
||||||
|
|
||||||
}
|
}
|
||||||
if (orderNo.equals("card_value")) {
|
if (orderNo.equals("card_value")) {
|
||||||
|
Loading…
Reference in New Issue
Block a user