|
|
@@ -350,48 +350,48 @@ public class PayOrderLogic {
|
|
|
|
|
|
private void addFuCai(Map<String, WorkerNormStockBean> workerStockMap, WorkerOrderItem workerOrderItem, WorkerOrderBuy workerOrderBuy) {
|
|
|
WebsitNormCharge websitNormCharge = websitNormChargeService.getById(workerOrderItem.getGoodsId());
|
|
|
- if (websitNormCharge.getNormType().equals("M")) {
|
|
|
- // 获取当前关联师傅库存记录
|
|
|
- List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(workerOrderItem.getGoodsId(), workerOrderBuy.getIdentity());
|
|
|
- if (CollectionUtil.isNotEmpty(stockBeanList)) {
|
|
|
- // 获取待支付的师傅收费订单
|
|
|
- final List<WorkerOrder> workerOrderList = workerOrderService.lambdaQuery()
|
|
|
- .eq(WorkerOrder::getCompanyWechatId, workerOrderBuy.getCompanyWechatId())
|
|
|
- .eq(WorkerOrder::getWorkerId, workerOrderBuy.getWorkerId())
|
|
|
- .eq(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey())
|
|
|
- .eq(WorkerOrder::getOrderId, workerOrderBuy.getOrderId())
|
|
|
- .list();
|
|
|
- final List<WorkerOrderItem> orderItemList = workerOrderItemService.lambdaQuery()
|
|
|
- .in(WorkerOrderItem::getOrderId, workerOrderList.stream().map(WorkerOrder::getOrderId).collect(Collectors.toList()))
|
|
|
- .eq(WorkerOrderItem::getGoodsId, workerOrderItem.getGoodsId())
|
|
|
- .list();
|
|
|
-
|
|
|
- BigDecimal totalNum = workerOrderItem.getNum();
|
|
|
- if (CollectionUtil.isNotEmpty(orderItemList)) {
|
|
|
- for (WorkerOrderItem orderItem : orderItemList) {
|
|
|
- totalNum = totalNum.add(orderItem.getNum());
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- for (WorkerNormStockBean stockBean : stockBeanList) {
|
|
|
- // 当前订单收费标准扣总数量
|
|
|
- BigDecimal useTotalQty = totalNum.multiply(stockBean.getQty());
|
|
|
- if (!workerStockMap.containsKey(stockBean.getWorkerGoodsId())) {
|
|
|
- WorkerNormStockBean bean = new WorkerNormStockBean();
|
|
|
- BeanUtils.copyProperties(stockBean, bean);
|
|
|
- bean.setRealQty(BigDecimal.ZERO);
|
|
|
- workerStockMap.put(bean.getWorkerGoodsId(), bean);
|
|
|
- }
|
|
|
- WorkerNormStockBean stock = workerStockMap.get(stockBean.getWorkerGoodsId());
|
|
|
- stock.setRealQty(stock.getRealQty().add(useTotalQty));
|
|
|
-
|
|
|
+// if (websitNormCharge.getNormType().equals("M")) {
|
|
|
+// // 获取当前关联师傅库存记录
|
|
|
+// List<WorkerNormStockBean> stockBeanList = materialMapper.queryWorkerStockQty(workerOrderItem.getGoodsId(), workerOrderBuy.getIdentity());
|
|
|
+// if (CollectionUtil.isNotEmpty(stockBeanList)) {
|
|
|
+// // 获取待支付的师傅收费订单
|
|
|
+// final List<WorkerOrder> workerOrderList = workerOrderService.lambdaQuery()
|
|
|
+// .eq(WorkerOrder::getCompanyWechatId, workerOrderBuy.getCompanyWechatId())
|
|
|
+// .eq(WorkerOrder::getWorkerId, workerOrderBuy.getWorkerId())
|
|
|
+// .eq(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey())
|
|
|
+// .eq(WorkerOrder::getOrderId, workerOrderBuy.getOrderId())
|
|
|
+// .list();
|
|
|
+// final List<WorkerOrderItem> orderItemList = workerOrderItemService.lambdaQuery()
|
|
|
+// .in(WorkerOrderItem::getOrderId, workerOrderList.stream().map(WorkerOrder::getOrderId).collect(Collectors.toList()))
|
|
|
+// .eq(WorkerOrderItem::getGoodsId, workerOrderItem.getGoodsId())
|
|
|
+// .list();
|
|
|
+//
|
|
|
+// BigDecimal totalNum = workerOrderItem.getNum();
|
|
|
+// if (CollectionUtil.isNotEmpty(orderItemList)) {
|
|
|
+// for (WorkerOrderItem orderItem : orderItemList) {
|
|
|
+// totalNum = totalNum.add(orderItem.getNum());
|
|
|
+// }
|
|
|
+// }
|
|
|
+//
|
|
|
+// for (WorkerNormStockBean stockBean : stockBeanList) {
|
|
|
+// // 当前订单收费标准扣总数量
|
|
|
+// BigDecimal useTotalQty = totalNum.multiply(stockBean.getQty());
|
|
|
+// if (!workerStockMap.containsKey(stockBean.getWorkerGoodsId())) {
|
|
|
+// WorkerNormStockBean bean = new WorkerNormStockBean();
|
|
|
+// BeanUtils.copyProperties(stockBean, bean);
|
|
|
+// bean.setRealQty(BigDecimal.ZERO);
|
|
|
+// workerStockMap.put(bean.getWorkerGoodsId(), bean);
|
|
|
+// }
|
|
|
+// WorkerNormStockBean stock = workerStockMap.get(stockBean.getWorkerGoodsId());
|
|
|
+// stock.setRealQty(stock.getRealQty().add(useTotalQty));
|
|
|
+//
|
|
|
// if (!stockBean.getIsSmall() && stock.getRealQty().compareTo(stockBean.getStockQty()) > 0) {
|
|
|
// throw new RemoteServiceException("收费标准关联的 " + stockBean.getGoodsName() + "库存数量"
|
|
|
// + stock.getStockQty() + ", 需扣" + stock.getRealQty() + ", 库存数量不够扣减");
|
|
|
// }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
|
|
|
workerOrderItem.setTotalAmount(websitNormCharge.getNormAmount().multiply(Convert.toBigDecimal(workerOrderItem.getNum())));
|
