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

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java

@@ -55,6 +55,14 @@ public interface IPileBasicInfoService {
 	 */
 	int updatePileBasicInfo(PileBasicInfo pileBasicInfo);
 
+	/**
+	 * 修改设备sim卡信息
+	 *
+	 * @param pileBasicInfo 设备管理
+	 * @return 结果
+	 */
+	int updateSimInfo(PileBasicInfo pileBasicInfo);
+
 	/**
 	 * 批量删除设备管理
 	 *

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

@@ -173,6 +173,22 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 		return pileBasicInfoMapper.updatePileBasicInfo(pileBasicInfo);
 	}
 
+	/**
+	 * 修改设备sim卡信息
+	 *
+	 * @param pileBasicInfo 设备管理
+	 * @return 结果
+	 */
+	@Override
+	public int updateSimInfo(PileBasicInfo pileBasicInfo) {
+		Long stationId = pileBasicInfo.getStationId();
+		// 清缓存
+		cleanRedisCache(pileBasicInfo.getSn());
+		pileBasicInfo.setUpdateTime(DateUtils.getNowDate());
+		redisCache.deleteObject(CacheConstants.GET_PILE_LIST_BY_STATION_ID + stationId);
+		return pileBasicInfoMapper.updatePileBasicInfo(pileBasicInfo);
+	}
+
 	/**
 	 * 批量删除设备管理
 	 *
@@ -576,7 +592,7 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 			// sim信息已经存库了 然后更新充电桩的sim卡
 			basicInfo.setSimId(simInfo.getId());
 		}
-		updatePileBasicInfo(basicInfo);
+		updateSimInfo(basicInfo);
 	}
 
 	/**

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

@@ -433,7 +433,7 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 		if (merchant == null) {
 			return null;
 		}
-		return merchant.getAppId();
+		return merchant.getDelayMode();
 	}
 
 	@Override

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

@@ -962,5 +962,6 @@
             <if test="pileSn != null  and pileSn != ''"> and t1.pile_sn = #{pileSn}</if>
             <if test="pileConnectorCode != null  and pileConnectorCode != ''"> and t1.pile_connector_code = #{pileConnectorCode}</if>
         </where>
+        order by t1.create_time desc
     </select>
 </mapper>