|
@@ -352,6 +352,7 @@ public class PayOrderLogic {
|
|
|
.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()))
|
|
@@ -386,7 +387,6 @@ public class PayOrderLogic {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
workerOrderItem.setTotalAmount(websitNormCharge.getNormAmount().multiply(Convert.toBigDecimal(workerOrderItem.getNum())));
|
|
|
workerOrderItem.setGoodsAmount(websitNormCharge.getNormAmount());
|
|
|
workerOrderItem.setGoodsCode(websitNormCharge.getNormCode());
|