Merge branch 'dev' into dev-g

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java

@@ -102,4 +102,9 @@ public class QueryOrderDTO extends BaseEntity {
 	 * 车辆vin编号
 	 */
 	private String vinCode;
+
+	/**
+	 * 车牌号
+	 */
+	private String plateNumber;
 }

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

@@ -456,14 +456,14 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
                                 Comparator.nullsLast(Comparator.naturalOrder())) // 处理可能的null值
         );
 
-        // 4. 手动分页（取出当前页的数据）
+        // 手动分页（取出当前页的数据）
         int fromIndex = (pageNum - 1) * pageSize;
         int toIndex = Math.min(fromIndex + pageSize, pileConnectorInfoList.size());
         List<PileConnectorInfoVO> pagedList = pileConnectorInfoList.subList(fromIndex, toIndex);
 
         // PageInfo<PileConnectorInfoVO> pageInfo = new PageInfo<>(pileConnectorInfoList);
 
-        // 5. 构造 PageInfo（注意：PageInfo 需要总记录数）
+        // 构造 PageInfo（注意：PageInfo 需要总记录数）
         PageInfo<PileConnectorInfoVO> pageInfo = new PageInfo<>(pagedList);
         pageInfo.setTotal(pileConnectorInfoList.size());  // 设置总记录数
         pageInfo.setPageNum(pageNum);                     // 设置当前页码

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -1828,6 +1828,9 @@
         <if test="vinCode != null and vinCode != ''">
             and t1.vin_code = #{vinCode,jdbcType=VARCHAR}
         </if>
+        <if test="plateNumber != null and plateNumber != ''">
+            and t1.plate_number = #{plateNumber,jdbcType=VARCHAR}
+        </if>
         <if test="stationDeptIds != null and stationDeptIds.size() != 0">
             and t3.dept_id in
             <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java

@@ -197,11 +197,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
         //     throw new BusinessException("2", "密钥错误");
         // }
 
-        String a = "146";
+/*        String a = "146";
         String s = String.valueOf(a);
         System.out.println(s);
         boolean zhiHeMerchant = MerchantUtils.isZhiHeMerchant(s);
-        System.out.println(zhiHeMerchant);
+        System.out.println(zhiHeMerchant);*/
+
+        String pn = "8823000000107601";
+        String pileSn = YKCUtils.getPileSn(pn);
+        System.out.println(pileSn);
 
     }
 
@@ -630,20 +634,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
             info.setAccountNumber(pileStationInfo.getAccountNumber());
         }
 
-        // 由于88250000005324在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658
-/*        if (StringUtils.equals("149", stationId)) {
-            info.setStationID("LC658");
-        }*/
-
-        //正式环境站点149推送时报错,"Msg":"更新站点数据出错。站点ID:LC149,错误信息:站点的所属运营商不能修改",
-        // 正确运营商为"上海之禾"-057643496
-        if(StringUtils.equals("149", stationId)){
-            //使用EquipmentOwnerID = MA1JLFUU8
-            info.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
-        }
-
-
-
         // 容量
         if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) {
             info.setCapacity(pileStationInfo.getCapacity().setScale(4, BigDecimal.ROUND_HALF_UP));
@@ -1065,18 +1055,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
         }
         orderInfo.setChargeDetails(chargeDetails);
 
-        // 由于订单在对方测试环境的LC658的站点,因此在这里将站点LC149改为LC658
-/*        if (orderInfo.getStationID().equals("LC149")){
-            orderInfo.setStationID("LC658");
-        }*/
-
-        // 正确运营商"之禾"
-        if(StringUtils.equals("149", orderInfo.getStationID())){
-            //使用EquipmentOwnerID = MA1JLFUU8
-            orderInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
-        }
-
-
         // 获取令牌
         String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
         if (StringUtils.isBlank(token)) {