Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1302,17 +1302,27 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                 }
             }
 
+            FsErpConfig erpConfig = configUtil.getErpConfig();
+            Integer erpType = erpConfig.getErpType();
+            Integer erpOpen = erpConfig.getErpOpen();
+            if (erpOpen != null && erpOpen == 1) {
+                if (erpType != null && erpType==2){
+                    // 同步订单完成状态到erp
+                    // 如果是物流代收 或者 货到付款
+                    if("2".equals(order.getPayType()) || "3".equals(order.getPayType())){
+                        // 已结算
+                        if("1".equals(order.getDeliveryPayStatus())){
+                            FsErpFinishPush fsErpFinishPush = new FsErpFinishPush();
+                            fsErpFinishPush.setOrderId(order.getId());
+                            fsErpFinishPush.setTaskStatus(0);
+                            fsErpFinishPush.setRetryCount(0);
+                            fsErpFinishPush.setCreateTime(new Date());
+                            fsErpFinishPushMapper.insert(fsErpFinishPush);
+                        }
+                    }
+                }
+            }
 
-//            // 同步订单完成状态到erp
-//            // 如果是线上支付
-//            if("1".equals(order.getPayType())){
-//                FsErpFinishPush fsErpFinishPush = new FsErpFinishPush();
-//                fsErpFinishPush.setOrderId(orderId);
-//                fsErpFinishPush.setTaskStatus(0);
-//                fsErpFinishPush.setRetryCount(0);
-//                fsErpFinishPush.setCreateTime(new Date());
-//                fsErpFinishPushMapper.insert(fsErpFinishPush);
-//            }
 
             //模板消息支付成功发布事件
             TemplateBean templateBean = TemplateBean.builder()
@@ -2256,19 +2266,28 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                         importSuccessMsg.append("<br/>" + successNum + "、快递单号 " +dto.getDeliveryId() + " 导入成功");
 
 
-                        // 同步订单完成状态到erp
-                        // 如果是物流代收 或者 货到付款
-//                        if("2".equals(order.getPayType()) || "3".equals(order.getPayType())){
-//                            // 已结算
-//                            if("1".equals(dto.getDeliveryPayStatus())){
-//                                FsErpFinishPush fsErpFinishPush = new FsErpFinishPush();
-//                                fsErpFinishPush.setOrderId(order.getId());
-//                                fsErpFinishPush.setTaskStatus(0);
-//                                fsErpFinishPush.setRetryCount(0);
-//                                fsErpFinishPush.setCreateTime(new Date());
-//                                fsErpFinishPushMapper.insert(fsErpFinishPush);
-//                            }
-//                        }
+                        FsErpConfig erpConfig = configUtil.getErpConfig();
+                        Integer erpType = erpConfig.getErpType();
+                        Integer erpOpen = erpConfig.getErpOpen();
+                        if (erpOpen != null && erpOpen == 1) {
+                            if (erpType != null && erpType==2){
+                                // 同步订单完成状态到erp
+                                // 如果是物流代收 或者 货到付款
+                                if("2".equals(order.getPayType()) || "3".equals(order.getPayType())){
+                                    // 已结算
+                                    if("1".equals(dto.getDeliveryPayStatus())){
+                                        FsErpFinishPush fsErpFinishPush = new FsErpFinishPush();
+                                        fsErpFinishPush.setOrderId(order.getId());
+                                        fsErpFinishPush.setTaskStatus(0);
+                                        fsErpFinishPush.setRetryCount(0);
+                                        fsErpFinishPush.setCreateTime(new Date());
+                                        fsErpFinishPushMapper.insert(fsErpFinishPush);
+                                    }
+                                }
+                            }
+                        }
+
+
                     }
                     else{
                         String msg = "<br/>" + failureNum + "、快递单号 " + dto.getDeliveryId() + " 未签收或已导入,不能导入";