|
|
|
@ -13,6 +13,7 @@ import cc.hiver.core.service.LogiticsCompanyService; |
|
|
|
import cc.hiver.mall.bill.vo.ArrearsVo; |
|
|
|
import cc.hiver.mall.bill.vo.CustomerBillQueryVo; |
|
|
|
import cc.hiver.mall.bill.vo.CustomerBillSaleVo; |
|
|
|
import cc.hiver.mall.common.constant.OrderConstant; |
|
|
|
import cc.hiver.mall.common.constant.StockConstant; |
|
|
|
import cc.hiver.mall.common.constant.StockLogConstant; |
|
|
|
import cc.hiver.mall.config.thread.AiSaleThread; |
|
|
|
@ -30,6 +31,7 @@ import cc.hiver.mall.saleaimsg.constant.SaleAiMsgConstant; |
|
|
|
import cc.hiver.mall.saleaimsg.entity.SaleAiMsg; |
|
|
|
import cc.hiver.mall.saleaimsg.service.SaleAiMsgService; |
|
|
|
import cc.hiver.mall.service.OrderService; |
|
|
|
import cc.hiver.mall.service.SendMessageService; |
|
|
|
import cc.hiver.mall.service.mybatis.*; |
|
|
|
import cc.hiver.mall.utils.AliOcrUtil; |
|
|
|
import cc.hiver.mall.utils.DateUtil; |
|
|
|
@ -106,6 +108,9 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
@Autowired |
|
|
|
private DebtService debtService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private SendMessageService sendMessageService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public void editPayPrice(String id, BigDecimal price, String dealingsWay) { |
|
|
|
// 修改采购单、实付、未付金额
|
|
|
|
@ -157,11 +162,6 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
if (!ObjectUtils.isEmpty(saleVO.getPageVo())) { |
|
|
|
page = new Page<>(saleVO.getPageVo().getPageNumber(), saleVO.getPageVo().getPageSize()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotEmpty(saleVO.getEndTime())) { |
|
|
|
final String newEnTime = DateUtil.addDay(saleVO.getEndTime(), 1); |
|
|
|
saleVO.setEndTime(newEnTime); |
|
|
|
} |
|
|
|
|
|
|
|
final Page<Sale> saleList = saleMapper.queryPage(page, saleVO); |
|
|
|
// 获取订单详情信息
|
|
|
|
for (Sale sale : saleList.getRecords()) { |
|
|
|
@ -351,6 +351,9 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<SalesRankingVo> getSalesRankingByShopId(SalesRankingQueryCriteria salesRankingQueryCriteria) { |
|
|
|
if(StringUtils.isNotEmpty(salesRankingQueryCriteria.getEndTime())){ |
|
|
|
salesRankingQueryCriteria.setEndTime(DateUtil.addDay(salesRankingQueryCriteria.getEndTime(), 1)); |
|
|
|
} |
|
|
|
return saleMapper.getSalesRankingByShopId(salesRankingQueryCriteria); |
|
|
|
} |
|
|
|
|
|
|
|
@ -915,7 +918,7 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
// 4. 订单款项记录作废
|
|
|
|
// 根据订单获取交易记录
|
|
|
|
final String userId = sale.getUserId(); |
|
|
|
final Debt oldDebt = debtService.selectByUserId(userId); |
|
|
|
final Debt oldDebt = debtService.selectByUserId(sale.getShopId(),userId); |
|
|
|
if (oldDebt != null) { |
|
|
|
final BigDecimal newDebtAmount; |
|
|
|
final BigDecimal lastDebtAmount = oldDebt.getAmountOwed(); |
|
|
|
@ -954,6 +957,20 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
} |
|
|
|
// 作废当前订单的欠款记录
|
|
|
|
dealingsRecordService.cancelRecord(id); |
|
|
|
// 如果有配送单，那么就取消配送，并给快递员发送消息
|
|
|
|
final OrderXd orderXd = orderService.findByOrderId(id); |
|
|
|
if(orderXd != null && (orderXd.getOrderStatus().equals(OrderConstant.ORDER_STATUS[0]) || orderXd.getOrderStatus().equals(OrderConstant.ORDER_STATUS[1]))){ |
|
|
|
if (StringUtils.isNotEmpty(orderXd.getOrderByWorker())) { |
|
|
|
// 如果订单被抢单了，那么需要给配送员发送消息
|
|
|
|
sendMessageService.handleSendAppMessageOfQuxiao(orderXd.getOrderByWorker()); |
|
|
|
} |
|
|
|
orderXd.setOrderByWorker(null); |
|
|
|
orderXd.setOrderByWorkertime(null); |
|
|
|
orderXd.setWorker(null); |
|
|
|
// 修改为作废
|
|
|
|
orderXd.setOrderStatus(OrderConstant.ORDER_STATUS[2]); |
|
|
|
orderService.update(orderXd); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
wangfukang
2 years ago