diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java
index 2cd48363c..bc89f24d8 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java
@@ -64,7 +64,7 @@ public class ElectricBicyclesServerHandler extends ChannelInboundHandlerAdapter
         // 处理数据
         byte[] response = eBikeService.process(msg, ctx);
         if (Objects.nonNull(response)) {
-            log.info("[响应数据]:{}", BytesUtil.binary(response, 16));
+            log.info("[电单车===>响应数据]:{}", BytesUtil.binary(response, 16));
             // 响应客户端
             ByteBuf buffer = ctx.alloc().buffer().writeBytes(response);
             // this.channelWrite(channel.id(), buffer);
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java
index e56b73d23..2de48fd0f 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/EBikeBusinessServiceImpl.java
@@ -37,7 +37,7 @@ public class EBikeBusinessServiceImpl implements EBikeBusinessService {
         EBikeDataProtocol eBikeDataProtocol = new EBikeDataProtocol(msg);
         // 获取帧类型
         String command = YKCUtils.frameType2Str(eBikeDataProtocol.getCommand());
-        log.info("收到消息, channelId:{}, 指令:{}, msg:{}", ctx.channel().id().toString(), command, BytesUtil.binary(msg, 16));
+        log.info("电单车===>收到消息, channelId:{}, 指令:{}, msg:{}", ctx.channel().id().toString(), command, BytesUtil.binary(msg, 16));
         // 获取业务处理handler
         AbstractEBikeHandler invokeStrategy = EBikeOperateFactory.getInvokeStrategy(command);
         if (invokeStrategy != null) {
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
index 37b0d8318..96198a399 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
@@ -173,7 +173,6 @@ public class PileRemoteService {
 	 * @return
 	 */
 	public boolean publishBillingTemplate(PublishBillingTemplateDTO dto) {
-
 		// 获取计费模板信息
 		BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateByTemplateId(dto.getTemplateId());
 		if (billingTemplateVO == null) {
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
index 70a55f3a2..4d211b0b9 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
@@ -53,6 +53,9 @@ public abstract class AbstractProgramLogic implements InitializingBean {
     @Autowired
     protected PileBasicInfoService pileBasicInfoService;
 
+    @Autowired
+    protected PileConnectorInfoService pileConnectorInfoService;
+
     @Autowired
     protected PileStationInfoService pileStationInfoService;
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
index 46781bc6e..672a71b36 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
@@ -30,6 +30,7 @@ import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.transaction.dto.OrderTransactionDTO;
 import com.jsowell.pile.vo.uniapp.customer.MemberVO;
+import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO;
 import com.jsowell.pile.vo.web.BalanceDeductionAmountVO;
 import com.jsowell.pile.vo.web.BillingTemplateVO;
 import com.jsowell.pile.vo.web.OrderDetailInfoVO;
@@ -72,15 +73,14 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         orderBasicInfoService.analysisPileParameter(dto);
 
         // 判断桩是电动汽车桩还是电单车桩
-
-        // 校验充电桩相关的信息
-        if (StringUtils.isBlank(dto.getTransactionCode())) {
-            // 无transactionCode, 表示由平台端启动充电, 需要验证充电桩状态
-            orderBasicInfoService.checkPileInfo(dto);
+        PileConnectorDetailVO pileConnectorDetailVO = pileBasicInfoService.queryPileConnectorDetail(dto.getPileConnectorCode());
+        if (!StringUtils.equals(pileConnectorDetailVO.getChargePortType(), "3")) { // 不是3就是电动汽车桩
+            // 电车桩
+            return generateOrderForEV(dto);
+        } else  {
+            // 电动车桩
+            return generateOrderForEBike(dto);
         }
-
-        // 保存订单到数据库 saveOrder2Database
-        return orderBasicInfoService.saveOrder2Database(dto);
     }
 
     /**
@@ -90,7 +90,6 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
      * @throws ParseException
      */
     private OrderBasicInfo generateOrderForEV(GenerateOrderDTO dto) throws ParseException {
-
         // 校验充电桩相关的信息
         if (StringUtils.isBlank(dto.getTransactionCode())) {
             // 无transactionCode, 表示由平台端启动充电, 需要验证充电桩状态
@@ -104,7 +103,9 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
     /**
      * 生成电单车订单
      */
-    private OrderBasicInfo generateOrderForEBike(GenerateOrderDTO dto) throws ParseException {
+    private OrderBasicInfo generateOrderForEBike(GenerateOrderDTO dto) {
+
+
         return null;
     }