合并分支 'qa' 到 'master'

.gitignore

@@ -35,4 +35,10 @@ build/
 .vscode/
 
 mvnw
-mvnw.cmd
+mvnw.cmd
\ No newline at end of file
+
+LOG_PATH_IS_UNDEFINED/
+logs/
+*.log
+**/**/*.log
+*.bak*

src/main/java/com/sfa/job/service/order/impl/FinanceOrderSyncServiceImpl.java

@@ -185,7 +185,7 @@ public class FinanceOrderSyncServiceImpl implements IFinanceOrderSyncService {
                     orderDetail.setSpecNameErp(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getSpec() : "");
                     // 将退款成功的数据分摊后总价置为0 2025年02月06日16:25:30
                     if (ObjectUtils.isNotEmpty(orderDetail.getRefundStatus()) && orderDetail.getRefundStatus().equals(5)) {
-                        orderDetail.setShareAmount(new BigDecimal(0));
+//                        orderDetail.setShareAmount(new BigDecimal(0));
                         orderDetail.setActualCost(new BigDecimal(0));
                         orderDetail.setStandardCost(new BigDecimal(0));
                         orderDetail.setSumActualCost(new BigDecimal(0));

src/main/java/com/sfa/job/service/order/impl/WdtQimenOrderPayTimeSyncServiceImpl.java

@@ -300,7 +300,7 @@ public class WdtQimenOrderPayTimeSyncServiceImpl implements IWdtQimenOrderPayTim
                     orderDetail.setSpecNameErp(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getSpec() : "");
                     // 将退款成功的数据分摊后总价置为0 2025年02月06日16:25:30
                     if (ObjectUtils.isNotEmpty(orderDetail.getRefundStatus()) && orderDetail.getRefundStatus().equals(5)) {
-                        orderDetail.setShareAmount(new BigDecimal(0));
+//                        orderDetail.setShareAmount(new BigDecimal(0));
                         orderDetail.setActualCost(new BigDecimal(0));
                         orderDetail.setStandardCost(new BigDecimal(0));
                         orderDetail.setSumActualCost(new BigDecimal(0));

src/main/java/com/sfa/job/service/order/impl/WdtQimenOrderSyncServiceImpl.java

@@ -300,7 +300,7 @@ public class WdtQimenOrderSyncServiceImpl implements IWdtQimenOrderSyncService {
                     orderDetail.setSpecNameErp(ObjectUtils.isNotEmpty(baseProductMap.get(orderDetail.getGoodsNo())) ? baseProductMap.get(orderDetail.getGoodsNo()).getSpec() : "");
                     // 将退款成功的数据分摊后总价置为0 2025年02月06日16:25:30
                     if (ObjectUtils.isNotEmpty(orderDetail.getRefundStatus()) && orderDetail.getRefundStatus().equals(5)) {
-                        orderDetail.setShareAmount(new BigDecimal(0));
+//                        orderDetail.setShareAmount(new BigDecimal(0));
                         orderDetail.setActualCost(new BigDecimal(0));
                         orderDetail.setStandardCost(new BigDecimal(0));
                         orderDetail.setSumActualCost(new BigDecimal(0));