|
@@ -2363,11 +2363,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
orderStatusService.create(order.getId(), OrderLogEnum.FINISH_ORDER.getValue(),
|
|
orderStatusService.create(order.getId(), OrderLogEnum.FINISH_ORDER.getValue(),
|
|
|
OrderLogEnum.FINISH_ORDER.getDesc());
|
|
OrderLogEnum.FINISH_ORDER.getDesc());
|
|
|
//写入公司余额 条件是只有全款订单才分,非全款后台导入
|
|
//写入公司余额 条件是只有全款订单才分,非全款后台导入
|
|
|
- if (order.getCompanyId() != null && order.getCompanyId() > 0 && order.getPayDelivery().compareTo(new BigDecimal(0)) == 0) {
|
|
|
|
|
- if (order.getTuiMoneyStatus() == null || order.getTuiMoneyStatus() != 1) {
|
|
|
|
|
- companyService.addCompanyMoney(order);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (order.getCompanyId() != null && order.getCompanyId() > 0 && order.getPayDelivery().compareTo(new BigDecimal(0)) == 0) {
|
|
|
|
|
+// if (order.getTuiMoneyStatus() == null || order.getTuiMoneyStatus() != 1) {
|
|
|
|
|
+// companyService.addCompanyMoney(order);
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
FsErpConfig erpConfig = configUtil.getErpConfig();
|
|
FsErpConfig erpConfig = configUtil.getErpConfig();
|
|
|
Integer erpType = erpConfig.getErpType();
|
|
Integer erpType = erpConfig.getErpType();
|
|
@@ -5761,7 +5761,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
logger.info("【payConfirmMultiStore-货到付款处理成功】orderId={}", orderId);
|
|
logger.info("【payConfirmMultiStore-货到付款处理成功】orderId={}", orderId);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //第五步:OMS推送、佣金等后置处理(非关键路径,异常不影响订单支付状态)
|
|
|
|
|
|
|
+ //第五步:OMS推送
|
|
|
if (orders.size() > 0) {
|
|
if (orders.size() > 0) {
|
|
|
for (FsStoreOrderScrm order : orders) {
|
|
for (FsStoreOrderScrm order : orders) {
|
|
|
if (order == null) {
|
|
if (order == null) {
|