Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/nanrui/GetTokenDTO.java

@@ -0,0 +1,19 @@
+package com.jsowell.pile.dto.nanrui;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author Lemon
+ * @Date 2023/10/16 14:14
+ */
+@Data
+public class GetTokenDTO {
+    private String urlAddress;
+    private String operatorId;
+    private String operatorSecret;
+    private String dataSecretIv;
+    private String signSecret;
+    private String dataSecret;
+}

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java

@@ -162,6 +162,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 			// vo.setOrganizationCode(pileStationInfo.getor);
 			vo.setPublicFlag(pileStationInfo.getPublicFlag());
 			vo.setOpenFlag(pileStationInfo.getOpenFlag());
+			vo.setOpenAllDay(pileStationInfo.getOpenAllDay());
 			vo.setDeptId(pileStationInfo.getDeptId());
 			if (StringUtils.isNotBlank(pileStationInfo.getPictures())) {
 				vo.setPictures(pileStationInfo.getPictures());

jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java

@@ -379,8 +379,6 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
         // 从redis中取出实时记录保存到表中
         realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode());
 
-        // TODO 如果该站点的停车场优惠券信息配置不为空，则需绑定一张优惠券
-
         logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSONObject.toJSONString(dto));
     }